diff --git a/build.gradle b/build.gradle index fda5aa18c..87792a2cb 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.moddev' version '2.0.112' + id 'net.neoforged.moddev' id 'dev.lukebemish.immaculate' version '0.1.13' id 'net.neoforged.licenser' version '0.7.5' id 'me.modmuss50.mod-publish-plugin' version '1.0.0' @@ -21,81 +21,12 @@ logger.lifecycle("Modern Industrialization version ${version}") java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(25) } withSourcesJar() } -repositories { - // for KJS - maven { - url "https://www.cursemaven.com" - content { - includeGroup "curse.maven" - } - } - // for AE2, JEI and Almost Unified - maven { - name "Modmaven" - url "https://modmaven.dev" - content { - includeGroup "appeng" - includeGroup "dev.technici4n" - includeGroup "mezz.jei" - includeGroup "com.almostreliable.mods" - } - } - maven { - url "https://maven.shedaniel.me" - content { - includeGroup "me.sargunvohra.mcmods" - includeGroup "me.shedaniel.cloth" - includeGroup "me.shedaniel" - includeGroup "dev.architectury" - } - } - maven { - url "https://maven.terraformersmc.com" - content { - includeGroup "com.terraformersmc" - includeGroup "dev.emi" - } - } - maven { - name 'Jitpack' - url 'https://jitpack.io' - content { - // For KubeJS - includeGroup "com.github.rtyley" - } - } - maven { - url "https://maven.ftb.dev/releases" - content { - includeGroup "dev.ftb.mods" - } - } - // For KubeJS & FTBTeams/FTBQuests - maven { - url "https://maven.latvian.dev/releases" - content { - includeGroup "dev.latvian.apps" - includeGroup "dev.latvian.mods" - includeGroup "dev.ftb.mods" - } - } - maven { - url "https://maven.teamresourceful.com/repository/maven-public/" - content { - includeGroup "com.teamresourceful" - includeGroup "com.teamresourceful.resourcefullib" - includeGroup "earth.terrarium.argonauts" - includeGroup "earth.terrarium.athena" - } - } -} - sourceSets { main { java { @@ -162,7 +93,7 @@ neoForge { } data { - data() + clientData() sourceSet = sourceSets.client loadedMods = [mods.modern_industrialization_with_client] // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it @@ -188,7 +119,6 @@ configurations { } dependencies { - api jarJar("dev.technici4n:GrandPower:${project.grandpower_version}") api "org.jspecify:jspecify:${project.jspecify_version}" implementation "org.appliedenergistics:guideme:${project.guideme_version}" @@ -216,19 +146,20 @@ dependencies { throw new GradleException("Invalid runtime_itemlist_mod value: " + project.runtime_itemlist_mod) } - localRuntimeOnly compileOnly("curse.maven:jade-324717:${project.jade_file_id}") + /*localRuntimeOnly*/ compileOnly("curse.maven:jade-324717:${project.jade_file_id}") // TODO: compileOnly because implementation will cause datagen to crash... hopefully kubejs fixes it soon /*localRuntimeOnly*/ compileOnly("dev.latvian.mods:kubejs-neoforge:${project.kubejs_version}") - localRuntimeOnly compileOnly("appeng:appliedenergistics2:${project.ae2_version}") + // TODO: AE2 runtime + /*localRuntimeOnly*/ compileOnly("org.appliedenergistics:appliedenergistics2:${project.ae2_version}") compileOnly "earth.terrarium.argonauts:argonauts-neoforge-${project.argonauts_minecraft_version}:${project.argonauts_version}" - localRuntimeOnly compileOnly("earth.terrarium.athena:athena-neoforge-${project.athena_minecraft_version}:${project.athena_version}") + compileOnly("earth.terrarium.athena:athena-neoforge-${project.athena_minecraft_version}:${project.athena_version}") compileOnly "dev.ftb.mods:ftb-quests-neoforge:${project.ftb_quests_version}" compileOnly "dev.ftb.mods:ftb-teams-neoforge:${project.ftb_teams_version}" - compileOnly "com.almostreliable.mods:almostunified-neoforge:${project.minecraft_version}-${project.au_version}:api" + compileOnly "com.almostreliable.mods:almostunified-neoforge:${project.au_minecraft_version}-${project.au_version}:api" } var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { @@ -236,7 +167,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources neo_version: neo_version, neo_version_range: neo_version_range, mod_version: version, - grandpower_version_range: grandpower_version_range, guideme_version_range: guideme_version_range, ae2_version_range: ae2_version_range, jei_version_range: jei_version_range, @@ -259,6 +189,7 @@ tasks.withType(JavaCompile).configureEach { // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" + it.options.compilerArgs.addAll("-Xmaxerrs", "9999") } jar { @@ -411,9 +342,8 @@ publishMods { curseforge { projectId = project.curseforge_project accessToken = providers.environmentVariable("CURSEFORGE_API_KEY") - javaVersions.add JavaVersion.VERSION_21 + javaVersions.add JavaVersion.VERSION_25 shared it - embeds "grandpower" optional "roughly-enough-items" } diff --git a/docs/ADDING_RECIPES.md b/docs/ADDING_RECIPES.md index 651ce94ce..0c324a0cc 100644 --- a/docs/ADDING_RECIPES.md +++ b/docs/ADDING_RECIPES.md @@ -8,8 +8,8 @@ In general, a machine recipe JSON in MI has the following properties: - `fluid_outputs`: The list of fluids it produces. - `process_conditions`: A list of additional conditions for the recipe to be processed by the machine. -You can find plenty of examples for the JSON format in [our files](../src/main/resources/data/modern_industrialization/recipes). -For example, the assembler recipe for the trash can looks [like this](../src/main/resources/data/modern_industrialization/recipes/trash_can_assembler.json). +You can find plenty of examples for the JSON format in [our files](../src/generated/resources/data/modern_industrialization/recipes). +For example, the assembler recipe for the trash can looks [like this](../src/generated/resources/data/modern_industrialization/recipes/trash_can_assembler.json). MI adds a nicer syntax when the recipes are being registered by KubeJS: - You need to create the recipe by specifying the values for `eu` and `duration`. diff --git a/docs/MACHINE_MODELS.md b/docs/MACHINE_MODELS.md index 1a8cb1ff9..30b93538c 100644 --- a/docs/MACHINE_MODELS.md +++ b/docs/MACHINE_MODELS.md @@ -1,4 +1,7 @@ # Machine models + +TODO 26.1: this needs an update + Each machine model in MI consists of two parts: - A casing: the core cube of the machine. It that can never be rotated, and may be reused for multiple machines or by multiblock hatches. - A set of overlays: extra textures applied on some sides. diff --git a/gradle.properties b/gradle.properties index c4e2ee30d..c511dec23 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,12 +9,9 @@ org.gradle.jvmargs=-Xmx2G \ org.gradle.configuration-cache=true # Core NeoForge properties -minecraft_version=1.21.1 -neo_version=21.1.209 -neo_version_range=[21.1.209, 22-) -# For latest see https://parchmentmc.org/docs/getting-started -neoForge.parchment.minecraftVersion=1.21 -neoForge.parchment.mappingsVersion=2024.07.28 +minecraft_version=26.1-snapshot-4 +neo_version=26.1.0.0-alpha.8+snapshot-4 +neo_version_range=[26.1.0.0-alpha.8+snapshot-4, 26.2-) # Publishing curseforge_project=405388 @@ -23,32 +20,31 @@ modrinth_project=Gov5Dboq # Dev runtime options ## Set to "rei", "jei", "emi", "jemi" or "none" to pick which tooltip mod gets picked at runtime ## for the dev environment. -runtime_itemlist_mod=emi +runtime_itemlist_mod=none # Dependency versions -grandpower_version=3.0.0 -grandpower_version_range=[3.0.0, 4) -guideme_version=21.1.5 -guideme_version_range=[21.1.5, 21.2) +guideme_version=26.1.7-alpha +guideme_version_range=[26.1.7-alpha,) jspecify_version=1.0.0 # Optional dependency versions -ae2_version=19.0.12-alpha -ae2_version_range=[19.0.12-alpha, 20) +ae2_version=26.1.3-alpha +ae2_version_range=[26.1.3-alpha,) argonauts_minecraft_version=1.21 argonauts_version=2.0.0-alpha.4 athena_minecraft_version=1.21 athena_version=4.0.0 +au_minecraft_version=1.21.1 au_version=1.2.5 emi_minecraft_version=1.21.1 emi_version=1.1.22 ftb_quests_version=2100.1.3 ftb_teams_version=2100.1.0 -jade_file_id=5493270 +jade_file_id=7313008 # JEI Versions https://github.com/mezz/JustEnoughItems#1211 -jei_minecraft_version=1.21.1 -jei_version=19.25.0.322 -jei_version_range=[19.19.0,] +jei_minecraft_version=26.1-snapshot-1 +jei_version=28.0.0.6 +jei_version_range=[28.0.0.6,) kubejs_version=2101.7.2-build.290 kubejs_version_range=[2101.7.2-build.290,] rei_version=16.0.729 diff --git a/settings.gradle b/settings.gradle index 4b0829d18..cfc2693e7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,80 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' + id 'net.neoforged.moddev.repositories' version '2.0.134' } rootProject.name = "Modern-Industrialization" + +dependencyResolutionManagement { + repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS + rulesMode = RulesMode.FAIL_ON_PROJECT_RULES + repositories { + mavenCentral() + // for KJS + maven { + url "https://www.cursemaven.com" + content { + includeGroup "curse.maven" + } + } + maven { + name "Modmaven" + url "https://modmaven.dev" + content { + includeGroup "dev.technici4n" + includeGroup "mezz.jei" + includeGroup "com.almostreliable.mods" + } + } + maven { + url "https://maven.shedaniel.me" + content { + includeGroup "me.sargunvohra.mcmods" + includeGroup "me.shedaniel.cloth" + includeGroup "me.shedaniel" + includeGroup "dev.architectury" + } + } + maven { + url "https://maven.terraformersmc.com" + content { + includeGroup "com.terraformersmc" + includeGroup "dev.emi" + } + } + maven { + name 'Jitpack' + url 'https://jitpack.io' + content { + // For KubeJS + includeGroup "com.github.rtyley" + } + } + maven { + url "https://maven.ftb.dev/releases" + content { + includeGroup "dev.ftb.mods" + } + } + // For KubeJS & FTBTeams/FTBQuests + maven { + url "https://maven.latvian.dev/releases" + content { + includeGroup "dev.latvian.apps" + includeGroup "dev.latvian.mods" + includeGroup "dev.ftb.mods" + } + } + maven { + url "https://maven.teamresourceful.com/repository/maven-public/" + content { + includeGroup "com.teamresourceful" + includeGroup "com.teamresourceful.resourcefullib" + includeGroup "earth.terrarium.argonauts" + includeGroup "earth.terrarium.athena" + } + } + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/DynamicTooltip.java b/src/client/java/aztech/modern_industrialization/client/DynamicTooltip.java index 126f344b2..2905a3293 100644 --- a/src/client/java/aztech/modern_industrialization/client/DynamicTooltip.java +++ b/src/client/java/aztech/modern_industrialization/client/DynamicTooltip.java @@ -26,6 +26,7 @@ import aztech.modern_industrialization.client.util.RenderHelper; import java.util.List; +import java.util.Optional; import java.util.function.Supplier; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Tooltip; @@ -36,7 +37,7 @@ public class DynamicTooltip extends Tooltip { private final Supplier> tooltipSupplier; public DynamicTooltip(Supplier> tooltipSupplier) { - super(null, null); + super(null, null, Optional.empty(), null); this.tooltipSupplier = tooltipSupplier; } diff --git a/src/client/java/aztech/modern_industrialization/client/MIClient.java b/src/client/java/aztech/modern_industrialization/client/MIClient.java index 73d5fcea4..01a282164 100644 --- a/src/client/java/aztech/modern_industrialization/client/MIClient.java +++ b/src/client/java/aztech/modern_industrialization/client/MIClient.java @@ -26,7 +26,7 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIBlock; -import aztech.modern_industrialization.MIItem; +import aztech.modern_industrialization.MIFluids; import aztech.modern_industrialization.MIRegistries; import aztech.modern_industrialization.MIText; import aztech.modern_industrialization.MITooltips; @@ -38,38 +38,34 @@ import aztech.modern_industrialization.client.blocks.storage.tank.TankRenderer; import aztech.modern_industrialization.client.datagen.MIDatagenClient; import aztech.modern_industrialization.client.items.ClientConfigCardTooltip; -import aztech.modern_industrialization.client.items.SteamDrillHighlight; import aztech.modern_industrialization.client.items.SteamDrillTooltipComponent; import aztech.modern_industrialization.client.items.armor.ClientKeyHandler; import aztech.modern_industrialization.client.items.armor.HudRenderer; import aztech.modern_industrialization.client.items.armor.JetpackParticleAdder; import aztech.modern_industrialization.client.machines.MachineBlockEntityRenderer; -import aztech.modern_industrialization.client.machines.MachineOverlayClient; import aztech.modern_industrialization.client.machines.gui.MachineMenuClient; import aztech.modern_industrialization.client.machines.gui.MachineScreen; -import aztech.modern_industrialization.client.machines.models.MachineBakedModel; +import aztech.modern_industrialization.client.machines.models.CasingModels; +import aztech.modern_industrialization.client.machines.models.MachineItemModel; import aztech.modern_industrialization.client.machines.models.MachineUnbakedModel; -import aztech.modern_industrialization.client.machines.models.UseBlockModelUnbakedModel; +import aztech.modern_industrialization.client.machines.models.UseBlockModelBakedModel; import aztech.modern_industrialization.client.machines.multiblocks.MultiblockErrorHighlight; import aztech.modern_industrialization.client.machines.multiblocks.MultiblockMachineBER; import aztech.modern_industrialization.client.machines.multiblocks.MultiblockTankBER; import aztech.modern_industrialization.client.misc.VersionEvents; import aztech.modern_industrialization.client.pipes.MIPipesClient; import aztech.modern_industrialization.client.pipes.fluid.FluidPipeScreen; -import aztech.modern_industrialization.client.pipes.impl.DelegatingUnbakedModel; +import aztech.modern_industrialization.client.pipes.impl.PipeItemModel; import aztech.modern_industrialization.client.pipes.impl.PipeUnbakedModel; import aztech.modern_industrialization.client.pipes.item.ItemPipeScreen; +import aztech.modern_industrialization.client.util.UseBlockEntityRenderer; import aztech.modern_industrialization.config.MIClientConfig; import aztech.modern_industrialization.config.MIStartupConfig; import aztech.modern_industrialization.datagen.MIDatagenServer; -import aztech.modern_industrialization.datagen.model.DelegatingModelBuilder; import aztech.modern_industrialization.items.ConfigCardItem; -import aztech.modern_industrialization.items.RedstoneControlModuleItem; import aztech.modern_industrialization.items.SteamDrillItem; import aztech.modern_industrialization.machines.MachineBlock; import aztech.modern_industrialization.machines.blockentities.multiblocks.LargeTankMultiblockBlockEntity; -import aztech.modern_industrialization.machines.components.FuelBurningComponent; -import aztech.modern_industrialization.machines.models.MachineCasings; import aztech.modern_industrialization.machines.multiblocks.MultiblockMachineBlockEntity; import aztech.modern_industrialization.misc.runtime_datagen.RuntimeDataGen; import aztech.modern_industrialization.pipes.MIPipes; @@ -82,14 +78,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.client.renderer.item.ItemProperties; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.PackType; import net.minecraft.tags.TagKey; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.material.Fluids; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModList; @@ -101,12 +98,18 @@ import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.client.event.ModelEvent; +import net.neoforged.neoforge.client.event.RecipesReceivedEvent; +import net.neoforged.neoforge.client.event.RegisterBlockStateModels; import net.neoforged.neoforge.client.event.RegisterClientTooltipComponentFactoriesEvent; import net.neoforged.neoforge.client.event.RegisterGuiLayersEvent; +import net.neoforged.neoforge.client.event.RegisterItemModelsEvent; import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent; import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; import net.neoforged.neoforge.client.event.RegisterRenderBuffersEvent; +import net.neoforged.neoforge.client.event.RegisterSpecialModelRendererEvent; import net.neoforged.neoforge.client.event.RenderFrameEvent; +import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; +import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent; import net.neoforged.neoforge.client.gui.ConfigurationScreen; import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import net.neoforged.neoforge.client.gui.VanillaGuiLayers; @@ -126,12 +129,15 @@ private static void init(FMLConstructModEvent ignored) { modContainer.registerConfig(ModConfig.Type.CLIENT, MIClientConfig.SPEC); modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new); - NeoForge.EVENT_BUS.addListener(SteamDrillHighlight::onBlockHighlight); - NeoForge.EVENT_BUS.addListener(MachineOverlayClient::onBlockOutline); +// NeoForge.EVENT_BUS.addListener(SteamDrillHighlight::onBlockHighlight); +// NeoForge.EVENT_BUS.addListener(MachineOverlayClient::onBlockOutline); DeferredBarrelTextRenderer.init(); MultiblockErrorHighlight.init(); MIPipesClient.setupClient(modBus); VersionEvents.init(ModLoadingContext.get().getActiveContainer()); + NeoForge.EVENT_BUS.addListener(RecipesReceivedEvent.class, event -> { + MIClientProxy.clientSideRecipes = event.getRecipeMap(); + }); NeoForge.EVENT_BUS.addListener(RenderFrameEvent.Pre.class, event -> { JetpackParticleAdder.addJetpackParticles(Minecraft.getInstance()); @@ -146,35 +152,34 @@ private static void init(FMLConstructModEvent ignored) { // != null check if (Minecraft.getInstance().level != null && MIClientConfig.INSTANCE.fuelTooltips.getAsBoolean()) { try { - int fuelTime = event.getItemStack().getBurnTime(null); - if (fuelTime > 0) { - long totalEu = fuelTime * FuelBurningComponent.EU_PER_BURN_TICK; - event.getToolTip().add(new MITooltips.Line(MIText.BaseEuTotalStored).arg(totalEu, MITooltips.EU_PARSER).build()); - } + // TODO 26.1 +// int fuelTime = event.getItemStack().getBurnTime(null); +// if (fuelTime > 0) { +// long totalEu = fuelTime * FuelBurningComponent.EU_PER_BURN_TICK; +// event.getToolTip().add(new MITooltips.Line(MIText.BaseEuTotalStored).arg(totalEu, MITooltips.EU_PARSER).build()); +// } } catch (Exception e) { MI.LOGGER.warn("Could not show MI fuel tooltip.", e); } } if (event.getFlags().isAdvanced() && MIClientConfig.INSTANCE.itemTagTooltips.getAsBoolean()) { - var ids = event.getItemStack().getTags().map(TagKey::location).sorted().toList(); - for (ResourceLocation id : ids) { + var ids = event.getItemStack().tags().map(TagKey::location).sorted().toList(); + for (Identifier id : ids) { event.getToolTip().add(Component.literal("#" + id).setStyle(TextHelper.GRAY_TEXT)); } } }); - modBus.addListener(GatherDataEvent.class, event -> { + modBus.addListener(GatherDataEvent.Client.class, event -> { MIDatagenClient.configure( event.getGenerator(), - event.getExistingFileHelper(), event.getLookupProvider(), - event.includeServer(), false); }); modBus.addListener(RegisterRenderBuffersEvent.class, event -> { - event.registerRenderBuffer(MIRenderTypes.cutoutHighlight()); +// event.registerRenderBuffer(MIRenderTypes.cutoutHighlight()); }); // Warn if neither JEI nor REI is present! @@ -198,6 +203,24 @@ private static void init(FMLConstructModEvent ignored) { MI.LOGGER.info("Modern Industrialization client setup done!"); } + @SubscribeEvent + private static void registerClientExtensions(RegisterClientExtensionsEvent event) { + for (var fluidDefinition : MIFluids.FLUID_DEFINITIONS.values()) { + var stillTexture = fluidDefinition.getId().withPath("fluid/%s_still"::formatted); + event.registerFluidType(new IClientFluidTypeExtensions() { + @Override + public Identifier getStillTexture() { + return stillTexture; + } + + @Override + public Identifier getFlowingTexture() { + return IClientFluidTypeExtensions.of(Fluids.WATER).getFlowingTexture(); + } + }, fluidDefinition.getFluidType()); + } + } + @SubscribeEvent private static void registerMenuScreens(RegisterMenuScreensEvent event) { event.register(MIRegistries.FORGE_HAMMER_MENU.get(), ForgeHammerScreen::new); @@ -208,24 +231,33 @@ private static void registerMenuScreens(RegisterMenuScreensEvent event) { } @SubscribeEvent - private static void registerModelLoaders(ModelEvent.RegisterGeometryLoaders event) { - event.register(DelegatingModelBuilder.LOADER_ID, DelegatingUnbakedModel.LOADER); - event.register(MachineUnbakedModel.LOADER_ID, MachineUnbakedModel.LOADER); - event.register(PipeUnbakedModel.LOADER_ID, PipeUnbakedModel.LOADER); - event.register(UseBlockModelUnbakedModel.LOADER_ID, UseBlockModelUnbakedModel.LOADER); + private static void registerBlockStateModels(RegisterBlockStateModels event) { + event.registerModel(MachineUnbakedModel.LOADER_ID, MachineUnbakedModel.CODEC); + event.registerModel(PipeUnbakedModel.TYPE_ID, PipeUnbakedModel.CODEC); + event.registerModel(UseBlockModelBakedModel.Unbaked.TYPE_ID, UseBlockModelBakedModel.Unbaked.CODEC); } @SubscribeEvent - private static void registerAdditionalModels(ModelEvent.RegisterAdditional event) { - for (var casing : MachineCasings.registeredCasings.values()) { - event.register(MachineBakedModel.getCasingModelId(casing)); - } + private static void registerItemModels(RegisterItemModelsEvent event) { + event.register(MachineItemModel.Unbaked.TYPE_ID, MachineItemModel.Unbaked.CODEC); + event.register(PipeItemModel.Unbaked.TYPE_ID, PipeItemModel.Unbaked.CODEC); + } + + @SubscribeEvent + private static void registerSpecialRenderers(RegisterSpecialModelRendererEvent event) { + event.register(UseBlockEntityRenderer.Unbaked.TYPE_ID, UseBlockEntityRenderer.Unbaked.CODEC); + } + + @SubscribeEvent + private static void registerStandaloneModels(ModelEvent.RegisterStandalone event) { + CasingModels.loadModels(event); } private static final List blockEntityRendererRegistrations = new ArrayList<>(); - public static void registerBlockEntityRenderer(Supplier> bet, - BlockEntityRendererProvider renderer) { + public static void registerBlockEntityRenderer( + Supplier> bet, + BlockEntityRendererProvider renderer) { blockEntityRendererRegistrations.add(() -> BlockEntityRenderers.register(bet.get(), renderer)); } @@ -246,7 +278,7 @@ private static void registerBlockEntityRenderers(FMLClientSetupEvent event) { } } - BlockEntityRenderers.register(MIRegistries.CREATIVE_BARREL_BE.get(), context -> new BarrelRenderer(0x000000)); + BlockEntityRenderers.register(MIRegistries.CREATIVE_BARREL_BE.get(), context -> new BarrelRenderer(context.itemModelResolver(), 0x000000)); BlockEntityRenderers.register(MIRegistries.CREATIVE_TANK_BE.get(), context -> new TankRenderer(0x000000)); blockEntityRendererRegistrations.forEach(Runnable::run); @@ -268,14 +300,4 @@ private static void registerGuiOverlays(RegisterGuiLayersEvent event) { private static void registerKeyMappings(RegisterKeyMappingsEvent event) { MIKeybinds.init(event); } - - @SubscribeEvent - private static void registerItemProperties(FMLClientSetupEvent event) { - event.enqueueWork(() -> { - ItemProperties.register(MIItem.REDSTONE_CONTROL_MODULE.asItem(), MI.id("redstone_control_module"), - (stack, level, entity, seed) -> { - return RedstoneControlModuleItem.isRequiresLowSignal(stack) ? 0 : 1; - }); - }); - } } diff --git a/src/client/java/aztech/modern_industrialization/client/MIClientProxy.java b/src/client/java/aztech/modern_industrialization/client/MIClientProxy.java index 007a3d864..013f14234 100644 --- a/src/client/java/aztech/modern_industrialization/client/MIClientProxy.java +++ b/src/client/java/aztech/modern_industrialization/client/MIClientProxy.java @@ -30,13 +30,15 @@ import aztech.modern_industrialization.client.blocks.storage.barrel.BarrelRenderer; import aztech.modern_industrialization.client.blocks.storage.tank.TankRenderer; import aztech.modern_industrialization.client.machines.gui.MachineMenuClient; -import aztech.modern_industrialization.client.machines.models.MachineBakedModel; +import aztech.modern_industrialization.client.machines.models.CasingModels; +import aztech.modern_industrialization.client.machines.models.MachineBlockStateModel; import aztech.modern_industrialization.client.machines.models.UseBlockModelBakedModel; import aztech.modern_industrialization.client.textures.TextureHelper; import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.config.MIClientConfig; import aztech.modern_industrialization.items.SteamDrillHooks; import aztech.modern_industrialization.machines.gui.MachineMenuCommon; +import aztech.modern_industrialization.machines.models.MachineCasings; import aztech.modern_industrialization.machines.models.MachineModelClientData; import aztech.modern_industrialization.machines.multiblocks.HatchBlockEntity; import aztech.modern_industrialization.machines.multiblocks.MultiblockMachineBlockEntity; @@ -45,13 +47,15 @@ import java.util.function.Supplier; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; @@ -97,17 +101,7 @@ public void delayNextBlockAttack(Player player) { @Override public boolean hasShiftDown() { - return Screen.hasShiftDown(); - } - - @Override - public void withStandardItemRenderer(Consumer stupidClientProperties) { - ((Consumer) stupidClientProperties).accept(new IClientItemExtensions() { - @Override - public BlockEntityWithoutLevelRenderer getCustomRenderer() { - return RenderHelper.BLOCK_AND_ENTITY_RENDERER; - } - }); + return Minecraft.getInstance().hasShiftDown(); } @Override @@ -117,7 +111,7 @@ public void registerPartTankClient(Supplier> blockEntityType, int meanRgb) { - MIClient.registerBlockEntityRenderer(blockEntityType, context -> new BarrelRenderer(TextureHelper.getOverlayTextColor(meanRgb))); + MIClient.registerBlockEntityRenderer(blockEntityType, context -> new BarrelRenderer(context.itemModelResolver(), TextureHelper.getOverlayTextColor(meanRgb))); } @Override @@ -145,7 +139,7 @@ public BlockState getMachineCasingBlockState(BlockState state, BlockAndTintGette if (casing == null) { // No override, then pull the casing from the machine's baked model. var machineModel = Minecraft.getInstance().getBlockRenderer().getBlockModel(state); - if (machineModel instanceof MachineBakedModel mbm) { + if (machineModel instanceof MachineBlockStateModel mbm) { casing = mbm.getBaseCasing(); } else { // Couldn't find casing... :( @@ -154,11 +148,22 @@ public BlockState getMachineCasingBlockState(BlockState state, BlockAndTintGette } // Pull the block state from the casing model if possible - var casingModel = MachineBakedModel.getCasingModel(casing); - if (casingModel instanceof UseBlockModelBakedModel ubmbm) { - return ubmbm.getTargetState(); + var casingModel = CasingModels.getCasingModel(casing); + if (casingModel.model() instanceof UseBlockModelBakedModel ubmbm) { + return ubmbm.targetState(); } // Couldn't find target state return state; } + + @Nullable + public static RecipeMap clientSideRecipes = null; + + @Override + public RecipeMap getRecipeMap(Level level) { + if (level instanceof ClientLevel && clientSideRecipes != null) { + return clientSideRecipes; + } + return super.getRecipeMap(level); + } } diff --git a/src/client/java/aztech/modern_industrialization/client/MIKeybinds.java b/src/client/java/aztech/modern_industrialization/client/MIKeybinds.java index 9dc6f85af..9c1abb4b7 100644 --- a/src/client/java/aztech/modern_industrialization/client/MIKeybinds.java +++ b/src/client/java/aztech/modern_industrialization/client/MIKeybinds.java @@ -36,7 +36,7 @@ import java.util.function.BiConsumer; import java.util.function.Function; import java.util.function.Predicate; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.world.entity.EquipmentSlot; @@ -55,10 +55,11 @@ public static Set getMappings() { } public static void init(RegisterKeyMappingsEvent event) { + event.registerCategory(CATEGORY); MAPPINGS.forEach(m -> event.register(m.holder().get())); } - public static final String CATEGORY = Util.makeDescriptionId("key.categories", MI.id(MI.ID)); + public static final KeyMapping.Category CATEGORY = new KeyMapping.Category(MI.id(MI.ID)); public static final Keybind TOGGLE_FLIGHT = create( "toggle_flight", diff --git a/src/client/java/aztech/modern_industrialization/client/MIRenderTypes.java b/src/client/java/aztech/modern_industrialization/client/MIRenderTypes.java index fd0096bad..438d0f631 100644 --- a/src/client/java/aztech/modern_industrialization/client/MIRenderTypes.java +++ b/src/client/java/aztech/modern_industrialization/client/MIRenderTypes.java @@ -26,55 +26,55 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.TextureAtlas; import org.jspecify.annotations.Nullable; public class MIRenderTypes { - private static @Nullable RenderType MACHINE_WRENCH_OVERLAY; - private static @Nullable RenderType CUTOUT_HIGHLIGHT; // used by hatch preview and wrong block highlight - - public static RenderType machineOverlay() { - if (MACHINE_WRENCH_OVERLAY == null) { - MACHINE_WRENCH_OVERLAY = Factory.makeMachineOverlay(); - } - return MACHINE_WRENCH_OVERLAY; - } - - public static RenderType cutoutHighlight() { - if (CUTOUT_HIGHLIGHT == null) { - CUTOUT_HIGHLIGHT = Factory.makeCutoutHighlight(); - } - return CUTOUT_HIGHLIGHT; - } - - // This is a subclass to get access to a bunch of fields and classes. - // TODO: PR more transitive access wideners to fabric - private static class Factory extends RenderType { - private Factory(String string, VertexFormat vertexFormat, VertexFormat.Mode mode, int i, boolean bl, boolean bl2, Runnable runnable, - Runnable runnable2) { - super(string, vertexFormat, mode, i, bl, bl2, runnable, runnable2); - } - - private static RenderType makeMachineOverlay() { - return create("machine_overlay", DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.QUADS, 65536, false, true, - CompositeState.builder() - .setTransparencyState(TRANSLUCENT_TRANSPARENCY) - .setTextureState(NO_TEXTURE) - .setLightmapState(NO_LIGHTMAP) - .setShaderState(POSITION_COLOR_SHADER) - .createCompositeState(false)); - } - - private static RenderType makeCutoutHighlight() { - // Use block vertex format to use the fast path in BufferBuilder, even if the shader doesn't use the extra vertex attributes. - return create("cutout_highlight", DefaultVertexFormat.BLOCK, VertexFormat.Mode.QUADS, 65536, false, false, - CompositeState.builder() - .setTransparencyState(NO_TRANSPARENCY) - .setTextureState(new TextureStateShard(TextureAtlas.LOCATION_BLOCKS, false, false)) - .setLightmapState(LIGHTMAP) - .setShaderState(POSITION_COLOR_TEX_LIGHTMAP_SHADER) - .createCompositeState(false)); - } - } + // TODO 26.1 +// private static @Nullable RenderType MACHINE_WRENCH_OVERLAY; +// private static @Nullable RenderType CUTOUT_HIGHLIGHT; // used by hatch preview and wrong block highlight +// +// public static RenderType machineOverlay() { +// if (MACHINE_WRENCH_OVERLAY == null) { +// MACHINE_WRENCH_OVERLAY = Factory.makeMachineOverlay(); +// } +// return MACHINE_WRENCH_OVERLAY; +// } +// +// public static RenderType cutoutHighlight() { +// if (CUTOUT_HIGHLIGHT == null) { +// CUTOUT_HIGHLIGHT = Factory.makeCutoutHighlight(); +// } +// return CUTOUT_HIGHLIGHT; +// } +// +// // This is a subclass to get access to a bunch of fields and classes. +// // TODO: PR more transitive access wideners to fabric +// private static class Factory extends RenderType { +// private Factory(String string, VertexFormat vertexFormat, VertexFormat.Mode mode, int i, boolean bl, boolean bl2, Runnable runnable, +// Runnable runnable2) { +// super(string, vertexFormat, mode, i, bl, bl2, runnable, runnable2); +// } +// +// private static RenderType makeMachineOverlay() { +// return create("machine_overlay", DefaultVertexFormat.POSITION_COLOR_NORMAL, VertexFormat.Mode.QUADS, 65536, false, true, +// CompositeState.builder() +// .setTransparencyState(TRANSLUCENT_TRANSPARENCY) +// .setTextureState(NO_TEXTURE) +// .setLightmapState(NO_LIGHTMAP) +// .setShaderState(POSITION_COLOR_SHADER) +// .createCompositeState(false)); +// } +// +// private static RenderType makeCutoutHighlight() { +// // Use block vertex format to use the fast path in BufferBuilder, even if the shader doesn't use the extra vertex attributes. +// return create("cutout_highlight", DefaultVertexFormat.BLOCK, VertexFormat.Mode.QUADS, 65536, false, false, +// CompositeState.builder() +// .setTransparencyState(NO_TRANSPARENCY) +// .setTextureState(new TextureStateShard(TextureAtlas.LOCATION_BLOCKS, false, false)) +// .setLightmapState(LIGHTMAP) +// .setShaderState(POSITION_COLOR_TEX_LIGHTMAP_SHADER) +// .createCompositeState(false)); +// } +// } } diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/forgehammer/ForgeHammerScreen.java b/src/client/java/aztech/modern_industrialization/client/blocks/forgehammer/ForgeHammerScreen.java index ade1c7d34..e952b0a14 100644 --- a/src/client/java/aztech/modern_industrialization/client/blocks/forgehammer/ForgeHammerScreen.java +++ b/src/client/java/aztech/modern_industrialization/client/blocks/forgehammer/ForgeHammerScreen.java @@ -26,20 +26,22 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.blocks.forgehammer.ForgeHammerScreenHandler; -import aztech.modern_industrialization.client.screen.MIHandledScreen; +import aztech.modern_industrialization.client.screen.MIContainerScreen; import aztech.modern_industrialization.client.util.RenderHelper; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.input.MouseButtonEvent; import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.player.Inventory; -public class ForgeHammerScreen extends MIHandledScreen { - public static final ResourceLocation FORGE_HAMMER_GUI = MI.id("textures/gui/container/forge_hammer.png"); +public class ForgeHammerScreen extends MIContainerScreen { + public static final Identifier FORGE_HAMMER_GUI = MI.id("textures/gui/container/forge_hammer.png"); private static final int X_OFFSET = 61, Y_OFFSET = 14; @@ -51,12 +53,12 @@ public ForgeHammerScreen(ForgeHammerScreenHandler handler, Inventory inventory, } @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { + public boolean mouseClicked(MouseButtonEvent event, boolean doubleClick) { int i = this.leftPos + X_OFFSET; int j = this.topPos + Y_OFFSET + 2; - int x1 = (int) Math.floor((mouseX - i) / 16d); - int y1 = (int) Math.floor((mouseY - j) / 18d); + int x1 = (int) Math.floor((event.x() - i) / 16d); + int y1 = (int) Math.floor((event.y() - j) / 18d); if (x1 >= 0 && x1 <= 3 && y1 >= 0 && y1 <= 2) { int id = x1 + y1 * 4; @@ -67,7 +69,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) { } } - return super.mouseClicked(mouseX, mouseY, button); + return super.mouseClicked(event, doubleClick); } @Override @@ -78,9 +80,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) @Override protected void renderBg(GuiGraphics guiGraphics, float delta, int mouseX, int mouseY) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - guiGraphics.blit(FORGE_HAMMER_GUI, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, FORGE_HAMMER_GUI, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight, 256, 256); int l = this.leftPos + X_OFFSET; int m = this.topPos + Y_OFFSET; this.renderRecipeBackground(guiGraphics, mouseX, mouseY, l, m); @@ -94,7 +94,7 @@ private void renderRecipeIcons(GuiGraphics guiGraphics, int x, int y) { int l = i / 4; int m = y + l * 18 + 2; - RenderHelper.renderAndDecorateItem(guiGraphics, font, handler.getAvailableRecipes().get(i).value().result(), k, m); + RenderHelper.renderAndDecorateItem(guiGraphics, font, handler.getAvailableRecipes().get(i).value().result().create(), k, m); } } @@ -112,7 +112,7 @@ private void renderRecipeBackground(GuiGraphics guiGraphics, int mouseX, int mou n += 36; } - guiGraphics.blit(FORGE_HAMMER_GUI, k, m - 1, 0, n, 16, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, FORGE_HAMMER_GUI, k, m - 1, 0, n, 16, 18, 256, 256); } } @@ -125,7 +125,7 @@ protected void renderTooltip(GuiGraphics guiGraphics, int x, int y) { int n = x1 + l % 4 * 16; int o = y1 + l / 4 * 18 + 2; if (x >= n && x < n + 16 && y >= o && y < o + 18) { - guiGraphics.renderTooltip(font, handler.getAvailableRecipes().get(l).value().result(), x, y); + guiGraphics.setTooltipForNextFrame(font, handler.getAvailableRecipes().get(l).value().result().create(), x, y); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderState.java b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderState.java new file mode 100644 index 000000000..91d1800bd --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderState.java @@ -0,0 +1,9 @@ +package aztech.modern_industrialization.client.blocks.storage.barrel; + +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import net.minecraft.client.renderer.item.ItemStackRenderState; + +public class BarrelRenderState extends BlockEntityRenderState { + public boolean locked; + public final ItemStackRenderState stackRenderState = new ItemStackRenderState(); +} diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderer.java b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderer.java index b9ab79366..1ca9347f7 100644 --- a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderer.java +++ b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelRenderer.java @@ -27,38 +27,60 @@ import aztech.modern_industrialization.blocks.storage.barrel.BarrelBlockEntity; import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.config.MIClientConfig; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import net.minecraft.client.renderer.feature.ModelFeatureRenderer; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.state.CameraRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.Direction; +import net.minecraft.util.LightCoordsUtil; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; +import net.minecraft.world.phys.Vec3; +import org.jspecify.annotations.Nullable; -public class BarrelRenderer implements BlockEntityRenderer { +public class BarrelRenderer implements BlockEntityRenderer { private static final ThreadLocal barrelNesting = ThreadLocal.withInitial(() -> 0); + private final ItemModelResolver itemModelResolver; private final int itemNameColor; - public BarrelRenderer(int itemNameColor) { + public BarrelRenderer(ItemModelResolver itemModelResolver, int itemNameColor) { + this.itemModelResolver = itemModelResolver; this.itemNameColor = itemNameColor; } @Override - public void render(BarrelBlockEntity entity, float tickDelta, PoseStack matrices, MultiBufferSource vertexConsumers, - int light, int overlay) { - if (entity.isLocked()) { - RenderHelper.drawLockedTexture(entity, matrices, vertexConsumers, itemNameColor); + public BarrelRenderState createRenderState() { + return new BarrelRenderState(); + } + + @Override + public void extractRenderState(BarrelBlockEntity barrel, BarrelRenderState state, float partialTicks, Vec3 cameraPosition, ModelFeatureRenderer.@Nullable CrumblingOverlay breakProgress) { + BlockEntityRenderer.super.extractRenderState(barrel, state, partialTicks, cameraPosition, breakProgress); + state.locked = barrel.isLocked(); + this.itemModelResolver.updateForTopItem( + state.stackRenderState, barrel.getResource(0).toStack(), ItemDisplayContext.GUI, barrel.getLevel(), null, 0); + } + + @Override + public void submit(BarrelRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState camera) { + if (state.locked) { + RenderHelper.drawLockedTexture(poseStack, submitNodeCollector, itemNameColor); } if (!MIClientConfig.INSTANCE.barrelContentRendering.getAsBoolean()) { return; } + // TODO: this check is likely misplaced int nesting = barrelNesting.get(); if (nesting >= 4) { return; @@ -67,43 +89,42 @@ public void render(BarrelBlockEntity entity, float tickDelta, PoseStack matrices barrelNesting.set(nesting + 1); try { - var state = entity.getBlockState(); - var pos = entity.getBlockPos(); - - ItemVariant item = entity.getResource(); +// var state = entity.getBlockState(); +// var pos = entity.getBlockPos(); - if (!item.isBlank()) { - ItemStack toRender = item.toStack(); + if (!state.stackRenderState.isEmpty()) { int sideMask = 0; for (int i = 0; i < 4; i++) { - var direction = Direction.from2DDataValue(i); - // Note: level can be null from builtin item renderer - if (entity.getLevel() != null - && !Block.shouldRenderFace(state, entity.getLevel(), pos, direction, pos.relative(direction))) { - continue; - } +// var direction = Direction.from2DDataValue(i); + // TODO 26.1: it would be nice to restore this? +// // Note: level can be null from builtin item renderer +// if (entity.getLevel() != null +// && !Block.shouldRenderFace(state, entity.getLevel(), pos, direction, pos.relative(direction))) { +// continue; +// } sideMask |= 1 << i; // Thanks TechReborn for rendering code - matrices.pushPose(); - matrices.translate(0.5, 0, 0.5); - matrices.mulPose(Axis.YP.rotationDegrees(-i * 90F)); - matrices.scale(0.5F, 0.5F, 0.5F); - matrices.translate(0, 1.125, 1.01); + poseStack.pushPose(); + poseStack.translate(0.5, 0, 0.5); + poseStack.mulPose(Axis.YP.rotationDegrees(-i * 90F)); + poseStack.scale(0.5F, 0.5F, 0.5F); + poseStack.translate(0, 1.125, 1.01); - matrices.last().pose().scale(1, 1, 0.01f); - matrices.last().normal().rotate(Mth.HALF_PI / 2, -1, 0, 0); + poseStack.last().pose().scale(1, 1, 0.01f); + poseStack.last().normal().rotate(Mth.HALF_PI / 2, -1, 0, 0); - Minecraft.getInstance().getItemRenderer().renderStatic(toRender, ItemDisplayContext.GUI, RenderHelper.FULL_LIGHT, - OverlayTexture.NO_OVERLAY, matrices, vertexConsumers, entity.getLevel(), 0); + state.stackRenderState.submit( + poseStack, submitNodeCollector, LightCoordsUtil.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 0); - matrices.popPose(); + poseStack.popPose(); } - DeferredBarrelTextRenderer.enqueueBarrelForRendering(pos, sideMask, itemNameColor); + // TODO 26.1 +// DeferredBarrelTextRenderer.enqueueBarrelForRendering(pos, sideMask, itemNameColor); } } finally { barrelNesting.set(nesting); diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelTooltipComponent.java b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelTooltipComponent.java index 05c4e7b3e..b499b74c3 100644 --- a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelTooltipComponent.java +++ b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/BarrelTooltipComponent.java @@ -29,36 +29,37 @@ import aztech.modern_industrialization.blocks.storage.barrel.BarrelTooltipData; import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.util.TextHelper; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; -import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; +import net.minecraft.util.LightCoordsUtil; import org.joml.Matrix4f; public record BarrelTooltipComponent(BarrelTooltipData data) implements ClientTooltipComponent { @Override - public int getHeight() { + public int getHeight(Font font) { return 30; } @Override - public int getWidth(Font textRenderer) { - return Math.max(textRenderer.width(data.variant().toStack().getHoverName()), 20 + textRenderer.width(getItemNumber())); + public int getWidth(Font font) { + return Math.max(font.width(data.variant().toStack().getHoverName()), 20 + font.width(getItemNumber())); } @Override - public void renderText(Font textRenderer, int x, int y, Matrix4f matrix4f, MultiBufferSource.BufferSource immediate) { + public void renderImage(Font font, int x, int y, int w, int h, GuiGraphics graphics) { + RenderHelper.renderAndDecorateItem(graphics, font, data.variant().toStack(), x, y + 10); + Style style = MITooltips.DEFAULT_STYLE; - textRenderer.drawInBatch(data.variant().toStack().getHoverName().copy().setStyle(style), x, y, -1, true, matrix4f, immediate, - Font.DisplayMode.NORMAL, 0, LightTexture.FULL_BRIGHT); + graphics.drawString(font, data.variant().toStack().getHoverName().copy().setStyle(style), x, y, -1, true); - textRenderer.drawInBatch(getItemNumber(), x + 20, y + 15, -1, true, matrix4f, immediate, Font.DisplayMode.NORMAL, 0, - LightTexture.FULL_BRIGHT); + graphics.drawString(font, getItemNumber(), x + 20, y + 15, -1, true); } public Component getItemNumber() { @@ -75,7 +76,7 @@ public Component getItemNumber() { String capacityStr; Component percent = MITooltips.INVERTED_RATIO_PERCENTAGE_PARSER.parse((double) amount / capacity); - if (Screen.hasShiftDown()) { + if (Minecraft.getInstance().hasShiftDown()) { amountStr = "" + amount; capacityStr = "" + capacity; @@ -90,9 +91,4 @@ public Component getItemNumber() { return itemNumber; } - - @Override - public void renderImage(Font font, int x, int y, GuiGraphics guiGraphics) { - RenderHelper.renderAndDecorateItem(guiGraphics, font, data.variant().toStack(), x, y + 10); - } } diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/DeferredBarrelTextRenderer.java b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/DeferredBarrelTextRenderer.java index ab1f2a232..434bd02f3 100644 --- a/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/DeferredBarrelTextRenderer.java +++ b/src/client/java/aztech/modern_industrialization/client/blocks/storage/barrel/DeferredBarrelTextRenderer.java @@ -45,90 +45,91 @@ private record Entry(BlockPos pos, int sideMask, int itemNameColor) {} private static final MultiBufferSource.BufferSource immediate = MultiBufferSource.immediate(new ByteBufferBuilder(128)); public static void init() { - NeoForge.EVENT_BUS.addListener(DeferredBarrelTextRenderer::render); +// NeoForge.EVENT_BUS.addListener(DeferredBarrelTextRenderer::render); } public static void enqueueBarrelForRendering(BlockPos pos, int sideMask, int itemNameColor) { barrelsToRender.add(new Entry(pos.immutable(), sideMask, itemNameColor)); } - private static void render(RenderLevelStageEvent event) { - if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_BLOCK_ENTITIES) { - return; - } - var level = Minecraft.getInstance().level; - if (level == null) { - return; - } - - var matrices = event.getPoseStack(); - matrices.pushPose(); - var camPos = event.getCamera().getPosition(); - matrices.translate(-camPos.x, -camPos.y, -camPos.z); - - for (var entry : barrelsToRender) { - var pos = entry.pos(); - int sideMask = entry.sideMask(); - - if (!(level.getBlockEntity(pos) instanceof BarrelBlockEntity entity)) { - continue; - } - - matrices.pushPose(); - matrices.translate(pos.getX(), pos.getY(), pos.getZ()); - - String amount; - if (entity.behaviour.isCreative()) { - amount = "∞"; - } else { - amount = String.valueOf(entity.getAmount()); - } - ItemStack toRender = entity.getResource().toStack(); - - for (int i = 0; i < 4; ++i) { - if ((sideMask & (1 << i)) == 0) { - continue; - } - - Font textRenderer = Minecraft.getInstance().font; - String itemName = toRender.getHoverName().getString(); - matrices.pushPose(); - matrices.translate(0.5, 1.14, 0.5); - matrices.mulPose(Axis.YP.rotationDegrees((2 - i) * 90F)); - matrices.translate(0, 0.15, -0.505); - matrices.scale(-0.01f, -0.01F, -0.01f); - - // Adjust width - final int maxWidth = 100; - if (textRenderer.width(itemName) > maxWidth) { - itemName = textRenderer.plainSubstrByWidth(itemName, maxWidth - textRenderer.width("...")) + "..."; - } - - float xPosition = (float) (-textRenderer.width(itemName) / 2); - textRenderer.drawInBatch(itemName, xPosition, -4f + 40, entry.itemNameColor(), false, matrices.last().pose(), immediate, - Font.DisplayMode.NORMAL, 0, RenderHelper.FULL_LIGHT); - - matrices.popPose(); - - matrices.pushPose(); - matrices.translate(0.5, 0.5, 0.5); - matrices.mulPose(Axis.YP.rotationDegrees((2 - i) * 90F)); - matrices.translate(0, 0.0875, -0.505); - matrices.scale(-0.01f, -0.01F, -0.01f); - - xPosition = (float) (-textRenderer.width(amount) / 2); - textRenderer.drawInBatch(amount, xPosition, -4f + 40, 0x000000, false, matrices.last().pose(), immediate, - Font.DisplayMode.NORMAL, 0, RenderHelper.FULL_LIGHT); - - matrices.popPose(); - } - - matrices.popPose(); - } - - matrices.popPose(); - - barrelsToRender.clear(); - immediate.endBatch(); - } +// private static void render(RenderLevelStageEvent event) { + // TODO 26.1 +// if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_BLOCK_ENTITIES) { +// return; +// } +// var level = Minecraft.getInstance().level; +// if (level == null) { +// return; +// } +// +// var matrices = event.getPoseStack(); +// matrices.pushPose(); +// var camPos = event.getCamera().getPosition(); +// matrices.translate(-camPos.x, -camPos.y, -camPos.z); +// +// for (var entry : barrelsToRender) { +// var pos = entry.pos(); +// int sideMask = entry.sideMask(); +// +// if (!(level.getBlockEntity(pos) instanceof BarrelBlockEntity entity)) { +// continue; +// } +// +// matrices.pushPose(); +// matrices.translate(pos.getX(), pos.getY(), pos.getZ()); +// +// String amount; +// if (entity.behaviour.isCreative()) { +// amount = "∞"; +// } else { +// amount = String.valueOf(entity.getAmount()); +// } +// ItemStack toRender = entity.getResource().toStack(); +// +// for (int i = 0; i < 4; ++i) { +// if ((sideMask & (1 << i)) == 0) { +// continue; +// } +// +// Font textRenderer = Minecraft.getInstance().font; +// String itemName = toRender.getHoverName().getString(); +// matrices.pushPose(); +// matrices.translate(0.5, 1.14, 0.5); +// matrices.mulPose(Axis.YP.rotationDegrees((2 - i) * 90F)); +// matrices.translate(0, 0.15, -0.505); +// matrices.scale(-0.01f, -0.01F, -0.01f); +// +// // Adjust width +// final int maxWidth = 100; +// if (textRenderer.width(itemName) > maxWidth) { +// itemName = textRenderer.plainSubstrByWidth(itemName, maxWidth - textRenderer.width("...")) + "..."; +// } +// +// float xPosition = (float) (-textRenderer.width(itemName) / 2); +// textRenderer.drawInBatch(itemName, xPosition, -4f + 40, entry.itemNameColor(), false, matrices.last().pose(), immediate, +// Font.DisplayMode.NORMAL, 0, RenderHelper.FULL_LIGHT); +// +// matrices.popPose(); +// +// matrices.pushPose(); +// matrices.translate(0.5, 0.5, 0.5); +// matrices.mulPose(Axis.YP.rotationDegrees((2 - i) * 90F)); +// matrices.translate(0, 0.0875, -0.505); +// matrices.scale(-0.01f, -0.01F, -0.01f); +// +// xPosition = (float) (-textRenderer.width(amount) / 2); +// textRenderer.drawInBatch(amount, xPosition, -4f + 40, 0x000000, false, matrices.last().pose(), immediate, +// Font.DisplayMode.NORMAL, 0, RenderHelper.FULL_LIGHT); +// +// matrices.popPose(); +// } +// +// matrices.popPose(); +// } +// +// matrices.popPose(); +// +// barrelsToRender.clear(); +// immediate.endBatch(); +// } } diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderState.java b/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderState.java new file mode 100644 index 000000000..7a4d92656 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderState.java @@ -0,0 +1,11 @@ +package aztech.modern_industrialization.client.blocks.storage.tank; + +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import net.neoforged.neoforge.transfer.fluid.FluidResource; + +public class TankRenderState extends BlockEntityRenderState { + public FluidResource resource = FluidResource.EMPTY; + public int fluidColor; + public float fillLevel; + public boolean locked; +} diff --git a/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderer.java b/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderer.java index 403bbf8e7..7b848e2aa 100644 --- a/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderer.java +++ b/src/client/java/aztech/modern_industrialization/client/blocks/storage/tank/TankRenderer.java @@ -28,9 +28,14 @@ import aztech.modern_industrialization.client.util.RenderHelper; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.feature.ModelFeatureRenderer; +import net.minecraft.client.renderer.state.CameraRenderState; +import net.minecraft.world.phys.Vec3; +import org.jspecify.annotations.Nullable; -public class TankRenderer implements BlockEntityRenderer { +public class TankRenderer implements BlockEntityRenderer { private final int lockIconColor; public TankRenderer(int lockIconColor) { @@ -38,25 +43,36 @@ public TankRenderer(int lockIconColor) { } @Override - public void render(AbstractTankBlockEntity tank, - float tickDelta, - PoseStack matrices, - MultiBufferSource vertexConsumers, - int light, int overlay) { - if (!tank.getResource().isBlank()) { + public TankRenderState createRenderState() { + return new TankRenderState(); + } + + @Override + public void extractRenderState(AbstractTankBlockEntity tank, TankRenderState state, float partialTicks, Vec3 cameraPosition, ModelFeatureRenderer.@Nullable CrumblingOverlay breakProgress) { + BlockEntityRenderer.super.extractRenderState(tank, state, partialTicks, cameraPosition, breakProgress); + state.resource = tank.getResource(0); + state.fluidColor = RenderHelper.getFluidColor(state.resource, tank.getLevel(), tank.getBlockPos());; + if (!tank.getResource(0).isEmpty()) { if (tank.behaviour.isCreative()) { - RenderHelper.drawFluidInTank(tank, matrices, vertexConsumers, tank.getResource(), 1); + state.fillLevel = 1; + } else if (tank.getAmountAsLong(0) > 0) { + state.fillLevel = (float) tank.getAmountAsLong(0) / tank.getCapacityAsLong(0, state.resource); + } else if (tank.isLocked()) { + state.fillLevel = 0.01f; } else { - if (tank.getAmount() > 0) { - RenderHelper.drawFluidInTank(tank, matrices, vertexConsumers, tank.getResource(), (float) tank.getAmount() / tank.getCapacity()); - } else if (tank.isLocked()) { - RenderHelper.drawFluidInTank(tank, matrices, vertexConsumers, tank.getResource(), 0.01f); - } + state.fillLevel = 0; } } + state.locked = tank.isLocked(); + } - if (tank.isLocked()) { - RenderHelper.drawLockedTexture(tank, matrices, vertexConsumers, lockIconColor); + @Override + public void submit(TankRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState camera) { + if (!state.resource.isEmpty() && state.fillLevel > 0) { + RenderHelper.drawFluidInTank(poseStack, submitNodeCollector, state.resource, state.fillLevel, state.fluidColor); + } + if (state.locked) { + RenderHelper.drawLockedTexture(poseStack, submitNodeCollector, lockIconColor); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/ae2/MIAEAddonClient.java b/src/client/java/aztech/modern_industrialization/client/compat/ae2/MIAEAddonClient.java index 60fe4b7df..b6d0fb405 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/ae2/MIAEAddonClient.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/ae2/MIAEAddonClient.java @@ -29,26 +29,18 @@ import aztech.modern_industrialization.client.pipes.impl.PipeMeshCache; import aztech.modern_industrialization.compat.ae2.MIAEAddon; import aztech.modern_industrialization.pipes.api.PipeNetworkType; -import java.util.Collection; -import java.util.List; -import java.util.function.Function; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.Material; -import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.client.resources.model.ModelBaker; +import net.minecraft.data.AtlasIds; +import net.neoforged.neoforge.client.ClientHooks; public class MIAEAddonClient { private static final PipeRenderer.Factory ME_RENDERER = new PipeRenderer.Factory() { @Override - public Collection getSpriteDependencies() { - return List.of(new Material(InventoryMenu.BLOCK_ATLAS, MI.id("block/pipes/me")), - new Material(InventoryMenu.BLOCK_ATLAS, MI.id("block/pipes/me_blocks"))); - } - - @Override - public PipeRenderer create(Function textureGetter) { - return new PipeMeshCache(textureGetter, new Material[] { - new Material(InventoryMenu.BLOCK_ATLAS, MI.id("block/pipes/me")), - new Material(InventoryMenu.BLOCK_ATLAS, MI.id("block/pipes/me_blocks")) + public PipeRenderer create(ModelBaker modelBaker) { + return new PipeMeshCache(modelBaker.sprites(), new Material[] { + ClientHooks.getBlockMaterial(MI.id("block/pipes/me")), + ClientHooks.getBlockMaterial(MI.id("block/pipes/me_blocks")) }, false); } }; diff --git a/src/client/java/aztech/modern_industrialization/client/compat/jade/MIJadeClientPlugin.java b/src/client/java/aztech/modern_industrialization/client/compat/jade/MIJadeClientPlugin.java index 10a7060b7..ed6fe9db2 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/jade/MIJadeClientPlugin.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/jade/MIJadeClientPlugin.java @@ -42,7 +42,8 @@ public class MIJadeClientPlugin implements IWailaPlugin { public void registerClient(IWailaClientRegistration registration) { registration.registerBlockComponent(new OverclockComponentProvider(), MachineBlock.class); - registration.usePickedResult(MIPipes.BLOCK_PIPE.get()); + // TODO 26.1 +// registration.usePickedResult(MIPipes.BLOCK_PIPE.get()); registration.registerBlockComponent(new PipeComponentProvider(), PipeBlock.class); registration.registerEnergyStorageClient(new MachineComponentProvider.Energy()); diff --git a/src/client/java/aztech/modern_industrialization/client/compat/jade/OverclockComponentProvider.java b/src/client/java/aztech/modern_industrialization/client/compat/jade/OverclockComponentProvider.java index 46be8cd99..b094216de 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/jade/OverclockComponentProvider.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/jade/OverclockComponentProvider.java @@ -27,17 +27,16 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIText; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; import snownee.jade.api.ITooltip; import snownee.jade.api.config.IPluginConfig; -import snownee.jade.api.ui.BoxStyle; -import snownee.jade.api.ui.IElementHelper; +import snownee.jade.api.ui.JadeUI; public class OverclockComponentProvider implements IBlockComponentProvider { @Override - public ResourceLocation getUid() { + public Identifier getUid() { return MI.id("overclock"); } @@ -47,25 +46,25 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi if (tag.contains("efficiencyTicks") && tag.contains("maxEfficiencyTicks") && tag.contains("baseRecipeEu") && tag.contains("currentRecipeEu")) { - int efficiencyTicks = tag.getInt("efficiencyTicks"); - int maxEfficiencyTicks = tag.getInt("maxEfficiencyTicks"); - long baseRecipeEu = tag.getLong("baseRecipeEu"); - long currentEu = tag.getLong("currentRecipeEu"); + int efficiencyTicks = tag.getIntOr("efficiencyTicks", 0); + int maxEfficiencyTicks = tag.getIntOr("maxEfficiencyTicks", 0); + long baseRecipeEu = tag.getLongOr("baseRecipeEu", 0); + long currentEu = tag.getLongOr("currentRecipeEu", 0); double mult = (double) currentEu / baseRecipeEu; - var helper = IElementHelper.get(); - tooltip.add(helper.progress( - MIJadeClientPlugin.ratio(efficiencyTicks, maxEfficiencyTicks), - MIJadeClientPlugin.textAndRatio( - MIText.Efficiency.text(), - String.valueOf(efficiencyTicks), - String.valueOf(maxEfficiencyTicks)), - helper.progressStyle().color(0xFF61C928, 0xFF438C1C).textColor(-1), - BoxStyle.getNestedBox(), - true)); + // TODO 26.1 +// tooltip.add(JadeUI.progress( +// MIJadeClientPlugin.ratio(efficiencyTicks, maxEfficiencyTicks), +// MIJadeClientPlugin.textAndRatio( +// MIText.Efficiency.text(), +// String.valueOf(efficiencyTicks), +// String.valueOf(maxEfficiencyTicks)), +// JadeUI.progressStyle().color(0xFF61C928, 0xFF438C1C).textColor(-1), +// BoxStyle.nestedBox(), +// true)); - tooltip.add(helper.text(MIText.EuTOverclocked.text( + tooltip.add(JadeUI.text(MIText.EuTOverclocked.text( String.format("%.1f", mult), String.format("%d", currentEu)))); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/jade/PipeComponentProvider.java b/src/client/java/aztech/modern_industrialization/client/compat/jade/PipeComponentProvider.java index 940d256ac..8f173f745 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/jade/PipeComponentProvider.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/jade/PipeComponentProvider.java @@ -32,16 +32,16 @@ import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; import aztech.modern_industrialization.pipes.impl.PipeVoxelShape; import aztech.modern_industrialization.pipes.item.ItemNetwork; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.FluidHelper; import java.util.List; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jspecify.annotations.Nullable; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IBlockComponentProvider; @@ -49,15 +49,14 @@ import snownee.jade.api.config.IPluginConfig; import snownee.jade.api.ui.BoxStyle; import snownee.jade.api.ui.IDisplayHelper; -import snownee.jade.api.ui.IElement; -import snownee.jade.api.ui.IElementHelper; +import snownee.jade.api.ui.JadeUI; /** * Overrides the name of the pipes in Waila to prevent "block.modern_industrialization.pipe" being displayed. */ public class PipeComponentProvider implements IBlockComponentProvider { @Override - public ResourceLocation getUid() { + public Identifier getUid() { return MI.id("pipe"); } @@ -82,15 +81,13 @@ public ResourceLocation getUid() { public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfig config) { PipeVoxelShape shape = getHitShape(accessor); if (shape != null) { - CompoundTag tag = accessor.getServerData().getCompound(shape.type.getIdentifier().toString()); - var helper = IElementHelper.get(); - + CompoundTag tag = accessor.getServerData().getCompoundOrEmpty(shape.type.getIdentifier().toString()); if (tag.contains("fluid")) { - FluidVariant fluid = FluidVariant.fromNbt(tag.getCompound("fluid"), accessor.getLevel().registryAccess()); - long stored = tag.getLong("amount"); - long capacity = tag.getInt("capacity"); - long transfer = tag.getLong("transfer"); - long maxTransfer = tag.getLong("maxTransfer"); + FluidResource fluid = tag.read("fluid", FluidResource.OPTIONAL_CODEC).orElse(FluidResource.EMPTY); + long stored = tag.getLongOr("amount", 0); + long capacity = tag.getIntOr("capacity", 0); + long transfer = tag.getLongOr("transfer", 0); + long maxTransfer = tag.getLongOr("maxTransfer", 0); var fluidName = IDisplayHelper.get().stripColor(FluidHelper.getFluidName(fluid, true)); @@ -99,7 +96,7 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi var capacityText = MIJadeClientPlugin.getUnicodeMillibuckets(capacity, true); Component text; - if (fluid.isBlank()) { + if (fluid.isEmpty()) { text = Component.translatable("jade.fluid", MIText.Empty.text(), Component.literal(capacityText).withStyle(ChatFormatting.GRAY)); } else if (accessor.showDetails()) { text = Component.translatable("jade.fluid2", fluidName.withStyle(ChatFormatting.WHITE), @@ -107,17 +104,18 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi } else { text = Component.translatable("jade.fluid", fluidName, storedText); } - var progressStyle = helper.progressStyle().overlay(helper.fluid(MIJadeCommonPlugin.fluidStack(fluid, stored))); - - tooltip.add(helper.progress( - MIJadeClientPlugin.ratio(stored, capacity), - text, - progressStyle, - BoxStyle.getNestedBox(), - true)); + // TODO 26.1 +// var progressStyle = JadeUI.progressStyle().overlay(JadeUI.fluid(MIJadeCommonPlugin.fluidStack(fluid, stored))); +// +// tooltip.add(JadeUI.progress( +// MIJadeClientPlugin.ratio(stored, capacity), +// text, +// progressStyle, +// BoxStyle.nestedBox(), +// true)); // Transfer rate - if (!fluid.isBlank()) { + if (!fluid.isEmpty()) { var transferText = MIJadeClientPlugin.getUnicodeMillibuckets(transfer, true); var maxTransferText = MIJadeClientPlugin.getUnicodeMillibuckets(maxTransfer, true); @@ -130,83 +128,89 @@ public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfi .append(Component.literal(transferText)); } - tooltip.add(helper.progress( - MIJadeClientPlugin.ratio(transfer, maxTransfer), - maxText, - progressStyle, - BoxStyle.getNestedBox(), - true)); + // TODO 26.1 +// tooltip.add(JadeUI.progress( +// MIJadeClientPlugin.ratio(transfer, maxTransfer), +// maxText, +// progressStyle, +// BoxStyle.nestedBox(), +// true)); } } if (tag.contains("eu")) { - long stored = tag.getLong("eu"); - long capacity = tag.getLong("maxEu"); - long transfer = tag.getLong("transfer"); - long maxTransfer = tag.getLong("maxTransfer"); + long stored = tag.getLongOr("eu", 0); + long capacity = tag.getLongOr("maxEu", 0); + long transfer = tag.getLongOr("transfer", 0); + long maxTransfer = tag.getLongOr("maxTransfer", 0); // Total EU // TODO: fix spacing between EU and the rest (another day) - tooltip.add(helper.progress( - MIJadeClientPlugin.ratio(stored, capacity), - Component.literal("") - .append(Component.literal(IDisplayHelper.get().humanReadableNumber(stored, " EU", false)) - .withStyle(ChatFormatting.WHITE)) - .append(" / ") - .append(Component.literal(IDisplayHelper.get().humanReadableNumber(capacity, " EU", false))) - .withStyle(ChatFormatting.GRAY), - helper.progressStyle().color(-5636096, -10092544).textColor(-1), - BoxStyle.getNestedBox(), - true)); + // TODO @6.1 +// tooltip.add(JadeUI.progress( +// MIJadeClientPlugin.ratio(stored, capacity), +// Component.literal("") +// .append(Component.literal(IDisplayHelper.get().humanReadableNumber(stored, " EU", false)) +// .withStyle(ChatFormatting.WHITE)) +// .append(" / ") +// .append(Component.literal(IDisplayHelper.get().humanReadableNumber(capacity, " EU", false))) +// .withStyle(ChatFormatting.GRAY), +// JadeUI.progressStyle().color(-5636096, -10092544).textColor(-1), +// BoxStyle.nestedBox(), +// true)); // Voltage tier tooltip.add( List.of( - helper.text(MIText.NetworkTier.text().withStyle(ChatFormatting.WHITE)), - helper.spacer(10, 0), - helper.text(MIPipes.ELECTRICITY_PIPE_TIER.get(MIPipes.INSTANCE.getPipeItem(shape.type).type).longEnglishName() + JadeUI.text(MIText.NetworkTier.text().withStyle(ChatFormatting.WHITE)), + JadeUI.spacer(10, 0), + JadeUI.text(MIPipes.ELECTRICITY_PIPE_TIER.get(MIPipes.INSTANCE.getPipeItem(shape.type).type).longEnglishName() .withStyle(MITooltips.NUMBER_TEXT)) - .align(IElement.Align.CENTER))); + // TODO 26.1 + /*.align(IElement.Align.CENTER)*/)); // EU/t - tooltip.add(helper.progress( - MIJadeClientPlugin.ratio(transfer, maxTransfer), - MIJadeClientPlugin.textAndRatio( - MIText.NetworkTransfer.text(), - String.valueOf(IDisplayHelper.get().humanReadableNumber(transfer, "", false)), - String.valueOf(IDisplayHelper.get().humanReadableNumber(maxTransfer, " EU/t", false))), - helper.progressStyle().color(-5636096, -10092544).textColor(-1), - BoxStyle.getNestedBox(), - true)); + // TODO: 26.1 +// tooltip.add(JadeUI.progress( +// MIJadeClientPlugin.ratio(transfer, maxTransfer), +// MIJadeClientPlugin.textAndRatio( +// MIText.NetworkTransfer.text(), +// String.valueOf(IDisplayHelper.get().humanReadableNumber(transfer, "", false)), +// String.valueOf(IDisplayHelper.get().humanReadableNumber(maxTransfer, " EU/t", false))), +// JadeUI.progressStyle().color(-5636096, -10092544).textColor(-1), +// BoxStyle.nestedBox(), +// true)); } if (tag.contains("items")) { - long items = tag.getLong("items"); - int pulse = tag.getInt("pulse"); + long items = tag.getLongOr("items", 0); + int pulse = tag.getIntOr("pulse", 0); double delay = (ItemNetwork.TICK_RATE - pulse) / 20.0; double maxDelay = ItemNetwork.TICK_RATE / 20.0; // Delay - tooltip.add(helper.progress( - MIJadeClientPlugin.ratio(delay, maxDelay), - MIJadeClientPlugin.textAndRatio( - MIText.NetworkDelay.text(), - String.valueOf(IDisplayHelper.get().humanReadableNumber(delay + 0.3, "", false)), - String.valueOf(IDisplayHelper.get().humanReadableNumber(maxDelay, " s", false))), - helper.progressStyle().color(0xFFFFD14A, 0xFFCCA73B).textColor(-1), - BoxStyle.getNestedBox(), - false) - .tag(MI.id("pipe/items/delay")) // tag to give the progress bar its own interpolation - ); + // TODO 26.1 +// tooltip.add(JadeUI.progress( +// MIJadeClientPlugin.ratio(delay, maxDelay), +// MIJadeClientPlugin.textAndRatio( +// MIText.NetworkDelay.text(), +// String.valueOf(IDisplayHelper.get().humanReadableNumber(delay + 0.3, "", false)), +// String.valueOf(IDisplayHelper.get().humanReadableNumber(maxDelay, " s", false))), +// JadeUI.progressStyle().color(0xFFFFD14A, 0xFFCCA73B).textColor(-1), +// BoxStyle.nestedBox(), +// false) +// .tag(MI.id("pipe/items/delay")) // tag to give the progress bar its own interpolation +// ); // Moved items tooltip.add( List.of( - helper.text(MIText.NetworkMovedItems.text().withStyle(ChatFormatting.WHITE)), - helper.spacer(10, 0), - helper.text(Component.literal("" + items).withStyle(MITooltips.NUMBER_TEXT)) - .align(IElement.Align.CENTER))); + JadeUI.text(MIText.NetworkMovedItems.text().withStyle(ChatFormatting.WHITE)), + JadeUI.spacer(10, 0), + JadeUI.text(Component.literal("" + items).withStyle(MITooltips.NUMBER_TEXT)) + // TODO 26.1 + /*.align(IElement.Align.CENTER)*/)); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/sodium/SodiumCompat.java b/src/client/java/aztech/modern_industrialization/client/compat/sodium/SodiumCompat.java index edd4cc2ee..204155a60 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/sodium/SodiumCompat.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/sodium/SodiumCompat.java @@ -53,6 +53,7 @@ public class SodiumCompat { METHOD_HANDLE = handle; } + // TODO: audit all usages public static void markSpriteActive(@Nullable TextureAtlasSprite sprite) { if (sprite != null && METHOD_HANDLE != null) { try { diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/abstraction/ViewerCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/abstraction/ViewerCategory.java index 7cd48092d..5b3c3f253 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/abstraction/ViewerCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/abstraction/ViewerCategory.java @@ -25,8 +25,6 @@ package aztech.modern_industrialization.client.compat.viewer.abstraction; import aztech.modern_industrialization.MI; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import aztech.modern_industrialization.util.Rectangle; import java.util.List; import java.util.function.Consumer; @@ -34,12 +32,14 @@ import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.ItemLike; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.resource.Resource; import org.jspecify.annotations.Nullable; /** @@ -47,17 +47,17 @@ */ public abstract class ViewerCategory { public final Class dataClass; - public final ResourceLocation id; + public final Identifier id; public final Component title; public final Icon icon; public final int width; public final int height; - protected ViewerCategory(Class dataClass, ResourceLocation id, Component title, ItemStack icon, int width, int height) { + protected ViewerCategory(Class dataClass, Identifier id, Component title, ItemStack icon, int width, int height) { this(dataClass, id, title, new Icon.Stack(icon), width, height); } - protected ViewerCategory(Class dataClass, ResourceLocation id, Component title, Icon icon, int width, int height) { + protected ViewerCategory(Class dataClass, Identifier id, Component title, Icon icon, int width, int height) { this.dataClass = dataClass; this.id = id; this.title = title; @@ -68,7 +68,7 @@ protected ViewerCategory(Class dataClass, ResourceLocation id, Component titl public abstract void buildWorkstations(WorkstationConsumer consumer); - public abstract void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer consumer); + public abstract void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer consumer); /** * Add input and outputs items/fluids. @@ -80,20 +80,21 @@ protected ViewerCategory(Class dataClass, ResourceLocation id, Component titl */ public abstract void buildWidgets(D recipe, WidgetList widgets); - public abstract ResourceLocation getRecipeId(D recipe); + public abstract Identifier getRecipeId(D recipe); public sealed interface Icon { record Stack(ItemStack stack) implements Icon {} - record Texture(ResourceLocation loc, int u, int v) implements Icon {} + record Texture(Identifier loc, int u, int v) implements Icon {} } public interface WorkstationConsumer { void accept(ItemLike... item); + // TODO: nuke this... default void accept(String... itemPath) {// only items in the MI namespace! for (var item : itemPath) { - accept(BuiltInRegistries.ITEM.get(MI.id(item))); + accept(BuiltInRegistries.ITEM.getValue(MI.id(item))); } } } @@ -111,9 +112,9 @@ public interface LayoutBuilder { } public interface SlotBuilder { - SlotBuilder variant(TransferVariant variant); // no amount is shown + SlotBuilder resource(Resource variant); // no amount is shown - SlotBuilder fluid(FluidVariant fluid, long amount, float probability); + SlotBuilder fluid(FluidResource fluid, long amount, float probability); SlotBuilder fluid(FluidIngredient ingredient, long amount, float probability); @@ -131,12 +132,12 @@ default SlotBuilder item(ItemStack stack) { class NoOp implements SlotBuilder { @Override - public SlotBuilder variant(TransferVariant variant) { + public SlotBuilder resource(Resource resource) { return this; } @Override - public SlotBuilder fluid(FluidVariant fluid, long amount, float probability) { + public SlotBuilder fluid(FluidResource fluid, long amount, float probability) { return this; } @@ -176,7 +177,7 @@ default void secondaryText(Component text, float x, float y) { void arrow(int x, int y); - void texture(ResourceLocation loc, int x, int y, int u, int v, int width, int height); + void texture(Identifier loc, int x, int y, int u, int v, int width, int height); default void rectangle(Rectangle rectangle, int fillColor) { drawable(guiGraphics -> { diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/DrawableIcon.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/DrawableIcon.java index 6528e1254..3ee5fd7fd 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/DrawableIcon.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/DrawableIcon.java @@ -25,9 +25,11 @@ package aztech.modern_industrialization.client.compat.viewer.impl.jei; import aztech.modern_industrialization.client.compat.viewer.abstraction.ViewerCategory; +import com.mojang.blaze3d.pipeline.RenderPipeline; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.helpers.IGuiHelper; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; public class DrawableIcon implements IDrawable { private final ViewerCategory.Icon.Texture texture; @@ -56,6 +58,6 @@ public int getHeight() { @Override public void draw(GuiGraphics guiGraphics, int xOffset, int yOffset) { - guiGraphics.blit(texture.loc(), xOffset - 1, yOffset - 1, 0, texture.u(), texture.v(), 18, 18, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, texture.loc(), xOffset - 1, yOffset - 1, 0, texture.u(), texture.v(), 18, 18, 256, 256); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MIGhostIngredientHandler.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MIGhostIngredientHandler.java index afda49a35..a8cb0843f 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MIGhostIngredientHandler.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MIGhostIngredientHandler.java @@ -24,11 +24,9 @@ package aztech.modern_industrialization.client.compat.viewer.impl.jei; -import aztech.modern_industrialization.client.screen.MIHandledScreen; +import aztech.modern_industrialization.client.screen.MIContainerScreen; import aztech.modern_industrialization.compat.viewer.ReiDraggable; import aztech.modern_industrialization.network.machines.DoSlotDraggingPacket; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.Simulation; import java.util.ArrayList; import java.util.List; @@ -41,15 +39,17 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; -class MIGhostIngredientHandler implements IGhostIngredientHandler> { +class MIGhostIngredientHandler implements IGhostIngredientHandler> { @Override - public List> getTargetsTyped(MIHandledScreen gui, ITypedIngredient typedIngredient, boolean doStart) { + public List> getTargetsTyped(MIContainerScreen gui, ITypedIngredient typedIngredient, boolean doStart) { var ingredient = typedIngredient.getIngredient(); List> bounds = new ArrayList<>(); - FluidVariant fk = ingredient instanceof FluidStack fs ? FluidVariant.of(fs) : null; - ItemVariant ik = ingredient instanceof ItemStack is ? ItemVariant.of(is) : null; + FluidResource fk = ingredient instanceof FluidStack fs ? FluidResource.of(fs) : null; + ItemResource ik = ingredient instanceof ItemStack is ? ItemResource.of(is) : null; for (GuiEventListener element : gui.children()) { if (element instanceof AbstractWidget cw && element instanceof ReiDraggable dw) { if (ik != null && dw.dragItem(ik, Simulation.SIMULATE)) { @@ -130,7 +130,7 @@ private static Rect2i getWidgetBounds(AbstractWidget cw) { return new Rect2i(cw.getX(), cw.getY(), cw.getWidth(), cw.getHeight()); } - private static Rect2i getSlotTarget(Slot slot, MIHandledScreen screen) { + private static Rect2i getSlotTarget(Slot slot, MIContainerScreen screen) { return new Rect2i(slot.x + screen.getX(), slot.y + screen.getY(), 16, 16); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineGuiContainerHandler.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineGuiContainerHandler.java index 974b17cad..15ca85129 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineGuiContainerHandler.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineGuiContainerHandler.java @@ -38,23 +38,25 @@ import java.util.Optional; import java.util.function.Function; import java.util.function.Supplier; + +import mezz.jei.api.gui.builder.IClickableIngredientFactory; import mezz.jei.api.gui.handlers.IGuiClickableArea; import mezz.jei.api.gui.handlers.IGuiContainerHandler; import mezz.jei.api.ingredients.ITypedIngredient; import mezz.jei.api.recipe.IFocusFactory; -import mezz.jei.api.recipe.RecipeType; +import mezz.jei.api.recipe.types.IRecipeType; import mezz.jei.api.runtime.IClickableIngredient; import mezz.jei.api.runtime.IIngredientManager; import mezz.jei.api.runtime.IJeiRuntime; import mezz.jei.api.runtime.IRecipesGui; import net.minecraft.client.renderer.Rect2i; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.inventory.Slot; import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.fluids.FluidStack; import org.jspecify.annotations.Nullable; -record MachineGuiContainerHandler(IIngredientManager ingredientManager, Supplier jeiRuntime) +record MachineGuiContainerHandler(IIngredientManager ingredientManager, Supplier<@Nullable IJeiRuntime> jeiRuntime) implements IGuiContainerHandler { @Override public List getGuiExtraAreas(MachineScreen screen) { @@ -64,14 +66,14 @@ public List getGuiExtraAreas(MachineScreen screen) { @Override public Collection getGuiClickableAreas(MachineScreen screen, double guiMouseX, double guiMouseY) { MachineMenuClient screenHandler = screen.getMenu(); - ResourceLocation blockId = screenHandler.guiParams.blockId; + Identifier blockId = screenHandler.guiParams.blockId; List categories = ReiMachineRecipes.machineToClickAreaCategory.getOrDefault(blockId, Collections.emptyList()); Rectangle rectangle = ReiMachineRecipes.machineToClickArea.get(blockId); if (categories.size() > 0 && rectangle != null && contains(rectangle, guiMouseX, guiMouseY)) { boolean foundSome = false; - var result = new ArrayList>(); + var result = new ArrayList>(); for (ReiMachineRecipes.ClickAreaCategory cac : categories) { if (!MachineScreenPredicateTest.test(cac.predicate, screen)) continue; @@ -106,12 +108,12 @@ public void onClick(IFocusFactory focusFactory, IRecipesGui recipesGui) { } @Override - public Optional> getClickableIngredientUnderMouse(MachineScreen screen, double mouseX, double mouseY) { + public Optional> getClickableIngredientUnderMouse(IClickableIngredientFactory builder, MachineScreen screen, double mouseX, double mouseY) { Slot slot = screen.getFocusedSlot(); var maybeIngredient = getIngredientUnderMouse(slot); return Optional.ofNullable(maybeIngredient) - .map(ingredientManager::createTypedIngredient) + .map(ingredient -> ingredientManager.createTypedIngredient(ingredient, false)) .flatMap(ingredient -> ingredient.map(slotArea(screen, slot))); } @@ -122,7 +124,7 @@ public Optional> getClickableIngredientUnderMouse(Machin ConfigurableFluidStack stack = ((ConfigurableFluidStack.ConfigurableFluidSlot) slot).getConfStack(); if (stack.getAmount() > 0) { var fluid = stack.getResource(); - if (!fluid.isBlank()) { + if (!fluid.isEmpty()) { return fluid.toStack(1); } } else if (stack.getLockedInstance() != null) { diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineSlotLockingHandler.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineSlotLockingHandler.java index 9894c8d47..e7bffa88c 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineSlotLockingHandler.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/MachineSlotLockingHandler.java @@ -31,35 +31,35 @@ import java.util.Optional; import java.util.function.Supplier; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; -import mezz.jei.api.recipe.IRecipeCatalystLookup; -import mezz.jei.api.recipe.RecipeType; +import mezz.jei.api.recipe.ICraftingStationLookup; import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; import mezz.jei.api.recipe.transfer.IRecipeTransferHandlerHelper; +import mezz.jei.api.recipe.types.IRecipeType; import mezz.jei.api.runtime.IJeiRuntime; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.crafting.RecipeHolder; import org.jspecify.annotations.Nullable; class MachineSlotLockingHandler implements IRecipeTransferHandler> { - private final Supplier runtimeSupplier; - private final mezz.jei.api.recipe.RecipeType> type; + private final Supplier<@Nullable IJeiRuntime> runtimeSupplier; + private final IRecipeType> type; private final IRecipeTransferHandlerHelper helper; - public MachineSlotLockingHandler(IRecipeTransferHandlerHelper helper, Supplier runtimeSupplier, - RecipeType> type) { + public MachineSlotLockingHandler(IRecipeTransferHandlerHelper helper, Supplier<@Nullable IJeiRuntime> runtimeSupplier, + IRecipeType> type) { this.helper = helper; this.runtimeSupplier = runtimeSupplier; this.type = type; } - private IRecipeCatalystLookup getLookup() { + private @Nullable ICraftingStationLookup getLookup() { var runtime = runtimeSupplier.get(); if (runtime != null) { - return runtime.getRecipeManager().createRecipeCatalystLookup(type); + return runtime.getRecipeManager().createCraftingStationLookup(type); } return null; } @@ -75,7 +75,7 @@ public Optional> getMenuType() { } @Override - public mezz.jei.api.recipe.RecipeType> getRecipeType() { + public IRecipeType> getRecipeType() { return type; } @@ -96,14 +96,14 @@ public mezz.jei.api.recipe.RecipeType> getRecipeType private boolean canApply(MachineMenuClient handler) { // Check if the block is in the worktables - it's a hack but it should work. :P - ResourceLocation blockId = handler.guiParams.blockId; + Identifier blockId = handler.guiParams.blockId; var lookup = getLookup(); if (lookup == null) { return false; } - var item = BuiltInRegistries.ITEM.get(blockId); + var item = BuiltInRegistries.ITEM.getValue(blockId); return lookup.getItemStack().anyMatch(is -> is.is(item)); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ManualPluginJei.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ManualPluginJei.java index d7171543e..7eacb4354 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ManualPluginJei.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ManualPluginJei.java @@ -26,28 +26,29 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.client.machines.gui.MachineScreen; -import aztech.modern_industrialization.client.screen.MIHandledScreen; +import aztech.modern_industrialization.client.screen.MIContainerScreen; import aztech.modern_industrialization.compat.rei.machines.ReiMachineRecipes; import aztech.modern_industrialization.machines.recipe.MachineRecipe; import me.shedaniel.rei.plugincompatibilities.api.REIPluginCompatIgnore; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; -import mezz.jei.api.recipe.RecipeType; +import mezz.jei.api.recipe.types.IRecipeType; import mezz.jei.api.registration.IGuiHandlerRegistration; import mezz.jei.api.registration.IRecipeTransferRegistration; import mezz.jei.api.runtime.IJeiRuntime; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.crafting.RecipeHolder; +import org.jspecify.annotations.Nullable; @JeiPlugin @REIPluginCompatIgnore public class ManualPluginJei implements IModPlugin { - private static final ResourceLocation ID = MI.id("manual"); + private static final Identifier ID = MI.id("manual"); - private IJeiRuntime jeiRuntime; + private @Nullable IJeiRuntime jeiRuntime; - private RecipeType> getMachineCategory(ResourceLocation category) { - return RecipeType.create(category.getNamespace(), category.getPath(), (Class) RecipeHolder.class); + private IRecipeType> getMachineCategory(Identifier category) { + return IRecipeType.create(category.getNamespace(), category.getPath(), (Class) RecipeHolder.class); } @Override @@ -67,13 +68,13 @@ public void registerRecipeTransferHandlers(IRecipeTransferRegistration registrat @Override public void registerGuiHandlers(IGuiHandlerRegistration registration) { - registration.addGhostIngredientHandler((Class) MIHandledScreen.class, new MIGhostIngredientHandler()); + registration.addGhostIngredientHandler((Class) MIContainerScreen.class, new MIGhostIngredientHandler()); registration.addGuiContainerHandler(MachineScreen.class, new MachineGuiContainerHandler(registration.getJeiHelpers().getIngredientManager(), () -> jeiRuntime)); } @Override - public ResourceLocation getPluginUid() { + public Identifier getPluginUid() { return ID; } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerCategoryJei.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerCategoryJei.java index 02e78185e..942c6aefa 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerCategoryJei.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerCategoryJei.java @@ -28,10 +28,8 @@ import aztech.modern_industrialization.client.compat.viewer.abstraction.ViewerCategory; import aztech.modern_industrialization.client.compat.viewer.impl.ViewerUtil; import aztech.modern_industrialization.client.machines.gui.MachineScreen; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import java.util.List; +import java.util.Objects; import java.util.function.Consumer; import java.util.stream.Stream; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; @@ -46,27 +44,33 @@ import mezz.jei.api.helpers.IJeiHelpers; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.category.AbstractRecipeCategory; +import mezz.jei.api.recipe.types.IRecipeType; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.display.SlotDisplay; +import net.minecraft.world.item.crafting.display.SlotDisplayContext; import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; +import net.neoforged.neoforge.fluids.crafting.display.FluidStackContentsFactory; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.Resource; import org.jspecify.annotations.Nullable; class ViewerCategoryJei extends AbstractRecipeCategory { private final IJeiHelpers helpers; public final ViewerCategory wrapped; - public final RecipeType recipeType; + public final IRecipeType recipeType; private final IDrawable fluidSlot; public ViewerCategoryJei(IJeiHelpers helpers, ViewerCategory wrapped) { super( - RecipeType.create(wrapped.id.getNamespace(), wrapped.id.getPath(), wrapped.dataClass), + IRecipeType.create(wrapped.id.getNamespace(), wrapped.id.getPath(), wrapped.dataClass), wrapped.title, DrawableIcon.create(helpers.getGuiHelper(), wrapped.icon), wrapped.width - 8, @@ -74,7 +78,7 @@ public ViewerCategoryJei(IJeiHelpers helpers, ViewerCategory wrapped) { this.helpers = helpers; this.wrapped = wrapped; - this.recipeType = RecipeType.create(wrapped.id.getNamespace(), wrapped.id.getPath(), wrapped.dataClass); + this.recipeType = IRecipeType.create(wrapped.id.getNamespace(), wrapped.id.getPath(), wrapped.dataClass); var guiHelper = helpers.getGuiHelper(); this.fluidSlot = guiHelper.createDrawable(MachineScreen.SLOT_ATLAS, 18, 0, 18, 18); @@ -96,19 +100,19 @@ public ViewerCategory.SlotBuilder outputSlot(int x, int y) { @Override public void invisibleInput(ItemStack stack) { builder.addInvisibleIngredients(RecipeIngredientRole.INPUT) - .addItemStack(stack); + .add(stack); } @Override public void invisibleOutput(ItemStack stack) { builder.addInvisibleIngredients(RecipeIngredientRole.OUTPUT) - .addItemStack(stack); + .add(stack); } @Override public void scrollableSlots(int cols, int rows, List stacks) { for (var stack : stacks) { - builder.addInputSlot().addItemStack(stack); + builder.addInputSlot().add(stack); } } @@ -118,17 +122,17 @@ private ViewerCategory.SlotBuilder slot(RecipeIngredientRole role, int x, int y) return new ViewerCategory.SlotBuilder() { @Override - public ViewerCategory.SlotBuilder variant(TransferVariant variant) { - if (variant instanceof ItemVariant item) { + public ViewerCategory.SlotBuilder resource(Resource resource) { + if (resource instanceof ItemResource item) { item(item.toStack()); - } else if (variant instanceof FluidVariant fluid) { - if (!fluid.isBlank()) { + } else if (resource instanceof FluidResource fluid) { + if (!fluid.isEmpty()) { // Use 1000 as the amount to make JEI render the full sprite - slotBuilder.addFluidStack(fluid.getFluid(), FluidType.BUCKET_VOLUME, fluid.getComponentsPatch()); + slotBuilder.add(fluid.getFluid(), FluidType.BUCKET_VOLUME, fluid.getComponentsPatch()); } slotBuilder.setBackground(fluidSlot, -1, -1); } else { - throw new IllegalArgumentException("Unknown variant type: " + variant.getClass()); + throw new IllegalArgumentException("Unknown resource type: " + resource.getClass()); } return this; } @@ -144,8 +148,8 @@ private static void addProbability(IRecipeSlotBuilder slot, float probability) { } @Override - public ViewerCategory.SlotBuilder fluid(FluidVariant fluid, long amount, float probability) { - slotBuilder.addFluidStack(fluid.getFluid(), amount, fluid.getComponentsPatch()); + public ViewerCategory.SlotBuilder fluid(FluidResource fluid, long amount, float probability) { + slotBuilder.add(fluid.getFluid(), amount, fluid.getComponentsPatch()); // This call displays the full sprite (instead of JEI's partial rendering) slotBuilder.setFluidRenderer(1, false, 16, 16); addProbability(slotBuilder, probability); @@ -155,9 +159,10 @@ public ViewerCategory.SlotBuilder fluid(FluidVariant fluid, long amount, float p @Override public ViewerCategory.SlotBuilder fluid(FluidIngredient ingredient, long amount, float probability) { - for (var fs : ingredient.getStacks()) { - slotBuilder.addFluidStack(fs.getFluid(), amount, fs.getComponentsPatch()); - } + var context = SlotDisplayContext.fromLevel(Objects.requireNonNull(Minecraft.getInstance().level)); + ingredient.display().resolve(context, FluidStackContentsFactory.INSTANCE).forEach(fs -> { + slotBuilder.add(fs.getFluid(), amount, fs.getComponentsPatch()); + }); // This call displays the full sprite (instead of JEI's partial rendering) slotBuilder.setFluidRenderer(1, false, 16, 16); addProbability(slotBuilder, probability); @@ -178,7 +183,8 @@ public ViewerCategory.SlotBuilder item(ItemStack stack, float probability) { @Override public ViewerCategory.SlotBuilder ingredient(Ingredient ingredient, long amount, float probability) { - return items(Stream.of(ingredient.getItems()).map(i -> { + var context = SlotDisplayContext.fromLevel(Objects.requireNonNull(Minecraft.getInstance().level)); + return items(ingredient.display().resolve(context, SlotDisplay.ItemStackContentsFactory.INSTANCE).map(i -> { var cp = i.copy(); cp.setCount((int) amount); return cp; @@ -230,8 +236,8 @@ public void scrollableSlots(int cols, int rows, List stacks) { @Override public void draw(D recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate(-4, -4, 0); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(-4, -4); wrapped.buildWidgets(recipe, new ViewerCategory.WidgetList() { @Override @@ -254,7 +260,7 @@ public void arrow(int x, int y) { } @Override - public void texture(ResourceLocation loc, int x, int y, int u, int v, int width, int height) { + public void texture(Identifier loc, int x, int y, int u, int v, int width, int height) { IDrawableStatic drawable = helpers.getGuiHelper().createDrawable(loc, u, v, width, height); drawable.draw(guiGraphics, x, y); } @@ -271,7 +277,7 @@ public void tooltip(int x, int y, int w, int h, List tooltip) {} public void scrollableSlots(int cols, int rows, List stacks) {} }); - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } @Override @@ -296,7 +302,7 @@ public void text(Component text, float x, float y, ViewerCategory.TextAlign alig public void arrow(int x, int y) {} @Override - public void texture(ResourceLocation loc, int x, int y, int u, int v, int width, int height) {} + public void texture(Identifier loc, int x, int y, int u, int v, int width, int height) {} @Override public void drawable(Consumer widget) {} @@ -314,7 +320,7 @@ public void scrollableSlots(int cols, int rows, List stacks) {} } @Override - public ResourceLocation getRegistryName(D recipe) { + public Identifier getIdentifier(D recipe) { return wrapped.getRecipeId(recipe); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerPluginJei.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerPluginJei.java index 6eb0af719..a3b014fbf 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerPluginJei.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/jei/ViewerPluginJei.java @@ -25,6 +25,7 @@ package aztech.modern_industrialization.client.compat.viewer.impl.jei; import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.MICommonProxy; import aztech.modern_industrialization.client.compat.viewer.usage.ViewerSetup; import java.util.ArrayList; import java.util.List; @@ -36,12 +37,12 @@ import mezz.jei.api.registration.IRecipeCategoryRegistration; import mezz.jei.api.registration.IRecipeRegistration; import net.minecraft.client.Minecraft; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; @JeiPlugin @REIPluginCompatIgnore public class ViewerPluginJei implements IModPlugin { - private static final ResourceLocation ID = MI.id("viewer"); + private static final Identifier ID = MI.id("viewer"); private final List> categories = new ArrayList<>(); @@ -61,7 +62,7 @@ public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { for (var category : categories) { category.wrapped.buildWorkstations(items -> { for (var item : items) { - registration.addRecipeCatalyst(item.asItem().getDefaultInstance(), category.recipeType); + registration.addCraftingStation(category.recipeType, item.asItem().getDefaultInstance()); } }); } @@ -77,12 +78,12 @@ public void registerRecipes(IRecipeRegistration registration) { private static void registerCategoryRecipes(IRecipeRegistration registration, ViewerCategoryJei category) { var level = Minecraft.getInstance().level; List recipes = new ArrayList<>(); - category.wrapped.buildRecipes(level.getRecipeManager(), level.registryAccess(), recipes::add); + category.wrapped.buildRecipes(MICommonProxy.INSTANCE.getRecipeMap(level), level.registryAccess(), recipes::add); registration.addRecipes(category.recipeType, recipes); } @Override - public ResourceLocation getPluginUid() { + public Identifier getPluginUid() { return ID; } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/FluidFuelsCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/FluidFuelsCategory.java index cb2e6ba5d..e3fbf59bf 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/FluidFuelsCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/FluidFuelsCategory.java @@ -31,15 +31,15 @@ import aztech.modern_industrialization.api.datamaps.FluidFuel; import aztech.modern_industrialization.api.datamaps.MIDataMaps; import aztech.modern_industrialization.client.compat.viewer.abstraction.ViewerCategory; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import java.util.function.Consumer; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.material.Fluid; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class FluidFuelsCategory extends ViewerCategory { public FluidFuelsCategory() { @@ -56,8 +56,8 @@ public void buildWorkstations(WorkstationConsumer consumer) { } @Override - public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer consumer) { - for (var fluid : registryAccess.registryOrThrow(Registries.FLUID)) { + public void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer consumer) { + for (var fluid : registryAccess.lookupOrThrow(Registries.FLUID)) { if (fluid.builtInRegistryHolder().getData(MIDataMaps.FLUID_FUELS) != null) { consumer.accept(fluid); } @@ -66,7 +66,7 @@ public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAcc @Override public void buildLayout(Fluid recipe, LayoutBuilder builder) { - builder.inputSlot(15, 10).variant(FluidVariant.of(recipe)); + builder.inputSlot(15, 10).resource(FluidResource.of(recipe)); } @Override @@ -77,7 +77,7 @@ public void buildWidgets(Fluid recipe, WidgetList widgets) { } @Override - public ResourceLocation getRecipeId(Fluid recipe) { + public Identifier getRecipeId(Fluid recipe) { return MI.id("/fluid_fuels/" + BuiltInRegistries.FLUID.getKey(recipe).toString().replace(':', '_')); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ForgeHammerCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ForgeHammerCategory.java index d3731482f..ff4f0d6f4 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ForgeHammerCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ForgeHammerCategory.java @@ -35,14 +35,15 @@ import java.util.Comparator; import java.util.function.Consumer; import net.minecraft.core.RegistryAccess; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeHolder; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.world.item.crafting.RecipeMap; public class ForgeHammerCategory extends ViewerCategory> { - public static final ResourceLocation ID = MI.id("forge_hammer"); + public static final Identifier ID = MI.id("forge_hammer"); private final int startPointX; private final int startPointY; @@ -61,8 +62,8 @@ public void buildWorkstations(WorkstationConsumer consumer) { } @Override - public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer> consumer) { - recipeManager.getAllRecipesFor(MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get()) + public void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer> consumer) { + recipeMap.byType(MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get()) .stream() .sorted(Comparator.comparing(RecipeHolder::id)) .forEach(consumer); @@ -75,10 +76,10 @@ public void buildLayout(RecipeHolder holder, LayoutBuilder bu builder.inputSlot(startPointX + 5, startPointY + 6).ingredient(recipe.ingredient(), recipe.count(), 1); if (recipe.hammerDamage() > 0) { - builder.inputSlot(startPointX - 23, startPointY + 6).ingredient(Ingredient.of(ForgeTool.TAG), 1, 1).removeBackground().markCatalyst(); + builder.inputSlot(startPointX - 23, startPointY + 6).ingredient(Ingredient.of(BuiltInRegistries.ITEM.getOrThrow(ForgeTool.TAG)), 1, 1).removeBackground().markCatalyst(); } - builder.outputSlot(startPointX + 62, startPointY + 6).item(recipe.result()); + builder.outputSlot(startPointX + 62, startPointY + 6).item(recipe.result().create()); } @Override @@ -96,7 +97,7 @@ public void buildWidgets(RecipeHolder holder, WidgetList widg } @Override - public ResourceLocation getRecipeId(RecipeHolder recipe) { - return recipe.id(); + public Identifier getRecipeId(RecipeHolder recipe) { + return recipe.id().identifier(); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MachineCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MachineCategory.java index 653b9b50c..1f2f9d932 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MachineCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MachineCategory.java @@ -39,7 +39,6 @@ import aztech.modern_industrialization.inventory.SlotPositions; import aztech.modern_industrialization.machines.init.MachineTier; import aztech.modern_industrialization.machines.recipe.MachineRecipe; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.TextHelper; import java.util.ArrayList; import java.util.Comparator; @@ -47,14 +46,16 @@ import java.util.function.Consumer; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeHolder; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.world.item.crafting.RecipeMap; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class MachineCategory extends ViewerCategory> { public static MachineCategory create(MachineCategoryParams params) { @@ -80,20 +81,20 @@ public static MachineCategory create(MachineCategoryParams params) { private MachineCategory(MachineCategoryParams params, int width, int height) { super((Class) RecipeHolder.class, params.category, Component.translatable("rei_categories.%s.%s".formatted(params.category.getNamespace(), params.category.getPath())), - BuiltInRegistries.ITEM.get(params.workstations.get(0)).getDefaultInstance(), width, height); + BuiltInRegistries.ITEM.getValue(params.workstations.get(0)).getDefaultInstance(), width, height); this.params = params; } @Override public void buildWorkstations(WorkstationConsumer consumer) { - for (ResourceLocation workstation : params.workstations) { - consumer.accept(BuiltInRegistries.ITEM.get(workstation)); + for (Identifier workstation : params.workstations) { + consumer.accept(BuiltInRegistries.ITEM.getValue(workstation)); } } @Override - public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer> consumer) { + public void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer> consumer) { params.recipeType.getRecipesWithoutCache(Minecraft.getInstance().level).stream() .filter(recipe -> params.recipePredicate.test(recipe.value())) .sorted(Comparator.comparing(RecipeHolder::id)) @@ -153,7 +154,7 @@ private void addFluidInputs(LayoutBuilder builder, MachineRecipe recipe) { var input = recipe.fluidInputs.get(i); slot.fluid(input.fluid(), input.amount(), input.probability()); } else { - slot.variant(FluidVariant.blank()); + slot.resource(FluidResource.EMPTY); } } } @@ -169,9 +170,9 @@ private void addFluidOutputs(LayoutBuilder builder, MachineRecipe recipe) { if (i < recipe.fluidOutputs.size()) { var output = recipe.fluidOutputs.get(i); - slot.fluid(FluidVariant.of(output.fluid()), output.amount(), output.probability()); + slot.fluid(FluidResource.of(output.fluid()), output.amount(), output.probability()); } else { - slot.variant(FluidVariant.blank()); + slot.resource(FluidResource.EMPTY); } } } @@ -190,23 +191,23 @@ public void buildWidgets(RecipeHolder recipeHolder, WidgetList wi // Draw filled energy bar widgets.drawable(guiGraphics -> { - guiGraphics.pose().pushPose(); + guiGraphics.pose().pushMatrix(); - guiGraphics.pose().translate(5, 5, 0); - guiGraphics.pose().scale(0.5f, 0.5f, 0.5f); + guiGraphics.pose().translate(5, 5); + guiGraphics.pose().scale(0.5f, 0.5f); switch (params.steamMode) { case BOTH -> { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, -2, -2, 80, 18, 20, 20); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, -2, -2, 80, 18, 20, 20, 256, 256); } case STEAM_ONLY -> { - guiGraphics.blit(MI.id("textures/item/steam_bucket.png"), 0, 0, 0, 0, 16, 16, 16, 16); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MI.id("textures/item/steam_bucket.png"), 0, 0, 0, 0, 16, 16, 16, 16); } case ELECTRIC_ONLY -> { EnergyBarClient.Renderer.renderEnergy(guiGraphics, 0, 0, 1); } } - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); }); int endOfEuText; if (params.steamMode != SteamMode.NEITHER) { @@ -235,7 +236,7 @@ public void buildWidgets(RecipeHolder recipeHolder, WidgetList wi if (steelHatchRequired || upgradeEuRequired > 0 || conditionsRequired) { List displayedItems = new ArrayList<>(); if (steelHatchRequired) { - displayedItems.add(BuiltInRegistries.ITEM.get(MI.id("steel_item_input_hatch")).getDefaultInstance()); + displayedItems.add(BuiltInRegistries.ITEM.getValue(MI.id("steel_item_input_hatch")).getDefaultInstance()); } if (upgradeEuRequired > 0) { displayedItems.add(MIItem.BASIC_UPGRADE.stack()); @@ -250,20 +251,20 @@ public void buildWidgets(RecipeHolder recipeHolder, WidgetList wi displayedItems.add(MIItem.WRENCH.stack()); } - double x = width / 2f - 3; - double y = 3.75; - double wh = 10.8; + float x = width / 2f - 3; + float y = 3.75f; + float wh = 10.8f; widgets.drawable(graphics -> { int itemIndex = (int) ((System.currentTimeMillis() / 1500L) % displayedItems.size()); ItemStack displayedItem = displayedItems.get(itemIndex).copyWithCount(1); - graphics.pose().pushPose(); + graphics.pose().pushMatrix(); // Make sure that we don't overlap with the EU/t text - double itemx = Math.max(x, endOfEuText + 1); - graphics.pose().translate(itemx, y, 0); - graphics.pose().scale((float) wh / 16, (float) wh / 16, 1); + float itemx = Math.max(x, endOfEuText + 1); + graphics.pose().translate(itemx, y); + graphics.pose().scale((float) wh / 16, (float) wh / 16); graphics.renderFakeItem(displayedItem, 0, 0); - graphics.pose().popPose(); + graphics.pose().popMatrix(); }); } // Tooltips @@ -315,7 +316,7 @@ private DrawOffset getOffset() { private record DrawOffset(int x, int y) {} @Override - public ResourceLocation getRecipeId(RecipeHolder recipe) { - return recipe.id(); + public Identifier getRecipeId(RecipeHolder recipe) { + return recipe.id().identifier(); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MultiblockCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MultiblockCategory.java index 6eda1a4fe..fb1b87d07 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MultiblockCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/MultiblockCategory.java @@ -38,11 +38,11 @@ import java.util.function.Consumer; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.block.state.BlockState; import org.jspecify.annotations.Nullable; @@ -59,7 +59,7 @@ protected MultiblockCategory() { public void buildWorkstations(WorkstationConsumer consumer) {} @Override - public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer consumer) { + public void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer consumer) { for (ReiMachineRecipes.MultiblockShape entry : ReiMachineRecipes.multiblockShapes) { consumer.accept(new Recipe(entry.machine(), entry.shapeTemplate(), entry.alternative())); } @@ -79,17 +79,17 @@ public void buildWidgets(Recipe recipe, WidgetList widgets) { } @Override - public ResourceLocation getRecipeId(Recipe recipe) { + public Identifier getRecipeId(Recipe recipe) { return recipe.id; } protected static class Recipe { public final ItemStack controller; public final List materials = new ArrayList<>(); - public final ResourceLocation id; + public final Identifier id; - public Recipe(ResourceLocation controller, ShapeTemplate shapeTemplate, @Nullable String alternative) { - this.controller = BuiltInRegistries.ITEM.get(controller).getDefaultInstance(); + public Recipe(Identifier controller, ShapeTemplate shapeTemplate, @Nullable String alternative) { + this.controller = BuiltInRegistries.ITEM.getValue(controller).getDefaultInstance(); SortedMap materials = new TreeMap<>(Comparator.comparing(BuiltInRegistries.ITEM::getKey)); for (var entry : shapeTemplate.simpleMembers.entrySet()) { @@ -103,7 +103,7 @@ public Recipe(ResourceLocation controller, ShapeTemplate shapeTemplate, @Nullabl for (var entry : materials.entrySet()) { this.materials.add(new ItemStack(entry.getKey(), entry.getValue())); } - this.id = ResourceLocation.fromNamespaceAndPath(controller.getNamespace(), + this.id = Identifier.fromNamespaceAndPath(controller.getNamespace(), "/" + controller.getPath() + "/" + materials.size() + (alternative == null ? "" : "/" + alternative)); } } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/NeutronInteractionCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/NeutronInteractionCategory.java index 957582abc..f674005f3 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/NeutronInteractionCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/NeutronInteractionCategory.java @@ -36,30 +36,32 @@ import aztech.modern_industrialization.nuclear.NuclearComponentItem; import aztech.modern_industrialization.nuclear.NuclearConstant; import aztech.modern_industrialization.nuclear.NuclearFuel; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.TextHelper; import java.util.Locale; import java.util.function.Consumer; + +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; public class NeutronInteractionCategory extends ViewerCategory { - public static final ResourceLocation TEXTURE_ATLAS = NuclearReactorGuiClient.TEXTURE_ATLAS; - private static final ResourceLocation PROGRESS_BAR = MI.id("textures/gui/progress_bar/long_arrow.png"); + public static final Identifier TEXTURE_ATLAS = NuclearReactorGuiClient.TEXTURE_ATLAS; + private static final Identifier PROGRESS_BAR = MI.id("textures/gui/progress_bar/long_arrow.png"); private final int centerX; private final int centerY; public NeutronInteractionCategory() { super(Recipe.class, MI.id("neutron_interaction"), MIText.NeutronInteraction.text(), - BuiltInRegistries.ITEM.get(MI.id("uranium_fuel_rod")).getDefaultInstance(), 150, 90); + BuiltInRegistries.ITEM.getValue(MI.id("uranium_fuel_rod")).getDefaultInstance(), 150, 90); this.centerX = width / 2; this.centerY = height / 2 - 5; @@ -71,7 +73,7 @@ public void buildWorkstations(WorkstationConsumer consumer) { } @Override - public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer consumer) { + public void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer consumer) { BuiltInRegistries.ITEM.stream().filter(item -> item instanceof NuclearComponentItem).forEach(item -> { NuclearComponentItem component = (NuclearComponentItem) item; if (component.neutronBehaviour != NeutronBehaviour.NO_INTERACTION) { @@ -83,7 +85,7 @@ public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAcc consumer.accept(new Recipe(component, CategoryType.FISSION)); } - ItemVariant product = component.getNeutronProduct(); + ItemResource product = component.getNeutronProduct(); if (product != null) { consumer.accept(new Recipe(component, CategoryType.NEUTRON_PRODUCT)); } @@ -109,25 +111,25 @@ public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAcc public void buildLayout(Recipe recipe, LayoutBuilder builder) { switch (recipe.type) { case FISSION -> { - builder.inputSlot(52, centerY).variant(recipe.nuclearComponent.getVariant()); + builder.inputSlot(52, centerY).resource(recipe.nuclearComponent.getVariant()); } case NEUTRON_PRODUCT -> { long amount = recipe.nuclearComponent.getNeutronProductAmount(); int baseX = 66; - if (recipe.nuclearComponent.getVariant() instanceof ItemVariant itemVariant) { - builder.inputSlot(baseX - 35, centerY).item(itemVariant.toStack()); - ItemVariant product = (ItemVariant) recipe.nuclearComponent.getNeutronProduct(); + if (recipe.nuclearComponent.getVariant() instanceof ItemResource itemResource) { + builder.inputSlot(baseX - 35, centerY).item(itemResource.toStack()); + ItemResource product = (ItemResource) recipe.nuclearComponent.getNeutronProduct(); builder.outputSlot(baseX + 35, centerY).item(product.toStack((int) amount)); - } else if (recipe.nuclearComponent.getVariant() instanceof FluidVariant fluidVariant) { + } else if (recipe.nuclearComponent.getVariant() instanceof FluidResource fluidResource) { float probability = (float) recipe.nuclearComponent.getNeutronProductProbability(); - builder.inputSlot(baseX - 35, centerY).fluid(fluidVariant, 1, probability); - FluidVariant product = (FluidVariant) recipe.nuclearComponent.getNeutronProduct(); + builder.inputSlot(baseX - 35, centerY).fluid(fluidResource, 1, probability); + FluidResource product = (FluidResource) recipe.nuclearComponent.getNeutronProduct(); builder.outputSlot(baseX + 35, centerY).fluid(product, amount, probability); } } case FAST_NEUTRON_INTERACTION, THERMAL_NEUTRON_INTERACTION -> { - builder.inputSlot(66, centerY).variant(recipe.nuclearComponent.getVariant()); + builder.inputSlot(66, centerY).resource(recipe.nuclearComponent.getVariant()); } } } @@ -177,9 +179,9 @@ public void buildWidgets(Recipe recipe, WidgetList widgets) { int posX = centerX - 12; int posY = centerY - 2; - guiGraphics.blit(PROGRESS_BAR, posX, posY, 0, 0, 40, 20, 40, 40); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, PROGRESS_BAR, posX, posY, 0, 0, 40, 20, 40, 40); - guiGraphics.blit(PROGRESS_BAR, posX, posY, 0, 20, (int) (40 * (System.currentTimeMillis() % 3000) / 3000d), 20, 40, 40); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, PROGRESS_BAR, posX, posY, 0, 20, (int) (40 * (System.currentTimeMillis() % 3000) / 3000d), 20, 40, 40); }); Component neutronNumberText; @@ -255,7 +257,7 @@ public void buildWidgets(Recipe recipe, WidgetList widgets) { } @Override - public ResourceLocation getRecipeId(NeutronInteractionCategory.Recipe recipe) { + public Identifier getRecipeId(NeutronInteractionCategory.Recipe recipe) { return NuclearComponent.getEmiRecipeId(recipe.nuclearComponent, "neutron_interaction", recipe.type.name().toLowerCase(Locale.ROOT)); } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ThermalInteractionCategory.java b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ThermalInteractionCategory.java index 8d00c60bb..bc45579d9 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ThermalInteractionCategory.java +++ b/src/client/java/aztech/modern_industrialization/client/compat/viewer/usage/ThermalInteractionCategory.java @@ -34,19 +34,21 @@ import aztech.modern_industrialization.nuclear.NuclearComponentItem; import aztech.modern_industrialization.nuclear.NuclearConstant; import aztech.modern_industrialization.nuclear.NuclearFuel; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.Rectangle; import aztech.modern_industrialization.util.TextHelper; import java.util.Locale; import java.util.function.Consumer; + import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.neoforged.neoforge.transfer.item.ItemResource; public class ThermalInteractionCategory extends ViewerCategory { private final int centerX; @@ -67,7 +69,7 @@ public void buildWorkstations(WorkstationConsumer consumer) { } @Override - public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer consumer) { + public void buildRecipes(RecipeMap recipeMap, RegistryAccess registryAccess, Consumer consumer) { BuiltInRegistries.ITEM.stream().filter(item -> item instanceof NuclearComponentItem).forEach(item -> { NuclearComponentItem component = (NuclearComponentItem) item; consumer.accept(new Recipe(component, CategoryType.THERMAL_PROPERTIES)); @@ -88,7 +90,7 @@ public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAcc } for (String s : new String[] { "item", "fluid" }) { - consumer.accept(new Recipe(new NuclearComponent() { + consumer.accept(new Recipe(new NuclearComponent() { @Override public double getHeatConduction() { return NuclearConstant.BASE_HEAT_CONDUCTION; @@ -104,8 +106,8 @@ public int getMaxTemperature() { } @Override - public ItemVariant getVariant() { - return ItemVariant.of(BuiltInRegistries.ITEM.get(MI.id(String.format("nuclear_%s_hatch", s)))); + public ItemResource getVariant() { + return ItemResource.of(BuiltInRegistries.ITEM.getValue(MI.id(String.format("nuclear_%s_hatch", s)))); } }, CategoryType.THERMAL_PROPERTIES)); } @@ -113,7 +115,7 @@ public ItemVariant getVariant() { @Override public void buildLayout(Recipe recipe, LayoutBuilder builder) { - builder.inputSlot(px, 22).variant(recipe.nuclearComponent.getVariant()); + builder.inputSlot(px, 22).resource(recipe.nuclearComponent.getVariant()); } @Override @@ -139,12 +141,12 @@ public void buildWidgets(Recipe recipe, WidgetList widgets) { widgets.drawable(guiGraphics -> { var helper = Minecraft.getInstance().screen; for (int i = 1; i < area.w() / 2; i++) { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, area.x() + i, area.y() + 4, 0, 255, 1, 1); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, area.x() + i, area.y() + 4, 0, 255, 1, 1, 256, 256); } for (int i = area.w() / 2; i < area.w() - 1; i++) { double f = (i - area.w() / 2d) / (area.w() - area.w() / 2d); int y = (int) ((1 - f) * (area.y() + 4) + f * (area.y() + area.h() - 14)); - guiGraphics.blit(MachineScreen.SLOT_ATLAS, area.x() + i, y, 0, 255, 1, 1); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, area.x() + i, y, 0, 255, 1, 1, 256, 256); } }); @@ -173,7 +175,7 @@ public void buildWidgets(Recipe recipe, WidgetList widgets) { } @Override - public ResourceLocation getRecipeId(Recipe recipe) { + public Identifier getRecipeId(Recipe recipe) { return NuclearComponent.getEmiRecipeId(recipe.nuclearComponent, "thermal_interaction", recipe.type.name().toLowerCase(Locale.ROOT)); } diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/MIDatagenClient.java b/src/client/java/aztech/modern_industrialization/client/datagen/MIDatagenClient.java index 7f17ac4b1..63a254eda 100644 --- a/src/client/java/aztech/modern_industrialization/client/datagen/MIDatagenClient.java +++ b/src/client/java/aztech/modern_industrialization/client/datagen/MIDatagenClient.java @@ -25,24 +25,24 @@ package aztech.modern_industrialization.client.datagen; import aztech.modern_industrialization.client.datagen.model.MIModelProvider; -import aztech.modern_industrialization.client.datagen.model.MachineCasingsProvider; import aztech.modern_industrialization.client.datagen.texture.MISpriteSourceProvider; import aztech.modern_industrialization.client.datagen.texture.TexturesProvider; import java.util.concurrent.CompletableFuture; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; -import net.neoforged.neoforge.common.data.ExistingFileHelper; public class MIDatagenClient { public static void configure( DataGenerator gen, - ExistingFileHelper fileHelper, CompletableFuture lookupProvider, - boolean run, boolean runtimeDatagen) { - gen.addProvider(run, new MISpriteSourceProvider(gen.getPackOutput(), lookupProvider, fileHelper)); - gen.addProvider(run, new TexturesProvider(gen.getPackOutput(), fileHelper, runtimeDatagen)); - gen.addProvider(run, new MachineCasingsProvider(gen.getPackOutput(), fileHelper)); - gen.addProvider(run, new MIModelProvider(gen.getPackOutput(), fileHelper)); + if (!runtimeDatagen) { + // Runtime datagen runs before sprite sources are registered, so skip this provider + gen.addProvider(true, new MISpriteSourceProvider(gen.getPackOutput(), lookupProvider)); + } + gen.addProvider(true, new TexturesProvider(gen.getPackOutput(), runtimeDatagen)); + // TODO 26.1 +// gen.addProvider(true, new MachineCasingsProvider(gen.getPackOutput(), fileHelper)); + gen.addProvider(true, new MIModelProvider(gen.getPackOutput())); } } diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/model/MIModelProvider.java b/src/client/java/aztech/modern_industrialization/client/datagen/model/MIModelProvider.java index ce1c24b1b..30d6b6126 100644 --- a/src/client/java/aztech/modern_industrialization/client/datagen/model/MIModelProvider.java +++ b/src/client/java/aztech/modern_industrialization/client/datagen/model/MIModelProvider.java @@ -28,48 +28,87 @@ import aztech.modern_industrialization.MIBlock; import aztech.modern_industrialization.MIFluids; import aztech.modern_industrialization.MIItem; +import aztech.modern_industrialization.client.machines.models.MachineItemModel; +import aztech.modern_industrialization.client.machines.models.MachineUnbakedModel; +import aztech.modern_industrialization.client.machines.models.OverlayName; import aztech.modern_industrialization.client.pipes.impl.PipeUnbakedModel; -import aztech.modern_industrialization.datagen.model.BaseModelProvider; import aztech.modern_industrialization.datagen.model.MachineModelsToGenerate; import aztech.modern_industrialization.definition.BlockDefinition; import aztech.modern_industrialization.definition.FluidDefinition; import aztech.modern_industrialization.definition.ItemDefinition; import aztech.modern_industrialization.pipes.MIPipes; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.ModelProvider; +import net.minecraft.client.data.models.MultiVariant; +import net.minecraft.client.data.models.blockstates.MultiVariantGenerator; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.CachedOutput; import net.minecraft.data.PackOutput; +import net.minecraft.resources.Identifier; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel; +import net.neoforged.neoforge.client.model.generators.blockstate.CustomBlockStateModelBuilder; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; -public class MIModelProvider extends BaseModelProvider { - public MIModelProvider(PackOutput output, ExistingFileHelper exFileHelper) { - super(output, exFileHelper); +public class MIModelProvider extends ModelProvider { + private final MachineCasingsProvider casingsProvider; + + public MIModelProvider(PackOutput output) { + super(output, MI.ID); + this.casingsProvider = new MachineCasingsProvider(output); } @Override - protected void registerStatesAndModels() { + public CompletableFuture run(CachedOutput cache) { + var parentFuture = super.run(cache); + var casingModelsFuture = casingsProvider.saveAll(cache); + return CompletableFuture.allOf(parentFuture, casingModelsFuture); + } + + @Override + protected void registerModels(BlockModelGenerators blockModels, ItemModelGenerators itemModels) { for (BlockDefinition blockDefinition : MIBlock.BLOCK_DEFINITIONS.values()) { - blockDefinition.modelGenerator.accept(blockDefinition.asBlock(), this); + blockDefinition.modelGenerator.accept(blockDefinition.asBlock(), blockModels); } for (FluidDefinition fluidDefinition : MIFluids.FLUID_DEFINITIONS.values()) { - existingModel(fluidDefinition.asFluidBlock(), Blocks.AIR); + blockModels.createNonTemplateModelBlock(fluidDefinition.asFluidBlock(), Blocks.AIR); } - simpleBlock(MIPipes.BLOCK_PIPE.get(), models().getBuilder("pipe") - .customLoader(TrivialModelBuilder.begin(PipeUnbakedModel.LOADER_ID)) - .end()); + blockModels.blockStateOutput.accept(customModel(MIPipes.BLOCK_PIPE.get(), PipeUnbakedModel.INSTANCE)); // Item models as well... for (ItemDefinition itemDefinition : MIItem.ITEM_DEFINITIONS.values()) { - itemDefinition.modelGenerator.accept(itemDefinition.asItem(), itemModels()); + itemDefinition.modelGenerator.accept(itemDefinition.asItem(), itemModels); } // Machine models for (var entry : MachineModelsToGenerate.props.entrySet()) { - simpleBlockWithItem(BuiltInRegistries.BLOCK.get(MI.id(entry.getKey())), models() - .getBuilder(entry.getKey()) - .customLoader((bmb, exFile) -> new MachineModelBuilder<>(entry.getValue(), bmb, exFile)) - .end()); + var block = BuiltInRegistries.BLOCK.getValue(MI.id(entry.getKey())); + var props = entry.getValue(); + + var defaultOverlays = new HashMap(); + for (var overlay : props.defaultOverlays().entrySet()) { + defaultOverlays.put(OverlayName.CODEC.byName(overlay.getKey()), overlay.getValue()); + } + + var model = new MachineUnbakedModel( + props.casing(), + defaultOverlays, + Map.of(), + props.noOverlayOnOutputSide()); + blockModels.blockStateOutput.accept(customModel(block, model)); + itemModels.itemModelOutput.accept(block.asItem(), new MachineItemModel.Unbaked(block)); } + + casingsProvider.generateModels(blockModels); + } + + private static MultiVariantGenerator customModel(Block block, CustomUnbakedBlockStateModel customModel) { + return MultiVariantGenerator.dispatch(block, MultiVariant.of(new CustomBlockStateModelBuilder.Simple(customModel))); } } diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineCasingsProvider.java b/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineCasingsProvider.java index 57f3ba9bd..a1f2c3b80 100644 --- a/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineCasingsProvider.java +++ b/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineCasingsProvider.java @@ -27,22 +27,40 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIBlock; import aztech.modern_industrialization.api.energy.CableTier; -import aztech.modern_industrialization.client.machines.models.MachineBakedModel; +import aztech.modern_industrialization.client.machines.models.CasingModel; +import aztech.modern_industrialization.client.machines.models.CasingModels; +import aztech.modern_industrialization.client.machines.models.UseBlockModelBakedModel; import aztech.modern_industrialization.machines.models.MachineCasing; import aztech.modern_industrialization.machines.models.MachineCasings; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.data.models.model.TextureSlot; +import net.minecraft.client.data.models.model.TexturedModel; +import net.minecraft.client.renderer.block.model.BlockStateModel; +import net.minecraft.client.renderer.block.model.SingleVariant; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; -import net.neoforged.neoforge.client.model.generators.BlockModelBuilder; -import net.neoforged.neoforge.client.model.generators.ModelProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; -public class MachineCasingsProvider extends ModelProvider { - public MachineCasingsProvider(PackOutput output, ExistingFileHelper existingFileHelper) { - super(output, MI.ID, MachineBakedModel.CASING_FOLDER, BlockModelBuilder::new, existingFileHelper); +public class MachineCasingsProvider { + private final PackOutput.PathProvider machineCasingsPathProvider; + private final Map casingModels = new HashMap<>(); + + public MachineCasingsProvider(PackOutput output) { + this.machineCasingsPathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, CasingModels.FOLDER_NAME); + } + + public CompletableFuture saveAll(CachedOutput cache) { + return DataProvider.saveAll(cache, CasingModel.Unbaked.CODEC, machineCasingsPathProvider, casingModels); } - @Override - protected void registerModels() { + protected void generateModels(BlockModelGenerators blockModels) { for (var casing : MachineCasings.registeredCasings.values()) { if (casing.imitatedBlock != null) { imitateBlock(casing, casing.imitatedBlock.get()); @@ -55,27 +73,38 @@ protected void registerModels() { imitateBlock(CableTier.EV.casing, MIBlock.HIGHLY_ADVANCED_MACHINE_HULL.asBlock()); imitateBlock(CableTier.SUPERCONDUCTOR.casing, MIBlock.QUANTUM_MACHINE_HULL.asBlock()); - cubeBottomTop(MachineCasings.BRICKED_BRONZE, "block/casings/bricked_bronze", "block/fire_clay_bricks", "block/bronze_machine_casing"); - cubeBottomTop(MachineCasings.BRICKED_STEEL, "block/casings/bricked_steel", "block/fire_clay_bricks", "block/steel_machine_casing"); - cubeAll(MachineCasings.CONFIGURABLE_TANK, "block/casings/configurable_tank"); - cubeAll(MachineCasings.STEEL_CRATE, "block/casings/steel_crate"); + cubeBottomTop(blockModels, MachineCasings.BRICKED_BRONZE, "block/casings/bricked_bronze", "block/fire_clay_bricks", "block/bronze_machine_casing"); + cubeBottomTop(blockModels, MachineCasings.BRICKED_STEEL, "block/casings/bricked_steel", "block/fire_clay_bricks", "block/steel_machine_casing"); + cubeAll(blockModels, MachineCasings.CONFIGURABLE_TANK, "block/casings/configurable_tank"); + cubeAll(blockModels, MachineCasings.STEEL_CRATE, "block/casings/steel_crate"); } - private void imitateBlock(MachineCasing casing, Block block) { - getBuilder(casing.key.toString()) - .customLoader((bmb, existingFileHelper) -> new UseBlockModelModelBuilder<>(block, bmb, existingFileHelper)); + private void generateCasing(MachineCasing casing, BlockStateModel.Unbaked model) { + casingModels.put(casing.key, new CasingModel.Unbaked(model)); } - private void cubeBottomTop(MachineCasing casing, String side, String bottom, String top) { - cubeBottomTop(casing.key.toString(), MI.id(side), MI.id(bottom), MI.id(top)); + private void imitateBlock(MachineCasing casing, Block block) { + generateCasing(casing, new UseBlockModelBakedModel.Unbaked(block)); } - private void cubeAll(MachineCasing casing, String side) { - cubeAll(casing.key.toString(), MI.id(side)); + private void cubeBottomTop(BlockModelGenerators blockModels, MachineCasing casing, String side, String bottom, String top) { + var modelId = casing.key.withPrefix("machine_casing/"); + ModelTemplates.CUBE_BOTTOM_TOP.create( + modelId, + new TextureMapping() + .put(TextureSlot.SIDE, MI.id(side)) + .put(TextureSlot.BOTTOM, MI.id(bottom)) + .put(TextureSlot.TOP, MI.id(top)), + blockModels.modelOutput); + generateCasing(casing, new SingleVariant.Unbaked(BlockModelGenerators.plainModel(modelId))); } - @Override - public String getName() { - return "Machine Casings"; + private void cubeAll(BlockModelGenerators blockModels, MachineCasing casing, String side) { + var modelId = casing.key.withPrefix("machine_casing/"); + ModelTemplates.CUBE_ALL.create( + modelId, + new TextureMapping().put(TextureSlot.ALL, MI.id(side)), + blockModels.modelOutput); + generateCasing(casing, new SingleVariant.Unbaked(BlockModelGenerators.plainModel(modelId))); } } diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineModelBuilder.java b/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineModelBuilder.java deleted file mode 100644 index 2c89b2ba9..000000000 --- a/src/client/java/aztech/modern_industrialization/client/datagen/model/MachineModelBuilder.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.datagen.model; - -import aztech.modern_industrialization.client.machines.models.MachineUnbakedModel; -import aztech.modern_industrialization.datagen.model.MachineModelProperties; -import com.google.gson.JsonObject; -import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; -import net.neoforged.neoforge.client.model.generators.ModelBuilder; -import net.neoforged.neoforge.common.data.ExistingFileHelper; - -class MachineModelBuilder> extends CustomLoaderBuilder { - private final MachineModelProperties props; - - protected MachineModelBuilder(MachineModelProperties props, T parent, ExistingFileHelper existingFileHelper) { - super(MachineUnbakedModel.LOADER_ID, parent, existingFileHelper, false); - - this.props = props; - } - - @Override - public JsonObject toJson(JsonObject json) { - var ret = super.toJson(json); - props.addToMachineJson(ret); - return ret; - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/model/TrivialModelBuilder.java b/src/client/java/aztech/modern_industrialization/client/datagen/model/TrivialModelBuilder.java deleted file mode 100644 index 0c3858181..000000000 --- a/src/client/java/aztech/modern_industrialization/client/datagen/model/TrivialModelBuilder.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.datagen.model; - -import java.util.function.BiFunction; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; -import net.neoforged.neoforge.client.model.generators.ModelBuilder; -import net.neoforged.neoforge.common.data.ExistingFileHelper; - -public class TrivialModelBuilder> extends CustomLoaderBuilder { - public static > BiFunction> begin(ResourceLocation loaderId) { - return (parent, helper) -> new TrivialModelBuilder<>(loaderId, parent, helper); - } - - private TrivialModelBuilder(ResourceLocation loaderId, T parent, ExistingFileHelper existingFileHelper) { - super(loaderId, parent, existingFileHelper, false); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/model/UseBlockModelModelBuilder.java b/src/client/java/aztech/modern_industrialization/client/datagen/model/UseBlockModelModelBuilder.java deleted file mode 100644 index 67dc0d069..000000000 --- a/src/client/java/aztech/modern_industrialization/client/datagen/model/UseBlockModelModelBuilder.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.datagen.model; - -import aztech.modern_industrialization.client.machines.models.UseBlockModelUnbakedModel; -import com.google.gson.JsonObject; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.level.block.Block; -import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; -import net.neoforged.neoforge.client.model.generators.ModelBuilder; -import net.neoforged.neoforge.common.data.ExistingFileHelper; - -public class UseBlockModelModelBuilder> extends CustomLoaderBuilder { - private final Block targetBlock; - - protected UseBlockModelModelBuilder(Block targetBlock, T parent, ExistingFileHelper existingFileHelper) { - super(UseBlockModelUnbakedModel.LOADER_ID, parent, existingFileHelper, false); - - this.targetBlock = targetBlock; - } - - @Override - public JsonObject toJson(JsonObject json) { - var ret = super.toJson(json); - ret.addProperty("block", BuiltInRegistries.BLOCK.getKey(targetBlock).toString()); - return ret; - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/model/package-info.java b/src/client/java/aztech/modern_industrialization/client/datagen/model/package-info.java deleted file mode 100644 index 1efa37d29..000000000 --- a/src/client/java/aztech/modern_industrialization/client/datagen/model/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.client.datagen.model; - -import org.jspecify.annotations.NullMarked; diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/texture/MISpriteSourceProvider.java b/src/client/java/aztech/modern_industrialization/client/datagen/texture/MISpriteSourceProvider.java index 71de14e54..426a2613b 100644 --- a/src/client/java/aztech/modern_industrialization/client/datagen/texture/MISpriteSourceProvider.java +++ b/src/client/java/aztech/modern_industrialization/client/datagen/texture/MISpriteSourceProvider.java @@ -28,18 +28,18 @@ import java.util.concurrent.CompletableFuture; import net.minecraft.client.renderer.texture.atlas.sources.DirectoryLister; import net.minecraft.core.HolderLookup; +import net.minecraft.data.AtlasIds; import net.minecraft.data.PackOutput; -import net.neoforged.neoforge.common.data.ExistingFileHelper; -import net.neoforged.neoforge.common.data.SpriteSourceProvider; +import net.neoforged.neoforge.client.data.SpriteSourceProvider; public class MISpriteSourceProvider extends SpriteSourceProvider { - public MISpriteSourceProvider(PackOutput packOutput, CompletableFuture lookupProvider, ExistingFileHelper fileHelper) { - super(packOutput, lookupProvider, MI.ID, fileHelper); + public MISpriteSourceProvider(PackOutput packOutput, CompletableFuture lookupProvider) { + super(packOutput, lookupProvider, MI.ID); } @Override protected void gather() { - atlas(BLOCKS_ATLAS) + atlas(AtlasIds.BLOCKS) .addSource(new DirectoryLister("fluid", "fluid/")); } } diff --git a/src/client/java/aztech/modern_industrialization/client/datagen/texture/TexturesProvider.java b/src/client/java/aztech/modern_industrialization/client/datagen/texture/TexturesProvider.java index 0ecbcb99d..6f5c25b6a 100644 --- a/src/client/java/aztech/modern_industrialization/client/datagen/texture/TexturesProvider.java +++ b/src/client/java/aztech/modern_industrialization/client/datagen/texture/TexturesProvider.java @@ -40,14 +40,18 @@ import com.google.common.hash.Hashing; import com.google.gson.JsonElement; import com.mojang.blaze3d.platform.NativeImage; + +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.channels.Channels; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; @@ -55,16 +59,16 @@ import net.minecraft.server.packs.PackLocationInfo; import net.minecraft.server.packs.PackResources; import net.minecraft.server.packs.PackType; -import net.minecraft.server.packs.PathPackResources; import net.minecraft.server.packs.VanillaPackResourcesBuilder; import net.minecraft.server.packs.repository.PackSource; import net.minecraft.server.packs.resources.MultiPackResourceManager; import net.minecraft.server.packs.resources.ResourceProvider; import net.neoforged.fml.ModList; import net.neoforged.fml.loading.FMLPaths; -import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.resource.ResourcePackLoader; +import org.lwjgl.stb.STBImage; -public record TexturesProvider(PackOutput packOutput, ExistingFileHelper existingFileHelper, boolean runtimeDatagen) implements DataProvider { +public record TexturesProvider(PackOutput packOutput, boolean runtimeDatagen) implements DataProvider { private static PackLocationInfo makePackInfo(String name) { return new PackLocationInfo(name, Component.literal(name), PackSource.BUILT_IN, Optional.empty()); } @@ -77,8 +81,8 @@ public CompletableFuture run(CachedOutput cache) { if (runtimeDatagen) { // MI jar - packs.add(new PathPackResources(makePackInfo("mi:runtimedatagen"), - ModList.get().getModFileById(MI.ID).getFile().getSecureJar().getRootPath())); + packs.add(ResourcePackLoader.createPackForJarContents(ModList.get().getModFileById(MI.ID).getFile().getContents()) + .openPrimary(makePackInfo("mi:runtimedatagen"))); // extra_datagen_resources folder var extra = FMLPaths.GAMEDIR.get().resolve("modern_industrialization").resolve("extra_datagen_resources"); @@ -117,15 +121,30 @@ private CompletableFuture generateTextures(CachedOutput cache, ResourceProvid return generated; } return fallbackResourceProvider.getResource(resourceLocation); - }, - existingFileHelper) + }) .whenComplete((result, throwable) -> outputPack.close()); } + private static byte[] asByteArray(NativeImage image) { + try ( + var outputStream = new ByteArrayOutputStream(); + var channel = Channels.newChannel(outputStream)) { + + if (!image.writeToChannel(channel)) { + throw new IOException("Could not write image to byte array: " + STBImage.stbi_failure_reason()); + } + + return outputStream.toByteArray(); + } catch (IOException exception) { + throw new UncheckedIOException(exception); + } + } + private void writeTexture(CachedOutput cache, NativeImage image, String textureId) { try { var path = packOutput.getOutputFolder().resolve("assets").resolve(textureId.replace(':', '/')); - cache.writeIfNeeded(path, image.asByteArray(), Hashing.sha1().hashBytes(image.asByteArray())); + var bytes = asByteArray(image); + cache.writeIfNeeded(path, bytes, Hashing.sha1().hashBytes(bytes)); } catch (IOException ex) { throw new RuntimeException("Failed to write texture " + textureId, ex); } diff --git a/src/client/java/aztech/modern_industrialization/client/items/ClientConfigCardTooltip.java b/src/client/java/aztech/modern_industrialization/client/items/ClientConfigCardTooltip.java index 7867f541f..94b0d58c3 100644 --- a/src/client/java/aztech/modern_industrialization/client/items/ClientConfigCardTooltip.java +++ b/src/client/java/aztech/modern_industrialization/client/items/ClientConfigCardTooltip.java @@ -36,7 +36,7 @@ public record ClientConfigCardTooltip(ConfigCardItem.TooltipData data) implements ClientTooltipComponent { @Override - public int getHeight() { + public int getHeight(Font font) { return 20; } @@ -46,21 +46,15 @@ public int getWidth(Font font) { } @Override - public void renderImage(Font font, int mouseX, int mouseY, GuiGraphics guiGraphics) { + public void renderImage(Font font, int x, int y, int w, int h, GuiGraphics graphics) { int i = 0; for (var stack : data.filter()) { - RenderHelper.renderAndDecorateItem(guiGraphics, font, stack, mouseX + i * 18, mouseY); + RenderHelper.renderAndDecorateItem(graphics, font, stack, x + i * 18, y); if (++i >= 5) { + graphics.drawString( + font, Component.literal("+ ...").withStyle(MITooltips.DEFAULT_STYLE), x + i * 5, y + 5, -1, true); break; } } } - - @Override - public void renderText(Font font, int x, int y, Matrix4f matrix4f, MultiBufferSource.BufferSource bufferSource) { - if (data.filter().size() >= 6) { - font.drawInBatch(Component.literal("+ ...").withStyle(MITooltips.DEFAULT_STYLE), x + 18 * 5, y + 5, -1, true, matrix4f, bufferSource, - Font.DisplayMode.NORMAL, 0, 0xF000F0); - } - } } diff --git a/src/client/java/aztech/modern_industrialization/client/items/SteamDrillHighlight.java b/src/client/java/aztech/modern_industrialization/client/items/SteamDrillHighlight.java index 52317ff03..8906fee6a 100644 --- a/src/client/java/aztech/modern_industrialization/client/items/SteamDrillHighlight.java +++ b/src/client/java/aztech/modern_industrialization/client/items/SteamDrillHighlight.java @@ -29,60 +29,59 @@ import java.util.Objects; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; -import net.minecraft.client.renderer.RenderType; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.neoforge.client.event.RenderHighlightEvent; import org.apache.commons.lang3.mutable.MutableObject; public class SteamDrillHighlight { - public static void onBlockHighlight(RenderHighlightEvent.Block event) { - var player = Objects.requireNonNull(Minecraft.getInstance().player); - - ItemStack stack = player.getMainHandItem(); - if (!(stack.getItem() instanceof SteamDrillItem drillItem)) { - return; - } - - var area = drillItem.getArea(player.level(), player, stack, true); - if (area == null) { - return; - } - - var origin = area.center(); - MutableObject fullShape = new MutableObject<>(Shapes.empty()); - - SteamDrillItem.forEachMineableBlock(player.level(), area, player, (blockPos, state) -> { - // Use raw method to skip our BlockStateBase mixin... - float destroyProgress = SteamDrillHooks.getDestroyProgressRaw(state, player, player.level(), blockPos); - if (destroyProgress <= 1e-9) { - return; - } - - var blockShape = state.getShape(player.level(), blockPos, CollisionContext.of(event.getCamera().getEntity())); - blockShape = blockShape.move(blockPos.getX() - origin.getX(), blockPos.getY() - origin.getY(), blockPos.getZ() - origin.getZ()); - - fullShape.setValue(Shapes.joinUnoptimized(fullShape.getValue(), blockShape, BooleanOp.OR)); - }); - - if (fullShape.getValue() == Shapes.empty()) { - return; - } - - LevelRenderer.renderShape( - event.getPoseStack(), - event.getMultiBufferSource().getBuffer(RenderType.lines()), - fullShape.getValue(), - origin.getX() - event.getCamera().getPosition().x(), - origin.getY() - event.getCamera().getPosition().y(), - origin.getZ() - event.getCamera().getPosition().z(), - 0.0F, - 0.0F, - 0.0F, - 0.4F); - event.setCanceled(true); - } + // TODO 26.1 +// public static void onBlockHighlight(RenderHighlightEvent.Block event) { +// var player = Objects.requireNonNull(Minecraft.getInstance().player); +// +// ItemStack stack = player.getMainHandItem(); +// if (!(stack.getItem() instanceof SteamDrillItem drillItem)) { +// return; +// } +// +// var area = drillItem.getArea(player.level(), player, stack, true); +// if (area == null) { +// return; +// } +// +// var origin = area.center(); +// MutableObject fullShape = new MutableObject<>(Shapes.empty()); +// +// SteamDrillItem.forEachMineableBlock(player.level(), area, player, (blockPos, state) -> { +// // Use raw method to skip our BlockStateBase mixin... +// float destroyProgress = SteamDrillHooks.getDestroyProgressRaw(state, player, player.level(), blockPos); +// if (destroyProgress <= 1e-9) { +// return; +// } +// +// var blockShape = state.getShape(player.level(), blockPos, CollisionContext.of(event.getCamera().getEntity())); +// blockShape = blockShape.move(blockPos.getX() - origin.getX(), blockPos.getY() - origin.getY(), blockPos.getZ() - origin.getZ()); +// +// fullShape.setValue(Shapes.joinUnoptimized(fullShape.getValue(), blockShape, BooleanOp.OR)); +// }); +// +// if (fullShape.getValue() == Shapes.empty()) { +// return; +// } +// +// LevelRenderer.renderShape( +// event.getPoseStack(), +// event.getMultiBufferSource().getBuffer(RenderType.lines()), +// fullShape.getValue(), +// origin.getX() - event.getCamera().getPosition().x(), +// origin.getY() - event.getCamera().getPosition().y(), +// origin.getZ() - event.getCamera().getPosition().z(), +// 0.0F, +// 0.0F, +// 0.0F, +// 0.4F); +// event.setCanceled(true); +// } } diff --git a/src/client/java/aztech/modern_industrialization/client/items/SteamDrillTooltipComponent.java b/src/client/java/aztech/modern_industrialization/client/items/SteamDrillTooltipComponent.java index a8a5fb51f..e5445c9b5 100644 --- a/src/client/java/aztech/modern_industrialization/client/items/SteamDrillTooltipComponent.java +++ b/src/client/java/aztech/modern_industrialization/client/items/SteamDrillTooltipComponent.java @@ -32,6 +32,7 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.renderer.RenderPipelines; public class SteamDrillTooltipComponent implements ClientTooltipComponent { final SteamDrillItem.SteamDrillTooltipData data; @@ -41,19 +42,19 @@ public SteamDrillTooltipComponent(SteamDrillItem.SteamDrillTooltipData data) { } @Override - public int getHeight() { + public int getHeight(Font font) { return 20; } @Override - public int getWidth(Font textRenderer) { + public int getWidth(Font font) { return 40; } @Override - public void renderImage(Font font, int x, int y, GuiGraphics guiGraphics) { + public void renderImage(Font font, int x, int y, int w, int h, GuiGraphics guiGraphics) { // Slot background - guiGraphics.blit(MachineScreen.SLOT_ATLAS, x, y, 0, 0, 18, 18, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, x, y, 0, 0, 18, 18, 256, 256); // Stack itself RenderHelper.renderAndDecorateItem(guiGraphics, font, data.variant().toStack((int) data.amount()), x + 1, y + 1); // Burning flame next to the stack diff --git a/src/client/java/aztech/modern_industrialization/client/items/armor/HudRenderer.java b/src/client/java/aztech/modern_industrialization/client/items/armor/HudRenderer.java index 0b533371e..50847e6b9 100644 --- a/src/client/java/aztech/modern_industrialization/client/items/armor/HudRenderer.java +++ b/src/client/java/aztech/modern_industrialization/client/items/armor/HudRenderer.java @@ -40,11 +40,13 @@ import net.minecraft.world.item.ItemStack; public class HudRenderer { + private static final int TEXT_COLOR = 0xfff9fffe; + public static void onRenderHud(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { Minecraft mc = Minecraft.getInstance(); if (mc.player != null) { - guiGraphics.pose().pushPose(); - guiGraphics.pose().translate(0, MIClientConfig.INSTANCE.armorHudYPosition.getAsInt(), 0); + guiGraphics.pose().pushMatrix(); + guiGraphics.pose().translate(0, MIClientConfig.INSTANCE.armorHudYPosition.getAsInt()); ItemStack chest = mc.player.getItemBySlot(EquipmentSlot.CHEST); if (chest.getItem() instanceof JetpackItem jetpack) { boolean active = jetpack.isActivated(chest); @@ -55,10 +57,10 @@ public static void onRenderHud(GuiGraphics guiGraphics, DeltaTracker deltaTracke } else { jetpackActiveComponent = MIText.JetpackDisabled.text().setStyle(Style.EMPTY.withColor(ChatFormatting.RED)); } - guiGraphics.drawString(mc.font, jetpackActiveComponent, 4, 0, 16383998); + guiGraphics.drawString(mc.font, jetpackActiveComponent, 4, 0, TEXT_COLOR); Component fillText = MIText.JetpackFill.text(FluidFuelItemHelper.getAmount(chest) * 100 / JetpackItem.CAPACITY); - guiGraphics.drawString(mc.font, fillText, 4, 10, 16383998); + guiGraphics.drawString(mc.font, fillText, 4, 10, TEXT_COLOR); } else if (chest.getItem() instanceof GraviChestPlateItem gsp) { boolean active = gsp.isActivated(chest); @@ -70,12 +72,12 @@ public static void onRenderHud(GuiGraphics guiGraphics, DeltaTracker deltaTracke gravichestplateActiveComponent = MIText.GravichestplateDisabled.text().setStyle(Style.EMPTY.withColor(ChatFormatting.RED)); } - guiGraphics.drawString(mc.font, gravichestplateActiveComponent, 4, 0, 16383998); + guiGraphics.drawString(mc.font, gravichestplateActiveComponent, 4, 0, TEXT_COLOR); Component fillText = MIText.EnergyFill.text( gsp.getEnergy(chest) * 100 / GraviChestPlateItem.ENERGY_CAPACITY); - guiGraphics.drawString(mc.font, fillText, 4, 10, 16383998); + guiGraphics.drawString(mc.font, fillText, 4, 10, TEXT_COLOR); } - guiGraphics.pose().popPose(); + guiGraphics.pose().popMatrix(); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/GuiComponentsClient.java b/src/client/java/aztech/modern_industrialization/client/machines/GuiComponentsClient.java index e5aaca188..ae5e68502 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/GuiComponentsClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/GuiComponentsClient.java @@ -56,12 +56,12 @@ import java.util.Map; import java.util.function.BiFunction; import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public final class GuiComponentsClient { - private static final Map> components = new HashMap<>(); + private static final Map> components = new HashMap<>(); - public static Registration get(ResourceLocation id) { + public static Registration get(Identifier id) { var registration = components.get(id); if (registration == null) { throw new IllegalArgumentException("Unknown GUI component ID: " + id); diff --git a/src/client/java/aztech/modern_industrialization/client/machines/MachineBlockEntityRenderer.java b/src/client/java/aztech/modern_industrialization/client/machines/MachineBlockEntityRenderer.java index 64a48a80d..3fdb576c5 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/MachineBlockEntityRenderer.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/MachineBlockEntityRenderer.java @@ -26,7 +26,7 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.client.compat.sodium.SodiumCompat; -import aztech.modern_industrialization.client.machines.models.MachineBakedModel; +import aztech.modern_industrialization.client.machines.models.MachineBlockStateModel; import aztech.modern_industrialization.client.util.ModelHelper; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.models.MachineCasing; @@ -40,15 +40,18 @@ import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.client.renderer.feature.ModelFeatureRenderer; +import net.minecraft.client.renderer.state.CameraRenderState; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; import net.neoforged.fml.ModList; import net.neoforged.neoforge.client.model.pipeline.QuadBakingVertexConsumer; import org.jspecify.annotations.Nullable; @@ -56,12 +59,12 @@ /** * Renders an overlay if the machine is active. */ -public class MachineBlockEntityRenderer implements BlockEntityRenderer { +public class MachineBlockEntityRenderer implements BlockEntityRenderer { private final BlockModelShaper blockModels; @Nullable private BlockState lastBlockState = null; @Nullable - private MachineBakedModel model = null; + private MachineBlockStateModel model = null; private final IdentityHashMap quadCache = new IdentityHashMap<>(); private static final Object NO_QUAD = new Object(); @@ -69,21 +72,73 @@ public class MachineBlockEntityRenderer implements private static final MethodHandle UNWRAP_BAKED_MODEL; static { MethodHandle unwrapBakedModel = null; - // Support for Continuity's model wrapping - if (ModList.get().isLoaded("fabric_renderer_api_v1")) { - try { - var wrapperBakedModel = Class.forName("net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel"); - var unwrap = wrapperBakedModel.getMethod("unwrap", BakedModel.class); - unwrapBakedModel = MethodHandles.lookup().unreflect(unwrap); - } catch (ReflectiveOperationException e) { - LogUtils.getLogger().error("Failed to reflect WrapperBakedModel.unwrap method", e); - } - } + // TODO Continuity support +// // Support for Continuity's model wrapping +// if (ModList.get().isLoaded("fabric_renderer_api_v1")) { +// try { +// var wrapperBakedModel = Class.forName("net.fabricmc.fabric.api.renderer.v1.model.WrapperBakedModel"); +// var unwrap = wrapperBakedModel.getMethod("unwrap", BakedModel.class); +// unwrapBakedModel = MethodHandles.lookup().unreflect(unwrap); +// } catch (ReflectiveOperationException e) { +// LogUtils.getLogger().error("Failed to reflect WrapperBakedModel.unwrap method", e); +// } +// } UNWRAP_BAKED_MODEL = unwrapBakedModel; } public MachineBlockEntityRenderer(BlockEntityRendererProvider.Context ctx) { - this.blockModels = ctx.getBlockRenderDispatcher().getBlockModelShaper(); + this.blockModels = ctx.blockRenderDispatcher().getBlockModelShaper(); + } + + @Override + public MachineRenderState createRenderState() { + return new MachineRenderState(); + } + + @Override + public void extractRenderState(T machine, MachineRenderState state, float partialTicks, Vec3 cameraPosition, ModelFeatureRenderer.@Nullable CrumblingOverlay breakProgress) { + BlockEntityRenderer.super.extractRenderState(machine, state, partialTicks, cameraPosition, breakProgress); + + BlockState blockState = machine.getBlockState(); + if (lastBlockState == null) { + lastBlockState = blockState; + model = getMachineModel(blockState); + } else if (lastBlockState != blockState) { + // Sanity check. + throw new IllegalStateException("Tried to use the same machine BER with two block states: " + blockState + " and " + lastBlockState); + } + + MachineModelClientData data = machine.getMachineModelData(); + if (data.isActive) { + for (Direction d : Direction.values()) { + BakedQuad quad = getCachedQuad(data, d); + state.activeOverlays[d.get3DDataValue()].quad = quad; + if (quad != null) { + state.activeOverlays[d.get3DDataValue()].packedLight = LevelRenderer.getLightCoords(LevelRenderer.BrightnessGetter.DEFAULT, machine.getLevel(), machine.getBlockState(), machine.getBlockPos().relative(d)); + } + } + + } else { + for (Direction d : Direction.values()) { + state.activeOverlays[d.get3DDataValue()].quad = null; + } + } + } + + @Override + public void submit(MachineRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState camera) { + for (Direction d : Direction.values()) { + var activeOverlay = state.activeOverlays[d.get3DDataValue()]; + var quad = activeOverlay.quad; + if (quad == null) { + continue; + } + int packedLight = activeOverlay.packedLight; + submitNodeCollector.submitCustomGeometry(poseStack, Sheets.cutoutBlockSheet(), (pose, vc) -> { + vc.putBulkData(pose, quad, 1.0f, 1.0f, 1.0f, 1.0f, packedLight, OverlayTexture.NO_OVERLAY); + SodiumCompat.markSpriteActive(quad.sprite()); + }); + } } @Nullable @@ -97,10 +152,9 @@ private BakedQuad getCachedQuad(MachineModelClientData data, Direction d) { var cachedQuads = quadCache.computeIfAbsent(casing, c -> new Object[36]); if (cachedQuads[cachedQuadIndex] == null) { - TextureAtlasSprite sprite = model == null ? null : MachineBakedModel.getSprite(model.getSprites(casing), d, facing, true); + TextureAtlasSprite sprite = model == null ? null : MachineBlockStateModel.getSprite(model.getSprites(casing), d, facing, true); if (sprite != null) { - var vc = new QuadBakingVertexConsumer(); - cachedQuads[cachedQuadIndex] = ModelHelper.bakeSprite(vc, d, sprite, -2 * MachineBakedModel.Z_OFFSET); + cachedQuads[cachedQuadIndex] = ModelHelper.bakeSprite(d, sprite, -2 * MachineBlockStateModel.Z_OFFSET); } else { cachedQuads[cachedQuadIndex] = NO_QUAD; } @@ -111,52 +165,26 @@ private BakedQuad getCachedQuad(MachineModelClientData data, Direction d) { } @Nullable - private MachineBakedModel getMachineModel(BlockState state) { + private MachineBlockStateModel getMachineModel(BlockState state) { var model = blockModels.getBlockModel(state); if (UNWRAP_BAKED_MODEL != null) { - try { - model = (BakedModel) UNWRAP_BAKED_MODEL.invokeExact((BakedModel) model); - } catch (Throwable throwable) { - throw new RuntimeException("Failed to unwrap machine model", throwable); - } + // TODO Continuity support +// try { +// model = (BakedModel) UNWRAP_BAKED_MODEL.invokeExact((BakedModel) model); +// } catch (Throwable throwable) { +// throw new RuntimeException("Failed to unwrap machine model", throwable); +// } } - if (model instanceof MachineBakedModel mbm) { + if (model instanceof MachineBlockStateModel mbm) { return mbm; } else { - MI.LOGGER.warn("Model {} should have been a MachineBakedModel, but was {}", state, model.getClass()); + MI.LOGGER.warn("Model {} should have been a MachineBlockStateModel, but was {}", state, model.getClass()); return null; } } - @Override - public void render(T entity, float tickDelta, PoseStack matrices, MultiBufferSource vcp, int light, int overlay) { - BlockState state = entity.getBlockState(); - if (lastBlockState == null) { - lastBlockState = state; - model = getMachineModel(state); - } else if (lastBlockState != state) { - // Sanity check. - throw new IllegalStateException("Tried to use the same machine BER with two block states: " + state + " and " + lastBlockState); - } - - MachineModelClientData data = entity.getMachineModelData(); - if (data.isActive) { - VertexConsumer vc = vcp.getBuffer(Sheets.cutoutBlockSheet()); - - for (Direction d : Direction.values()) { - BakedQuad quad = getCachedQuad(data, d); - if (quad != null) { - int faceLight = LevelRenderer.getLightColor(entity.getLevel(), entity.getBlockState(), entity.getBlockPos().relative(d)); - vc.putBulkData(matrices.last(), quad, 1.0f, 1.0f, 1.0f, 1.0f, faceLight, OverlayTexture.NO_OVERLAY); - - SodiumCompat.markSpriteActive(quad.getSprite()); - } - } - } - } - @Override public int getViewDistance() { return 256; diff --git a/src/client/java/aztech/modern_industrialization/client/machines/MachineOverlayClient.java b/src/client/java/aztech/modern_industrialization/client/machines/MachineOverlayClient.java index ac79ecccd..e8261a0bf 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/MachineOverlayClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/MachineOverlayClient.java @@ -26,77 +26,75 @@ import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.client.MIRenderTypes; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadBuffer; import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.MachineOverlay; import aztech.modern_industrialization.util.GeometryHelper; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.phys.Vec3; -import net.neoforged.neoforge.client.event.RenderHighlightEvent; import org.joml.Matrix4f; public class MachineOverlayClient { - @SuppressWarnings("ConstantConditions") - public static void onBlockOutline(RenderHighlightEvent.Block event) { - var blockHitResult = event.getTarget(); - - BlockPos pos = blockHitResult.getBlockPos(); - var level = Minecraft.getInstance().level; - if (level.getBlockEntity(pos) instanceof MachineBlockEntity machine - && (machine.orientation.params.hasFacing || machine.orientation.params.hasOutput) - && Minecraft.getInstance().player.getMainHandItem().is(MITags.WRENCHES)) { - var poseStack = event.getPoseStack(); - - poseStack.pushPose(); - Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); - double x = pos.getX() - cameraPos.x; - double y = pos.getY() - cameraPos.y; - double z = pos.getZ() - cameraPos.z; - poseStack.translate(x, y, z); - - // Colored face overlay - Vec3 posInBlock = MachineOverlay.getPosInBlock(blockHitResult); - Vec3 posOnFace = GeometryHelper.toFaceCoords(posInBlock, blockHitResult.getDirection()); - - var emitter = new QuadBuffer(); - VertexConsumer vc = event.getMultiBufferSource().getBuffer(MIRenderTypes.machineOverlay()); - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - double minX = MachineOverlay.ZONES[i], maxX = MachineOverlay.ZONES[i + 1]; - double minY = MachineOverlay.ZONES[j], maxY = MachineOverlay.ZONES[j + 1]; - boolean insideQuad = minX <= posOnFace.x && posOnFace.x <= maxX && minY <= posOnFace.y && posOnFace.y <= maxY; - emitter.emit(); - emitter.square(blockHitResult.getDirection(), (float) minX, (float) minY, (float) maxX, (float) maxY, -3.5e-4f); - float r = 0; - float g = insideQuad ? 1 : 0; - float b = insideQuad ? 0 : 1; - RenderHelper.quadWithAlpha(vc, poseStack.last(), emitter.toBakedQuad(null), r, g, b, 0.3f, 0x7fffffff, - -2130706433); - } - } - Minecraft.getInstance().renderBuffers().bufferSource().endBatch(MIRenderTypes.machineOverlay()); - - // Extra lines - VertexConsumer lines = event.getMultiBufferSource().getBuffer(RenderType.lines()); - Matrix4f model = poseStack.last().pose(); - Direction face = blockHitResult.getDirection(); - vertex(model, lines, face, MachineOverlay.ZONES[1], MachineOverlay.ZONES[0]); - vertex(model, lines, face, MachineOverlay.ZONES[1], MachineOverlay.ZONES[3]); - vertex(model, lines, face, MachineOverlay.ZONES[2], MachineOverlay.ZONES[0]); - vertex(model, lines, face, MachineOverlay.ZONES[2], MachineOverlay.ZONES[3]); - vertex(model, lines, face, MachineOverlay.ZONES[0], MachineOverlay.ZONES[1]); - vertex(model, lines, face, MachineOverlay.ZONES[3], MachineOverlay.ZONES[1]); - vertex(model, lines, face, MachineOverlay.ZONES[0], MachineOverlay.ZONES[2]); - vertex(model, lines, face, MachineOverlay.ZONES[3], MachineOverlay.ZONES[2]); - - poseStack.popPose(); - } - } + // TODO 26.1 +// @SuppressWarnings("ConstantConditions") +// public static void onBlockOutline(RenderHighlightEvent.Block event) { +// var blockHitResult = event.getTarget(); +// +// BlockPos pos = blockHitResult.getBlockPos(); +// var level = Minecraft.getInstance().level; +// if (level.getBlockEntity(pos) instanceof MachineBlockEntity machine +// && (machine.orientation.params.hasFacing || machine.orientation.params.hasOutput) +// && Minecraft.getInstance().player.getMainHandItem().is(MITags.WRENCHES)) { +// var poseStack = event.getPoseStack(); +// +// poseStack.pushPose(); +// Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); +// double x = pos.getX() - cameraPos.x; +// double y = pos.getY() - cameraPos.y; +// double z = pos.getZ() - cameraPos.z; +// poseStack.translate(x, y, z); +// +// // Colored face overlay +// Vec3 posInBlock = MachineOverlay.getPosInBlock(blockHitResult); +// Vec3 posOnFace = GeometryHelper.toFaceCoords(posInBlock, blockHitResult.getDirection()); +// +// var emitter = new QuadBuffer(); +// VertexConsumer vc = event.getMultiBufferSource().getBuffer(MIRenderTypes.machineOverlay()); +// for (int i = 0; i < 3; ++i) { +// for (int j = 0; j < 3; ++j) { +// double minX = MachineOverlay.ZONES[i], maxX = MachineOverlay.ZONES[i + 1]; +// double minY = MachineOverlay.ZONES[j], maxY = MachineOverlay.ZONES[j + 1]; +// boolean insideQuad = minX <= posOnFace.x && posOnFace.x <= maxX && minY <= posOnFace.y && posOnFace.y <= maxY; +// emitter.emit(); +// emitter.square(blockHitResult.getDirection(), (float) minX, (float) minY, (float) maxX, (float) maxY, -3.5e-4f); +// float r = 0; +// float g = insideQuad ? 1 : 0; +// float b = insideQuad ? 0 : 1; +// RenderHelper.quadWithAlpha(vc, poseStack.last(), emitter.toBakedQuad(null), r, g, b, 0.3f, 0x7fffffff, +// -2130706433); +// } +// } +// Minecraft.getInstance().renderBuffers().bufferSource().endBatch(MIRenderTypes.machineOverlay()); +// +// // Extra lines +// VertexConsumer lines = event.getMultiBufferSource().getBuffer(RenderType.lines()); +// Matrix4f model = poseStack.last().pose(); +// Direction face = blockHitResult.getDirection(); +// vertex(model, lines, face, MachineOverlay.ZONES[1], MachineOverlay.ZONES[0]); +// vertex(model, lines, face, MachineOverlay.ZONES[1], MachineOverlay.ZONES[3]); +// vertex(model, lines, face, MachineOverlay.ZONES[2], MachineOverlay.ZONES[0]); +// vertex(model, lines, face, MachineOverlay.ZONES[2], MachineOverlay.ZONES[3]); +// vertex(model, lines, face, MachineOverlay.ZONES[0], MachineOverlay.ZONES[1]); +// vertex(model, lines, face, MachineOverlay.ZONES[3], MachineOverlay.ZONES[1]); +// vertex(model, lines, face, MachineOverlay.ZONES[0], MachineOverlay.ZONES[2]); +// vertex(model, lines, face, MachineOverlay.ZONES[3], MachineOverlay.ZONES[2]); +// +// poseStack.popPose(); +// } +// } private static void vertex(Matrix4f model, VertexConsumer lines, Direction face, double faceX, double faceY) { Vec3 coord = GeometryHelper.toWorldCoords(new Vec3(faceX, faceY, 0), face); diff --git a/src/client/java/aztech/modern_industrialization/client/machines/MachineRenderState.java b/src/client/java/aztech/modern_industrialization/client/machines/MachineRenderState.java new file mode 100644 index 000000000..adb7a2859 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/machines/MachineRenderState.java @@ -0,0 +1,16 @@ +package aztech.modern_industrialization.client.machines; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState; +import org.jspecify.annotations.Nullable; + +public class MachineRenderState extends BlockEntityRenderState { + public final ActiveOverlay[] activeOverlays = new ActiveOverlay[] { + new ActiveOverlay(),new ActiveOverlay(),new ActiveOverlay(),new ActiveOverlay(),new ActiveOverlay(),new ActiveOverlay()}; + + public static class ActiveOverlay { + @Nullable + BakedQuad quad; + int packedLight; + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineMenuClient.java b/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineMenuClient.java index e4b96e9e3..afa7cfead 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineMenuClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineMenuClient.java @@ -36,21 +36,26 @@ import aztech.modern_industrialization.util.NbtHelper; import java.util.ArrayList; import java.util.List; + +import com.mojang.logging.LogUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.storage.TagValueInput; +import net.minecraft.world.level.storage.TagValueOutput; import org.jspecify.annotations.Nullable; +import org.slf4j.Logger; public class MachineMenuClient extends MachineMenuCommon { + private static final Logger LOGGER = LogUtils.getLogger(); + @SuppressWarnings("ConstantConditions") public static MachineMenuClient create(int syncId, Inventory playerInventory, RegistryFriendlyByteBuf buf) { // Inventory - List itemStacks = new ArrayList<>(); - List fluidStacks = new ArrayList<>(); - CompoundTag tag = buf.readNbt(); - NbtHelper.getList(tag, "items", itemStacks, t -> new ConfigurableItemStack(t, buf.registryAccess())); - NbtHelper.getList(tag, "fluids", fluidStacks, t -> new ConfigurableFluidStack(t, buf.registryAccess())); + List itemStacks = ConfigurableItemStack.LIST_STREAM_CODEC.decode(buf); + List fluidStacks = ConfigurableFluidStack.LIST_STREAM_CODEC.decode(buf); // Slot positions SlotPositions itemPositions = SlotPositions.read(buf); SlotPositions fluidPositions = SlotPositions.read(buf); @@ -60,7 +65,7 @@ public static MachineMenuClient create(int syncId, Inventory playerInventory, Re List> componentTypes = new ArrayList<>(componentCount); ComponentStorage> components = new ComponentStorage<>(); for (int i = 0; i < componentCount; ++i) { - var id = buf.readResourceLocation(); + var id = buf.readIdentifier(); var registration = GuiComponentsClient.get(id); componentTypes.add(registration.type()); components.register(registration.readNewComponent(buf)); diff --git a/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineScreen.java b/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineScreen.java index 71c228e42..015f76cb3 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineScreen.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/gui/MachineScreen.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIText; import aztech.modern_industrialization.client.DynamicTooltip; -import aztech.modern_industrialization.client.screen.MIHandledScreen; +import aztech.modern_industrialization.client.screen.MIContainerScreen; import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.inventory.BackgroundRenderedSlot; import aztech.modern_industrialization.inventory.ConfigurableFluidStack; @@ -36,7 +36,6 @@ import aztech.modern_industrialization.network.machines.AdjustSlotCapacityPacket; import aztech.modern_industrialization.network.machines.LockAllPacket; import aztech.modern_industrialization.network.machines.SetLockingModePacket; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.FluidHelper; import aztech.modern_industrialization.util.Rectangle; import aztech.modern_industrialization.util.TextHelper; @@ -48,10 +47,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.util.CommonColors; import net.minecraft.util.FormattedCharSequence; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.Slot; @@ -59,22 +60,21 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.neoforged.neoforge.transfer.fluid.FluidResource; -public class MachineScreen extends MIHandledScreen implements ClientComponentRenderer.ButtonContainer { - public static final ResourceLocation SLOT_ATLAS = MI.id("textures/gui/container/slot_atlas.png"); - public static final ResourceLocation BACKGROUND = MI.id("textures/gui/container/background.png"); +public class MachineScreen extends MIContainerScreen implements ClientComponentRenderer.ButtonContainer { + public static final Identifier SLOT_ATLAS = MI.id("textures/gui/container/slot_atlas.png"); + public static final Identifier BACKGROUND = MI.id("textures/gui/container/background.png"); private final List renderers = new ArrayList<>(); public MachineScreen(MachineMenuClient handler, Inventory inventory, Component title) { - super(handler, inventory, title); + super(handler, inventory, title, handler.guiParams.backgroundWidth, handler.guiParams.backgroundHeight); for (GuiComponentClient component : handler.components) { renderers.add(component.createRenderer(this)); } - this.imageHeight = handler.guiParams.backgroundHeight; - this.imageWidth = handler.guiParams.backgroundWidth; this.inventoryLabelY = this.imageHeight - 94; } @@ -112,9 +112,9 @@ protected void init() { } public void blitButton(Button button, GuiGraphics guiGraphics, int baseU, int baseV, int selectedOverlayU, int selectedOverlayV) { - guiGraphics.blit(SLOT_ATLAS, button.getX(), button.getY(), baseU, baseV, button.getWidth(), button.getHeight()); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, SLOT_ATLAS, button.getX(), button.getY(), baseU, baseV, button.getWidth(), button.getHeight(), 256, 256); if (button.isHoveredOrFocused()) { - guiGraphics.blit(SLOT_ATLAS, button.getX(), button.getY(), selectedOverlayU, selectedOverlayV, button.getWidth(), button.getHeight()); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, SLOT_ATLAS, button.getX(), button.getY(), selectedOverlayU, selectedOverlayV, button.getWidth(), button.getHeight(), 256, 256); } } @@ -133,7 +133,7 @@ public void blitButtonSmall(Button button, GuiGraphics guiGraphics, int u, int v } public void blitButtonNoHighlight(Button button, GuiGraphics guiGraphics, int u, int v) { - guiGraphics.blit(SLOT_ATLAS, button.getX(), button.getY(), u, v, button.getWidth(), button.getHeight()); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, SLOT_ATLAS, button.getX(), button.getY(), u, v, button.getWidth(), button.getHeight(), 256, 256); } @Override @@ -156,7 +156,7 @@ public MachineButton addButton(int posX, int posY, int width, int height, Consum private void addLockButton() { addButton(40, syncId -> { - if (hasShiftDown()) { + if (Minecraft.getInstance().hasShiftDown()) { boolean lock = menu.hasUnlockedSlot(); menu.lockAll(lock); new LockAllPacket(syncId, lock).sendToServer(); @@ -214,16 +214,16 @@ private FormattedCharSequence titleToRender() { */ @Override protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { - guiGraphics.drawString(this.font, titleToRender(), this.titleLabelX, this.titleLabelY, 4210752, false); - guiGraphics.drawString(this.font, this.playerInventoryTitle, this.inventoryLabelX, this.inventoryLabelY, 4210752, false); + guiGraphics.drawString(this.font, titleToRender(), this.titleLabelX, this.titleLabelY, CommonColors.DARK_GRAY, false); + guiGraphics.drawString(this.font, this.playerInventoryTitle, this.inventoryLabelX, this.inventoryLabelY, CommonColors.DARK_GRAY, false); } @Override protected void renderBg(GuiGraphics guiGraphics, float delta, int mouseX, int mouseY) { int bw = menu.guiParams.backgroundWidth; int bh = menu.guiParams.backgroundHeight; - guiGraphics.blit(BACKGROUND, leftPos, topPos + 4, 0, 256 - bh + 4, bw, bh - 4); - guiGraphics.blit(BACKGROUND, leftPos, topPos, 0, 0, bw, 4); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, leftPos, topPos + 4, 0, 256 - bh + 4, bw, bh - 4, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, leftPos, topPos, 0, 0, bw, 4, 256, 256); for (ClientComponentRenderer renderer : renderers) { renderer.renderBackground(guiGraphics, leftPos, topPos); @@ -241,17 +241,17 @@ private void renderConfigurableSlotBackgrounds(GuiGraphics guiGraphics) { } int px = leftPos + slot.x - 1; int py = topPos + slot.y - 1; - guiGraphics.blit(atlas, px, py, brs.getBackgroundU(), brs.getBackgroundV(), 18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, atlas, px, py, brs.getBackgroundU(), brs.getBackgroundV(), 18, 18, 256, 256); } } } @Override - protected void renderSlot(GuiGraphics guiGraphics, Slot slot) { + protected void renderSlot(GuiGraphics guiGraphics, Slot slot, int mouseX, int mouseY) { if (slot instanceof ConfigurableFluidStack.ConfigurableFluidSlot cfs) { ConfigurableFluidStack stack = cfs.getConfStack(); - FluidVariant renderedKey = stack.getLockedInstance() == null ? stack.getResource() : FluidVariant.of(stack.getLockedInstance()); - if (!renderedKey.isBlank()) { + FluidResource renderedKey = stack.getLockedInstance() == null ? stack.getResource() : FluidResource.of(stack.getLockedInstance()); + if (!renderedKey.isEmpty()) { RenderHelper.drawFluidInGui(guiGraphics, renderedKey, slot.x, slot.y); } return; @@ -259,21 +259,21 @@ protected void renderSlot(GuiGraphics guiGraphics, Slot slot) { if (slot instanceof ConfigurableItemStack.ConfigurableItemSlot itemSlot) { ConfigurableItemStack itemStack = itemSlot.getConfStack(); - if ((itemStack.isPlayerLocked() || itemStack.isMachineLocked()) && itemStack.getResource().isBlank()) { + if ((itemStack.isPlayerLocked() || itemStack.isMachineLocked()) && itemStack.getResource().isEmpty()) { Item item = itemStack.getLockedInstance(); if (item != Items.AIR) { RenderHelper.renderAndDecorateItem(guiGraphics, font, new ItemStack(item), slot.x, slot.y, "0"); } } } - super.renderSlot(guiGraphics, slot); + super.renderSlot(guiGraphics, slot, mouseX, mouseY); } private void renderConfigurableSlotTooltips(GuiGraphics guiGraphics, int mouseX, int mouseY) { Slot slot = hoveredSlot; if (slot instanceof ConfigurableFluidStack.ConfigurableFluidSlot) { ConfigurableFluidStack stack = ((ConfigurableFluidStack.ConfigurableFluidSlot) slot).getConfStack(); - FluidVariant renderedKey = stack.getLockedInstance() != null ? FluidVariant.of(stack.getLockedInstance()) : stack.getResource(); + FluidResource renderedKey = stack.getLockedInstance() != null ? FluidResource.of(stack.getLockedInstance()) : stack.getResource(); List tooltip = new ArrayList<>( FluidHelper.getTooltipForFluidStorage(renderedKey, stack.getAmount(), stack.getCapacity(), false)); @@ -286,12 +286,12 @@ private void renderConfigurableSlotTooltips(GuiGraphics guiGraphics, int mouseX, } else if (stack.canPlayerExtract()) { tooltip.add(MIText.FluidSlotOutput.text().setStyle(TextHelper.GRAY_TEXT)); } - guiGraphics.renderTooltip(font, tooltip, Optional.empty(), mouseX, mouseY); + guiGraphics.setTooltipForNextFrame(font, tooltip, Optional.empty(), mouseX, mouseY); } else if (slot instanceof ConfigurableItemStack.ConfigurableItemSlot confSlot) { renderConfigurableItemStackTooltip(guiGraphics, confSlot.getConfStack(), mouseX, mouseY); } else if (slot != null && slot.hasItem()) { // regular tooltip - guiGraphics.renderTooltip(font, slot.getItem(), mouseX, mouseY); + guiGraphics.setTooltipForNextFrame(font, slot.getItem(), mouseX, mouseY); } } @@ -314,7 +314,7 @@ private void renderConfigurableItemStackTooltip(GuiGraphics guiGraphics, Configu } textTooltip.add(MIText.ConfigurableSlotCapacity.text(capacityText).setStyle(TextHelper.GRAY_TEXT)); // Render - guiGraphics.renderTooltip(font, textTooltip, data, mouseX, mouseY); + guiGraphics.setTooltipForNextFrame(font, textTooltip, data, mouseX, mouseY); } @Override @@ -322,7 +322,7 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amountX, doubl if (hoveredSlot instanceof ConfigurableItemStack.ConfigurableItemSlot confSlot) { ConfigurableItemStack stack = confSlot.getConfStack(); boolean isIncrease = amountY > 0; - boolean isShiftDown = hasShiftDown(); + boolean isShiftDown = Minecraft.getInstance().hasShiftDown(); // Client side update stack.adjustCapacity(isIncrease, isShiftDown); // Server side update @@ -334,9 +334,9 @@ public boolean mouseScrolled(double mouseX, double mouseY, double amountX, doubl } @Override - protected boolean hasClickedOutside(double mouseX, double mouseY, int guiLeft, int guiTop, int mouseButton) { - return getExtraBoxes().stream().noneMatch(r -> r.contains(mouseX, mouseY)) - && super.hasClickedOutside(mouseX, mouseY, guiLeft, guiTop, mouseButton); + protected boolean hasClickedOutside(double mx, double my, int xo, int yo) { + return getExtraBoxes().stream().noneMatch(r -> r.contains(mx, my)) + && super.hasClickedOutside(mx, my, xo, yo); } public MachineGuiParameters getGuiParams() { @@ -383,7 +383,7 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia } @Override - public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + public void renderContents(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { renderer.renderButton(MachineScreen.this, this, guiGraphics, mouseX, mouseY, partialTick); } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/CraftingMultiblockGuiClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/CraftingMultiblockGuiClient.java index 21e320084..2c90e28b2 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/CraftingMultiblockGuiClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/CraftingMultiblockGuiClient.java @@ -34,7 +34,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.resources.Identifier; import net.minecraft.util.Unit; public class CraftingMultiblockGuiClient extends GuiComponentClient { @@ -52,25 +53,26 @@ public ClientComponentRenderer createRenderer(MachineScreen machineScreen) { } public static class BaseScreenRenderer { - private static final ResourceLocation TEXTURE = MI.id("textures/gui/container/multiblock_info.png"); + private static final Identifier TEXTURE = MI.id("textures/gui/container/multiblock_info.png"); /** * Returns {@code deltaY}. */ public int renderScreenAndStatus(boolean shapeValid, Font font, GuiGraphics guiGraphics, int x, int y) { - guiGraphics.blit(TEXTURE, x + CraftingMultiblockGui.X, y + CraftingMultiblockGui.Y, 0, 0, - CraftingMultiblockGui.W, CraftingMultiblockGui.H, CraftingMultiblockGui.W, CraftingMultiblockGui.H); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, x + CraftingMultiblockGui.X, y + CraftingMultiblockGui.Y, 0, 0, + CraftingMultiblockGui.W, CraftingMultiblockGui.H, + CraftingMultiblockGui.W, CraftingMultiblockGui.H); int deltaY = 23; guiGraphics.drawString(font, shapeValid ? MIText.MultiblockShapeValid.text() : MIText.MultiblockShapeInvalid.text(), x + 10, y + deltaY, - shapeValid ? 0xFFFFFF : 0xFF0000, false); + shapeValid ? 0xFFFFFFFF : 0xFFFF0000, false); deltaY += 11; if (shapeValid) { - guiGraphics.drawString(font, MIText.MultiblockStatusActive.text(), x + 10, y + deltaY, 0xFFFFFF, false); + guiGraphics.drawString(font, MIText.MultiblockStatusActive.text(), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; } @@ -89,21 +91,21 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { if (data.activeRecipe().isPresent()) { var recipe = data.activeRecipe().get(); - guiGraphics.drawString(font, MIText.Progress.text(String.format("%.1f", recipe.progress() * 100) + " %"), x + 10, y + deltaY, 0xFFFFFF, + guiGraphics.drawString(font, MIText.Progress.text(String.format("%.1f", recipe.progress() * 100) + " %"), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; if (recipe.efficiencyTicks() != 0 || recipe.maxEfficiencyTicks() != 0) { - guiGraphics.drawString(font, MIText.EfficiencyTicks.text(recipe.efficiencyTicks(), recipe.maxEfficiencyTicks()), x + 10, y + deltaY, 0xFFFFFF, + guiGraphics.drawString(font, MIText.EfficiencyTicks.text(recipe.efficiencyTicks(), recipe.maxEfficiencyTicks()), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; } - guiGraphics.drawString(font, MIText.BaseEuRecipe.text(TextHelper.getEuTextTick(recipe.baseRecipeEu())), x + 10, y + deltaY, 0xFFFFFF, + guiGraphics.drawString(font, MIText.BaseEuRecipe.text(TextHelper.getEuTextTick(recipe.baseRecipeEu())), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; - guiGraphics.drawString(font, MIText.CurrentEuRecipe.text(TextHelper.getEuTextTick(recipe.currentRecipeEu())), x + 10, y + deltaY, 0xFFFFFF, + guiGraphics.drawString(font, MIText.CurrentEuRecipe.text(TextHelper.getEuTextTick(recipe.currentRecipeEu())), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; } @@ -111,7 +113,7 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { if (data.remainingOverclockTicks() > 0) { guiGraphics.drawString(font, GunpowderOverclockGuiClient.Renderer.formatOverclock(data.remainingOverclockTicks()), x + 10, y + deltaY, - 0xFFFFFF, false); + 0xFFFFFFFF, false); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/EnergyBarClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/EnergyBarClient.java index 4d3cb1bb1..4a0e48200 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/EnergyBarClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/EnergyBarClient.java @@ -33,9 +33,12 @@ import aztech.modern_industrialization.util.TextHelper; import java.util.Collections; import java.util.Optional; + +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; public class EnergyBarClient extends GuiComponentClient { @@ -53,11 +56,11 @@ public class Renderer implements ClientComponentRenderer { public static final int HEIGHT = 18; public static void renderEnergy(GuiGraphics guiGraphics, int px, int py, float fill) { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, px, py, 230, 0, WIDTH, HEIGHT); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, px, py, 230, 0, WIDTH, HEIGHT, 256, 256); int fillPixels = (int) (fill * HEIGHT * 0.9 + HEIGHT * 0.1); if (fill > 0.95) fillPixels = HEIGHT; - guiGraphics.blit(MachineScreen.SLOT_ATLAS, px, py + HEIGHT - fillPixels, 243, HEIGHT - fillPixels, WIDTH, fillPixels); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, px, py + HEIGHT - fillPixels, 243, HEIGHT - fillPixels, WIDTH, fillPixels, 256, 256); } @Override @@ -69,13 +72,13 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphics, int x, int y, int cursorX, int cursorY) { if (RenderHelper.isPointWithinRectangle(params.renderX(), params.renderY(), WIDTH, HEIGHT, cursorX - x, cursorY - y)) { Component tooltip; - if (Screen.hasShiftDown()) { + if (Minecraft.getInstance().hasShiftDown()) { tooltip = MIText.EuMaxed.text(data.eu(), data.maxEu(), ""); } else { TextHelper.MaxedAmount maxedAmount = TextHelper.getMaxedAmount(data.eu(), data.maxEu()); tooltip = MIText.EuMaxed.text(maxedAmount.digit(), maxedAmount.maxDigit(), maxedAmount.unit()); } - guiGraphics.renderTooltip(font, Collections.singletonList(tooltip), Optional.empty(), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, Collections.singletonList(tooltip), Optional.empty(), cursorX, cursorY); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GeneratorMultiblockGuiClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GeneratorMultiblockGuiClient.java index 997228319..0729e6a16 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GeneratorMultiblockGuiClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GeneratorMultiblockGuiClient.java @@ -59,11 +59,11 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { if (data.isShapeValid()) { deltaY += 11; - guiGraphics.drawString(font, MIText.GeneratorCurrentEu.text(TextHelper.getEuTextTick(data.currentEuGeneration())), x + 10, y + deltaY, 0xFFFFFF, + guiGraphics.drawString(font, MIText.GeneratorCurrentEu.text(TextHelper.getEuTextTick(data.currentEuGeneration())), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; - guiGraphics.drawString(font, MIText.GeneratorMaxEu.text(TextHelper.getEuTextTick(data.maxEuGeneration())), x + 10, y + deltaY, 0xFFFFFF, + guiGraphics.drawString(font, MIText.GeneratorMaxEu.text(TextHelper.getEuTextTick(data.maxEuGeneration())), x + 10, y + deltaY, 0xFFFFFFFF, false); deltaY += 11; } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GunpowderOverclockGuiClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GunpowderOverclockGuiClient.java index 52eeaa660..5e644c916 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GunpowderOverclockGuiClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/GunpowderOverclockGuiClient.java @@ -32,6 +32,7 @@ import aztech.modern_industrialization.machines.guicomponents.GunpowderOverclockGui; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; public class GunpowderOverclockGuiClient extends GuiComponentClient { @@ -50,7 +51,7 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { if (data > 0) { int px = x + params.renderX(); int py = y + params.renderY(); - guiGraphics.blit(MachineScreen.SLOT_ATLAS, px, py, 0, 58, 20, 20); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, px, py, 0, 58, 20, 20, 256, 256); } } @@ -58,7 +59,7 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphics, int x, int y, int cursorX, int cursorY) { if (data > 0) { if (RenderHelper.isPointWithinRectangle(params.renderX(), params.renderY(), 20, 20, cursorX - x, cursorY - y)) { - guiGraphics.renderTooltip(font, formatOverclock(data), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, formatOverclock(data), cursorX, cursorY); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/LargeTankFluidDisplayClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/LargeTankFluidDisplayClient.java index 47efc8c69..9c12a1311 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/LargeTankFluidDisplayClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/LargeTankFluidDisplayClient.java @@ -30,15 +30,17 @@ import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.machines.blockentities.multiblocks.LargeTankMultiblockBlockEntity; import aztech.modern_industrialization.machines.guicomponents.LargeTankFluidDisplay; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.FluidHelper; -import com.mojang.blaze3d.systems.RenderSystem; + import java.util.Objects; import java.util.Optional; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.util.CommonColors; import net.minecraft.util.Unit; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class LargeTankFluidDisplayClient extends GuiComponentClient { public LargeTankFluidDisplayClient(Unit params, LargeTankFluidDisplay.Data data) { @@ -52,24 +54,22 @@ public ClientComponentRenderer createRenderer(MachineScreen machineScreen) { @Override public void renderBackground(GuiGraphics guiGraphics, int leftPos, int topPos) { - FluidVariant fluid = data.fluid(); + FluidResource fluid = data.fluid(); float fracFull = (float) data.amount() / data.capacity(); - guiGraphics.blit(MachineScreen.SLOT_ATLAS, leftPos + posX, topPos + posY, 92, 38, 46, 62); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, leftPos + posX, topPos + posY, 92, 38, 46, 62, 256, 256); - RenderSystem.disableBlend(); - if (!fluid.isBlank()) { + if (!fluid.isEmpty()) { for (int i = 0; i < 2; i++) { for (int j = 0; j < 3; j++) { float localFullness = Math.min(Math.max(3 * fracFull - (2 - j), 0), 1); RenderHelper.drawFluidInGui(guiGraphics, fluid, leftPos + posX + 7 + i * 16, - topPos + posY + 7 + j * 16 + (1 - localFullness) * 16, 16, localFullness); + topPos + posY + 7 + j * 16 + Math.round((1 - localFullness) * 16), 16, localFullness); } } } - RenderSystem.enableBlend(); - guiGraphics.blit(MachineScreen.SLOT_ATLAS, leftPos + posX + 7, topPos + posY + 7, 60, 38, 32, 48); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, leftPos + posX + 7, topPos + posY + 7, 60, 38, 32, 48, 256, 256); // A bit hacky: draw the capacity corresponding to the shape in the shape selection GUI if it's open. ;) var shapeSelection = machineScreen.getMenu().getComponent(ShapeSelectionClient.class); @@ -81,7 +81,7 @@ public void renderBackground(GuiGraphics guiGraphics, int leftPos, int topPos) { selectedShape.get(0), selectedShape.get(1), selectedShape.get(2)); var capacityText = FluidHelper.getFluidAmountLarge(capacity); - guiGraphics.drawString(Minecraft.getInstance().font, capacityText, shapePanelBox.x() + 14, shapePanelBox.y() + 14, 0x404040, + guiGraphics.drawString(Minecraft.getInstance().font, capacityText, shapePanelBox.x() + 14, shapePanelBox.y() + 14, CommonColors.DARK_GRAY, false); } } @@ -89,7 +89,7 @@ public void renderBackground(GuiGraphics guiGraphics, int leftPos, int topPos) { @Override public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphics, int x, int y, int cursorX, int cursorY) { if (RenderHelper.isPointWithinRectangle(posX + 7, posY + 7, 32, 48, cursorX - x, cursorY - y)) { - guiGraphics.renderTooltip(font, + guiGraphics.setTooltipForNextFrame(font, FluidHelper.getTooltipForFluidStorage(data.fluid(), data.amount(), data.capacity()), Optional.empty(), cursorX, cursorY); diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/NuclearReactorGuiClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/NuclearReactorGuiClient.java index 9534f8fb5..c8f91697f 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/NuclearReactorGuiClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/NuclearReactorGuiClient.java @@ -41,26 +41,27 @@ import aztech.modern_industrialization.nuclear.NuclearConstant; import aztech.modern_industrialization.nuclear.NuclearFuel; import aztech.modern_industrialization.nuclear.NuclearTileData; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import aztech.modern_industrialization.util.FluidHelper; import aztech.modern_industrialization.util.TextHelper; -import com.mojang.blaze3d.systems.RenderSystem; + import java.util.ArrayList; import java.util.List; import java.util.Optional; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.Unit; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.Resource; public class NuclearReactorGuiClient extends GuiComponentClient { - public static final ResourceLocation TEXTURE_ATLAS = MI.id("textures/gui/rei/texture_atlas.png"); + public static final Identifier TEXTURE_ATLAS = MI.id("textures/gui/rei/texture_atlas.png"); public NuclearReactorGuiClient(Unit params, NuclearReactorGui.Data data) { super(params, data); @@ -76,9 +77,9 @@ public class Renderer implements ClientComponentRenderer { Renderer.Mode currentMode = Renderer.Mode.NUCLEAR_FUEL; NeutronType neutronMode = BOTH; - ItemStack fuelStack = new ItemStack(BuiltInRegistries.ITEM.get(MI.id("uranium_fuel_rod")), 1); + ItemStack fuelStack = new ItemStack(BuiltInRegistries.ITEM.getValue(MI.id("uranium_fuel_rod")), 1); - private final ResourceLocation COLORBAR = MI.id("textures/gui/colorbar.png"); + private final Identifier COLORBAR = MI.id("textures/gui/colorbar.png"); private enum Mode { NUCLEAR_FUEL(0), @@ -113,21 +114,20 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { int py = y + centerY - data.gridSizeY() * 9 + j * 18; if (tileData.isFluid()) { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, px, py, 18, 0, 18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, px, py, 18, 0, 18, 18, 256, 256); } else { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, px, py, 0, 0, 18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, px, py, 0, 0, 18, 18, 256, 256); } - TransferVariant variant = tile.get().getVariant(); + Resource variant = tile.get().getVariant(); long variantAmount = tile.get().getVariantAmount(); - if (variantAmount > 0 & !variant.isBlank()) { - if (variant instanceof ItemVariant itemVariant) { - var stack = itemVariant.toStack((int) variantAmount); + if (variantAmount > 0 & !variant.isEmpty()) { + if (variant instanceof ItemResource itemResource) { + var stack = itemResource.toStack((int) variantAmount); RenderHelper.renderAndDecorateItem(guiGraphics, Minecraft.getInstance().font, stack, px + 1, py + 1); - } else if (variant instanceof FluidVariant fluidVariant) { - RenderSystem.disableBlend(); - RenderHelper.drawFluidInGui(guiGraphics, fluidVariant, px + 1, py + 1); + } else if (variant instanceof FluidResource fluidResource) { + RenderHelper.drawFluidInGui(guiGraphics, fluidResource, px + 1, py + 1); } } @@ -162,25 +162,20 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { u = (int) (299 * NuclearReactorGui.neutronColorScheme(factor * neutronRate)); } - RenderSystem.disableDepthTest(); - RenderSystem.enableBlend(); - - guiGraphics.pose().translate(px, py, 0); - guiGraphics.pose().scale(18, 18, 1); - guiGraphics.blit(COLORBAR, 0, 0, u, v, 1, 1, 300, 60); - guiGraphics.pose().scale(1 / 18f, 1 / 18f, 1); - guiGraphics.pose().translate(-px, -py, 0); + guiGraphics.pose().translate(px, py); + guiGraphics.pose().scale(18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, COLORBAR, 0, 0, u, v, 1, 1, 300, 60); + guiGraphics.pose().scale(1 / 18f, 1 / 18f); + guiGraphics.pose().translate(-px, -py); } if (currentMode == Renderer.Mode.TEMPERATURE) { - if (!variant.isBlank() && variant instanceof ItemVariant itemVariant) { - if (itemVariant.getItem() instanceof NuclearComponentItem item) { + if (!variant.isEmpty() && variant instanceof ItemResource itemResource) { + if (itemResource.getItem() instanceof NuclearComponentItem item) { if (tileData.getTemperature() + 100 > item.getMaxTemperature()) { - RenderSystem.enableBlend(); - RenderSystem.disableDepthTest(); if (System.currentTimeMillis() % 1000 > 500) { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, px + 1, py + 1, 22, 58, 16, 16); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, px + 1, py + 1, 22, 58, 16, 16, 256, 256); } } } @@ -192,16 +187,14 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { if (data.euFuelConsumption() > 0 && currentMode == Renderer.Mode.EU_GENERATION) { Font font = Minecraft.getInstance().font; - guiGraphics.pose().translate(0, 0, 256); - guiGraphics.drawString(font, getEfficiencyText(), x + 8, y + 16, 0xFFFFFF, false); - guiGraphics.pose().translate(0, 0, -256); + guiGraphics.drawString(font, getEfficiencyText(), x + 8, y + 16, -1, false); } } else { Font font = Minecraft.getInstance().font; Component text = MIText.MultiblockShapeInvalid.text().setStyle(TextHelper.RED.withBold(true)); int width = font.width(text); - guiGraphics.drawString(font, text, x + centerX - width / 2, y + centerY, 0xFFFFFF, false); + guiGraphics.drawString(font, text, x + centerX - width / 2, y + centerY, -1, false); } } @@ -216,15 +209,15 @@ public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphi Optional tile = data.tilesData().get(index).data(); if (tile.isPresent()) { NuclearTileData tileData = tile.get(); - TransferVariant variant = tileData.getVariant(); + Resource variant = tileData.getVariant(); if (currentMode == Renderer.Mode.NUCLEAR_FUEL) { long variantAmount = tile.get().getVariantAmount(); - if (variantAmount > 0 & !variant.isBlank()) { - if (variant instanceof ItemVariant itemVariant) { - guiGraphics.renderTooltip(font, itemVariant.toStack((int) variantAmount), cursorX, cursorY); - } else if (variant instanceof FluidVariant fluidVariant) { - guiGraphics.renderTooltip(font, - FluidHelper.getTooltipForFluidStorage(fluidVariant, variantAmount, NuclearHatch.capacity, false), + if (variantAmount > 0 & !variant.isEmpty()) { + if (variant instanceof ItemResource itemResource) { + guiGraphics.setTooltipForNextFrame(font, itemResource.toStack((int) variantAmount), cursorX, cursorY); + } else if (variant instanceof FluidResource fluidResource) { + guiGraphics.setTooltipForNextFrame(font, + FluidHelper.getTooltipForFluidStorage(fluidResource, variantAmount, NuclearHatch.capacity, false), Optional.empty(), cursorX, cursorY); } } @@ -235,18 +228,18 @@ public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphi tooltip.add(MIText.Temperature.text(temperature)); - if (!variant.isBlank() && variant instanceof ItemVariant itemVariant) { - if (itemVariant.getItem() instanceof NuclearComponentItem item) { + if (!variant.isEmpty() && variant instanceof ItemResource itemResource) { + if (itemResource.getItem() instanceof NuclearComponentItem item) { tooltip.add(MIText.MaxTemp.text(item.getMaxTemperature()).setStyle(TextHelper.YELLOW)); } } - guiGraphics.renderTooltip(font, tooltip, Optional.empty(), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, tooltip, Optional.empty(), cursorX, cursorY); return; } else if (currentMode == Renderer.Mode.EU_GENERATION) { double euGeneration = tileData.getMeanEuGeneration(); - guiGraphics.renderTooltip(font, TextHelper.getEuTextTick(euGeneration, true), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, TextHelper.getEuTextTick(euGeneration, true), cursorX, cursorY); return; } else { double neutronRateFast; @@ -313,7 +306,7 @@ public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphi } } - guiGraphics.renderTooltip(font, tooltips, Optional.empty(), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, tooltips, Optional.empty(), cursorX, cursorY); return; } @@ -331,7 +324,7 @@ public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphi Component tooltip = MIText.NuclearFuelEfficiencyTooltip.text(euProduction, euFuelConsumption); - guiGraphics.renderTooltip(font, tooltip, cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, tooltip, cursorX, cursorY); } } } @@ -395,9 +388,9 @@ public void addButtons(ButtonContainer container) { if (currentMode == Renderer.Mode.NUCLEAR_FUEL) { RenderHelper.renderAndDecorateItem(guiGraphics, fuelStack, button.getX() + 1, button.getY() + 1); } else if (currentMode == Renderer.Mode.EU_GENERATION) { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, button.getX() + 4, button.getY() + 2, 243, 1, 13, 17); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, button.getX() + 4, button.getY() + 2, 243, 1, 13, 17, 256, 256); } else { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, button.getX(), button.getY(), 124 + currentMode.index * 20, 0, 20, 20); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, button.getX(), button.getY(), 124 + currentMode.index * 20, 0, 20, 20, 256, 256); } }, this::drawButton); @@ -410,11 +403,11 @@ public void addButtons(ButtonContainer container) { button.renderVanilla(guiGraphics, mouseX, mouseY, delta); if (neutronMode == FAST) { - guiGraphics.blit(TEXTURE_ATLAS, button.getX() + 2, button.getY() + 2, 0, 240, 16, 16); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE_ATLAS, button.getX() + 2, button.getY() + 2, 0, 240, 16, 16, 256, 256); } else if (neutronMode == NeutronType.THERMAL) { - guiGraphics.blit(TEXTURE_ATLAS, button.getX() + 2, button.getY() + 2, 160, 240, 16, 16); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE_ATLAS, button.getX() + 2, button.getY() + 2, 160, 240, 16, 16, 256, 256); } else if (neutronMode == BOTH) { - guiGraphics.blit(TEXTURE_ATLAS, button.getX() + 2, button.getY() + 2, 80, 240, 16, 16); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE_ATLAS, button.getX() + 2, button.getY() + 2, 80, 240, 16, 16, 256, 256); } }, this::drawNeutronButton); } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ProgressBarClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ProgressBarClient.java index 55f7896d2..e49e80ade 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ProgressBarClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ProgressBarClient.java @@ -29,6 +29,7 @@ import aztech.modern_industrialization.client.machines.gui.MachineScreen; import aztech.modern_industrialization.machines.guicomponents.ProgressBar; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; public class ProgressBarClient extends GuiComponentClient { public ProgressBarClient(ProgressBar.Params params, Float data) { @@ -37,15 +38,15 @@ public ProgressBarClient(ProgressBar.Params params, Float data) { public static void renderProgress(GuiGraphics guiGraphics, int x, int y, ProgressBar.Params params, float progress) { // background - guiGraphics.blit(params.getTextureId(), x + params.renderX(), y + params.renderY(), 0, 0, params.width(), params.height(), params.width(), params.textureHeight()); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, params.getTextureId(), x + params.renderX(), y + params.renderY(), 0, 0, params.width(), params.height(), params.width(), params.textureHeight()); // foreground if (progress > 0) { if (!params.isVertical()) { int foregroundPixels = (int) (progress * params.width()); - guiGraphics.blit(params.getTextureId(), x + params.renderX(), y + params.renderY(), 0, params.height(), foregroundPixels, params.height(), params.width(), params.textureHeight()); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, params.getTextureId(), x + params.renderX(), y + params.renderY(), 0, params.height(), foregroundPixels, params.height(), params.width(), params.textureHeight()); } else { int foregroundPixels = (int) (progress * params.height()); - guiGraphics.blit(params.getTextureId(), x + params.renderX(), y + params.renderY() + params.height() - foregroundPixels, 0, + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, params.getTextureId(), x + params.renderX(), y + params.renderY() + params.height() - foregroundPixels, 0, params.textureHeight() - foregroundPixels, params.width(), foregroundPixels, params.width(), params.textureHeight()); } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/RecipeEfficiencyBarClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/RecipeEfficiencyBarClient.java index 8bc3894f1..f410b5f04 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/RecipeEfficiencyBarClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/RecipeEfficiencyBarClient.java @@ -37,8 +37,9 @@ import java.util.Optional; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class RecipeEfficiencyBarClient extends GuiComponentClient { public RecipeEfficiencyBarClient(RecipeEfficiencyBar.Params params, RecipeEfficiencyBar.Data data) { @@ -50,16 +51,16 @@ public ClientComponentRenderer createRenderer(MachineScreen machineScreen) { return new Renderer(); } - private static final ResourceLocation TEXTURE = MI.id("textures/gui/efficiency_bar.png"); + private static final Identifier TEXTURE = MI.id("textures/gui/efficiency_bar.png"); private static final int WIDTH = 100, HEIGHT = 2; public class Renderer implements ClientComponentRenderer { @Override public void renderBackground(GuiGraphics guiGraphics, int x, int y) { - guiGraphics.blit(TEXTURE, x + params.renderX() - 1, y + params.renderY() - 1, 0, 2, WIDTH + 2, HEIGHT + 2, 102, 6); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, x + params.renderX() - 1, y + params.renderY() - 1, 0, 2, WIDTH + 2, HEIGHT + 2, 102, 6); if (data.hasActiveRecipe()) { int barPixels = (int) ((float) data.efficiencyTicks() / data.maxEfficiencyTicks() * WIDTH); - guiGraphics.blit(TEXTURE, x + params.renderX(), y + params.renderY(), 0, 0, barPixels, HEIGHT, 102, 6); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, x + params.renderX(), y + params.renderY(), 0, 0, barPixels, HEIGHT, 102, 6); } } @@ -80,7 +81,7 @@ public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphi tooltip.add(MIText.EfficiencyMaxOverclock.text(data.maxRecipeEu())); - guiGraphics.renderTooltip(font, tooltip, Optional.empty(), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, tooltip, Optional.empty(), cursorX, cursorY); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ShapeSelectionClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ShapeSelectionClient.java index 05dcc370c..97478b879 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ShapeSelectionClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/ShapeSelectionClient.java @@ -36,6 +36,8 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.util.CommonColors; public class ShapeSelectionClient extends GuiComponentClient, List> { private Renderer renderer; @@ -126,11 +128,10 @@ public void addButtons(ButtonContainer container) { public void renderBackground(GuiGraphics guiGraphics, int leftPos, int topPos) { var box = getBox(leftPos, topPos); - guiGraphics.blit(MachineScreen.BACKGROUND, box.x(), box.y(), 0, 0, box.w(), box.h() - 4); - guiGraphics.blit(MachineScreen.BACKGROUND, box.x(), box.y() + box.h() - 4, 0, 252, box.w(), 4); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.BACKGROUND, box.x(), box.y(), 0, 0, box.w(), box.h() - 4, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.BACKGROUND, box.x(), box.y() + box.h() - 4, 0, 252, box.w(), 4, 256, 256); if (isPanelOpen) { - RenderSystem.disableDepthTest(); for (int i = 0; i < params.size(); ++i) { var line = params.get(i); var tooltip = line.translations().get(data.get(i)); @@ -138,9 +139,8 @@ public void renderBackground(GuiGraphics guiGraphics, int leftPos, int topPos) { guiGraphics.drawString( Minecraft.getInstance().font, tooltip, box.x() + borderSize + outerPadding + btnSize + innerPadding + (textMaxWidth - width) / 2, - topPos + getVerticalPos(i) + 2, 0x404040, false); + topPos + getVerticalPos(i) + 2, CommonColors.DARK_GRAY, false); } - RenderSystem.enableDepthTest(); } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/SlotPanelClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/SlotPanelClient.java index c792d40fb..f1c029dab 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/SlotPanelClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/SlotPanelClient.java @@ -34,6 +34,7 @@ import java.util.List; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.util.Unit; import net.minecraft.world.Container; @@ -103,14 +104,14 @@ public void renderBackground(GuiGraphics guiGraphics, int x, int y) { var box = getBox(x, y); int textureX = box.x() - x - box.w(); - guiGraphics.blit(MachineScreen.BACKGROUND, box.x(), box.y(), textureX, 0, box.w(), box.h() - 4); - guiGraphics.blit(MachineScreen.BACKGROUND, box.x(), box.y() + box.h() - 4, textureX, 252, box.w(), 4); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.BACKGROUND, box.x(), box.y(), textureX, 0, box.w(), box.h() - 4, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.BACKGROUND, box.x(), box.y() + box.h() - 4, textureX, 252, box.w(), 4, 256, 256); } @Override public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphics, int x, int y, int cursorX, int cursorY) { if (screen.getFocusedSlot() instanceof SlotTooltip st && !screen.getFocusedSlot().hasItem()) { - guiGraphics.renderTooltip(font, st.getTooltip(), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, st.getTooltip(), cursorX, cursorY); } } }; diff --git a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/TemperatureBarClient.java b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/TemperatureBarClient.java index 0c7716a06..dcdc68771 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/TemperatureBarClient.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/guicomponents/TemperatureBarClient.java @@ -33,7 +33,8 @@ import aztech.modern_industrialization.machines.guicomponents.TemperatureBar; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.resources.Identifier; public class TemperatureBarClient extends GuiComponentClient { public TemperatureBarClient(TemperatureBar.Params params, Integer data) { @@ -46,25 +47,25 @@ public ClientComponentRenderer createRenderer(MachineScreen machineScreen) { } public class Renderer implements ClientComponentRenderer { - private final ResourceLocation TEXTURE = MI.id("textures/gui/efficiency_bar.png"); + private final Identifier TEXTURE = MI.id("textures/gui/efficiency_bar.png"); private final int WIDTH = 100, HEIGHT = 2; @Override public void renderBackground(GuiGraphics guiGraphics, int x, int y) { // background - guiGraphics.blit(TEXTURE, x + params.renderX() - 1, y + params.renderY() - 1, 0, 2, + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, x + params.renderX() - 1, y + params.renderY() - 1, 0, 2, WIDTH + 2, HEIGHT + 2, 102, 6); int barPixels = (int) ((float) data / params.temperatureMax() * WIDTH); - guiGraphics.blit(TEXTURE, x + params.renderX(), y + params.renderY(), 0, 0, barPixels, + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE, x + params.renderX(), y + params.renderY(), 0, 0, barPixels, HEIGHT, 102, 6); - guiGraphics.blit(MachineScreen.SLOT_ATLAS, x + params.renderX() - 22, y + params.renderY() + HEIGHT / 2 - 10, 144, 0, 20, 20); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, x + params.renderX() - 22, y + params.renderY() + HEIGHT / 2 - 10, 144, 0, 20, 20, 256, 256); } @Override public void renderTooltip(MachineScreen screen, Font font, GuiGraphics guiGraphics, int x, int y, int cursorX, int cursorY) { if (RenderHelper.isPointWithinRectangle(params.renderX(), params.renderY(), WIDTH, HEIGHT, cursorX - x, cursorY - y)) { - guiGraphics.renderTooltip(font, MIText.Temperature.text(data), cursorX, cursorY); + guiGraphics.setTooltipForNextFrame(font, MIText.Temperature.text(data), cursorX, cursorY); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/BakedModelWrapper.java b/src/client/java/aztech/modern_industrialization/client/machines/models/BakedModelWrapper.java deleted file mode 100644 index 3329c1f37..000000000 --- a/src/client/java/aztech/modern_industrialization/client/machines/models/BakedModelWrapper.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.machines.models; - -import com.mojang.blaze3d.vertex.PoseStack; -import java.util.List; -import java.util.function.Supplier; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; -import net.minecraft.world.item.ItemDisplayContext; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.ChunkRenderTypeSet; -import net.neoforged.neoforge.client.model.data.ModelData; -import net.neoforged.neoforge.common.util.TriState; -import org.jspecify.annotations.Nullable; - -/** - * Wrapper for {@link BakedModel} which delegates all operations to its parent. - *

- * Useful for creating wrapper baked models which only override certain properties. - */ -abstract class BakedModelWrapper implements BakedModel { - protected final Supplier originalModel; - - public BakedModelWrapper(Supplier originalModel) { - this.originalModel = originalModel; - } - - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand) { - return originalModel.get().getQuads(state, side, rand); - } - - @Override - public boolean useAmbientOcclusion() { - return originalModel.get().useAmbientOcclusion(); - } - - @Override - public TriState useAmbientOcclusion(BlockState state, ModelData data, RenderType renderType) { - return originalModel.get().useAmbientOcclusion(state, data, renderType); - } - - @Override - public boolean isGui3d() { - return originalModel.get().isGui3d(); - } - - @Override - public boolean usesBlockLight() { - return originalModel.get().usesBlockLight(); - } - - @Override - public boolean isCustomRenderer() { - // CTM calls this before we can resolve the UseBlockModelBakedModel delegate. - // Always return false instead of checking the delegate. - return false; - } - - @Override - public TextureAtlasSprite getParticleIcon() { - return originalModel.get().getParticleIcon(); - } - - @Override - public ItemTransforms getTransforms() { - return originalModel.get().getTransforms(); - } - - @Override - public ItemOverrides getOverrides() { - return originalModel.get().getOverrides(); - } - - @Override - public BakedModel applyTransform(ItemDisplayContext cameraTransformType, PoseStack poseStack, boolean applyLeftHandTransform) { - return originalModel.get().applyTransform(cameraTransformType, poseStack, applyLeftHandTransform); - } - - @Override - public TextureAtlasSprite getParticleIcon(ModelData data) { - return originalModel.get().getParticleIcon(data); - } - - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand, ModelData extraData, - @Nullable RenderType renderType) { - return originalModel.get().getQuads(state, side, rand, extraData, renderType); - } - - @Override - public ModelData getModelData(BlockAndTintGetter level, BlockPos pos, BlockState state, ModelData modelData) { - return originalModel.get().getModelData(level, pos, state, modelData); - } - - @Override - public ChunkRenderTypeSet getRenderTypes(BlockState state, RandomSource rand, ModelData data) { - return originalModel.get().getRenderTypes(state, rand, data); - } - - @Override - public List getRenderTypes(ItemStack itemStack, boolean fabulous) { - return originalModel.get().getRenderTypes(itemStack, fabulous); - } - - @Override - public List getRenderPasses(ItemStack itemStack, boolean fabulous) { - return originalModel.get().getRenderPasses(itemStack, fabulous); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/CasingModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/CasingModel.java new file mode 100644 index 000000000..7a210c522 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/CasingModel.java @@ -0,0 +1,22 @@ +package aztech.modern_industrialization.client.machines.models; + +import com.mojang.serialization.Codec; +import net.minecraft.client.renderer.block.model.BlockStateModel; +import net.minecraft.client.resources.model.ModelBaker; +import net.minecraft.client.resources.model.ResolvableModel; + +public record CasingModel(BlockStateModel model) { + public record Unbaked(BlockStateModel.Unbaked unbaked) implements ResolvableModel { + public static final Codec CODEC = BlockStateModel.Unbaked.CODEC + .xmap(Unbaked::new, Unbaked::unbaked); + + public CasingModel bake(ModelBaker modelBakery) { + return new CasingModel(unbaked.bake(modelBakery)); + } + + @Override + public void resolveDependencies(Resolver resolver) { + unbaked.resolveDependencies(resolver); + } + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/CasingModels.java b/src/client/java/aztech/modern_industrialization/client/machines/models/CasingModels.java new file mode 100644 index 000000000..23ebf7c48 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/CasingModels.java @@ -0,0 +1,121 @@ +package aztech.modern_industrialization.client.machines.models; + +import aztech.modern_industrialization.machines.models.MachineCasing; +import aztech.modern_industrialization.machines.models.MachineCasings; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; +import com.mojang.logging.LogUtils; +import com.mojang.serialization.JsonOps; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BlockModelDefinition; +import net.minecraft.client.renderer.block.model.BlockStateModel; +import net.minecraft.client.resources.model.BlockStateDefinitions; +import net.minecraft.client.resources.model.BlockStateModelLoader; +import net.minecraft.client.resources.model.ModelBaker; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.FileToIdConverter; +import net.minecraft.resources.Identifier; +import net.minecraft.server.packs.resources.Resource; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.util.StrictJsonParser; +import net.minecraft.util.Util; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.neoforged.fml.ModWorkManager; +import net.neoforged.neoforge.client.event.ModelEvent; +import net.neoforged.neoforge.client.model.standalone.StandaloneModelKey; +import net.neoforged.neoforge.client.model.standalone.UnbakedStandaloneModel; +import org.jspecify.annotations.Nullable; +import org.slf4j.Logger; + +import java.io.Reader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import java.util.function.Function; + +public class CasingModels { + private static final Logger LOGGER = LogUtils.getLogger(); + + public static final String FOLDER_NAME = "modern_industrialization/machine_casings"; + private static final FileToIdConverter CASINGS_LISTER = FileToIdConverter.json(FOLDER_NAME); + + private record LoadedModels(Map models) {} + + private static CompletableFuture loadModels(ResourceManager manager, Executor executor) { + return CompletableFuture.supplyAsync(() -> CASINGS_LISTER.listMatchingResources(manager), executor) + .thenCompose( + resources -> { + List>> result = new ArrayList<>(resources.size()); + + for (var resourceEntry : resources.entrySet()) { + result.add(CompletableFuture.>supplyAsync( + () -> { + Identifier casingId = CASINGS_LISTER.fileToId(resourceEntry.getKey()); + var casing = MachineCasings.getOrNull(casingId); + if (casing == null) { + LOGGER.debug("Discovered unknown machine casing definition {}, ignoring", casingId); + return null; + } + + try (var reader = resourceEntry.getValue().openAsReader()) { + JsonElement element = StrictJsonParser.parse(reader); + return Map.entry( + casing, + CasingModel.Unbaked.CODEC.parse(JsonOps.INSTANCE, element).getOrThrow(JsonParseException::new)); + } catch (Exception exception) { + LOGGER.error( + "Failed to load machine casing model {} from pack {}", casingId, resourceEntry.getValue().sourcePackId(), exception); + return null; + } + }, + executor) + ); + } + + return Util.sequence(result).thenApply(entries -> { + //noinspection unchecked + return new LoadedModels(Map.ofEntries(entries.toArray(Map.Entry[]::new))); + }); + }); + } + + private static final StandaloneModelKey> KEY = new StandaloneModelKey<>(() -> "casing models"); + + public static void loadModels(ModelEvent.RegisterStandalone event) { + var resourceManager = Minecraft.getInstance().getResourceManager(); + // TODO: this should be made to use the executor of the reload... + var executor = ModWorkManager.parallelExecutor(); + + LoadedModels loadedModels = loadModels(resourceManager, executor).join(); + + event.register(KEY, new UnbakedStandaloneModel<>() { + @Override + public Map bake(ModelBaker baker) { + Map bakedModels = new HashMap<>(); + for (var entry : loadedModels.models.entrySet()) { + bakedModels.put(entry.getKey(), entry.getValue().bake(baker)); + } + return bakedModels; + } + + @Override + public void resolveDependencies(Resolver resolver) { + for (var model : loadedModels.models.values()) { + model.resolveDependencies(resolver); + } + } + }); + } + + public static CasingModel getCasingModel(MachineCasing casing) { + var models = Objects.requireNonNull(Minecraft.getInstance().getModelManager().getStandaloneModel(KEY), "casing models"); + return Objects.requireNonNull(models.get(casing), "casing model"); + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/MachineBakedModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineBakedModel.java deleted file mode 100644 index 0bc86bca8..000000000 --- a/src/client/java/aztech/modern_industrialization/client/machines/models/MachineBakedModel.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.machines.models; - -import aztech.modern_industrialization.client.util.ModelHelper; -import aztech.modern_industrialization.machines.models.MachineCasing; -import aztech.modern_industrialization.machines.models.MachineModelClientData; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.ChunkRenderTypeSet; -import net.neoforged.neoforge.client.model.IDynamicBakedModel; -import net.neoforged.neoforge.client.model.data.ModelData; -import net.neoforged.neoforge.client.model.pipeline.QuadBakingVertexConsumer; -import org.jspecify.annotations.Nullable; - -public class MachineBakedModel implements IDynamicBakedModel { - public static float Z_OFFSET = 5e-4f; // Cannot be lower due to Embeddium compact vertex format - - private static final ChunkRenderTypeSet CUTOUT_MIPPED = ChunkRenderTypeSet.of(RenderType.cutoutMipped()); - - public static final String CASING_FOLDER = "machine_casing"; - - public static ModelResourceLocation getCasingModelId(MachineCasing casing) { - return ModelResourceLocation.standalone(casing.key.withPath(p -> CASING_FOLDER + "/" + p)); - } - - public static BakedModel getCasingModel(MachineCasing casing) { - return Minecraft.getInstance().getModelManager().getModel(getCasingModelId(casing)); - } - - private final MachineCasing baseCasing; - private final @Nullable TextureAtlasSprite[] defaultOverlays; - private final Map tieredOverlays; - private final boolean noOverlayOnOutputSide; - private final MachineModelClientData defaultData; - - MachineBakedModel(MachineCasing baseCasing, - @Nullable TextureAtlasSprite[] defaultOverlays, - Map tieredOverlays, - boolean noOverlayOnOutputSide) { - this.baseCasing = baseCasing; - this.defaultOverlays = defaultOverlays; - this.tieredOverlays = tieredOverlays; - this.noOverlayOnOutputSide = noOverlayOnOutputSide; - this.defaultData = new MachineModelClientData(baseCasing, Direction.NORTH); - } - - public MachineCasing getBaseCasing() { - return baseCasing; - } - - public @Nullable TextureAtlasSprite[] getSprites(@Nullable MachineCasing casing) { - if (casing == null) { - return defaultOverlays; - } - return tieredOverlays.getOrDefault(casing, defaultOverlays); - } - - /** - * Returns null if nothing should be rendered. - */ - @Nullable - public static TextureAtlasSprite getSprite(@Nullable TextureAtlasSprite[] sprites, Direction side, Direction facingDirection, boolean isActive) { - int spriteId; - if (side.getAxis().isHorizontal()) { - spriteId = (facingDirection.get2DDataValue() - side.get2DDataValue() + 4) % 4 * 2; - } else { - spriteId = (facingDirection.get2DDataValue() + 4) * 2; - - if (side == Direction.DOWN) { - spriteId += 8; - } - } - if (isActive) { - spriteId++; - } - return sprites[spriteId]; - } - - @Override - public ModelData getModelData(BlockAndTintGetter level, BlockPos pos, BlockState state, ModelData modelData) { - var machineData = modelData.get(MachineModelClientData.KEY); - if (machineData == null) { - return modelData; - } - - MachineCasing casing = Objects.requireNonNullElse(machineData.casing, baseCasing); - return getCasingModel(casing).getModelData(level, pos, state, modelData); - } - - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand, ModelData extraData, @Nullable RenderType renderType) { - var data = extraData.get(MachineModelClientData.KEY); - if (data == null) { - data = defaultData; - } - - MachineCasing casing = Objects.requireNonNullElse(data.casing, baseCasing); - var sprites = getSprites(casing); - - List quads = new ArrayList<>(); - var vc = new QuadBakingVertexConsumer(); - - if (side != null) { - // Casing - quads.addAll(getCasingModel(casing).getQuads(state, side, rand, extraData, renderType)); - // Machine overlays - if (!noOverlayOnOutputSide || side != data.outputDirection) { - // Draw the "front" texture on the north side if the machine has no facing - var facingDirection = Objects.requireNonNullElse(data.frontDirection, Direction.NORTH); - TextureAtlasSprite sprite = getSprite(sprites, side, facingDirection, false); - if (sprite != null) { - quads.add(ModelHelper.bakeSprite(vc, side, sprite, -Z_OFFSET)); - } - } - } - - // Output overlays - if (data.outputDirection != null && side == data.outputDirection) { - if (sprites[24] != null) { - quads.add(ModelHelper.bakeSprite(vc, data.outputDirection, sprites[24], -3 * Z_OFFSET)); - } - if (data.itemAutoExtract) { - quads.add(ModelHelper.bakeSprite(vc, data.outputDirection, sprites[25], -3 * Z_OFFSET)); - } - if (data.fluidAutoExtract) { - quads.add(ModelHelper.bakeSprite(vc, data.outputDirection, sprites[26], -3 * Z_OFFSET)); - } - } - - return quads; - } - - @Override - public boolean useAmbientOcclusion() { - return true; - } - - @Override - public boolean isGui3d() { - return false; - } - - @Override - public boolean usesBlockLight() { - return true; - } - - @Override - public boolean isCustomRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleIcon() { - return getCasingModel(baseCasing).getParticleIcon(); - } - - @Override - public ItemTransforms getTransforms() { - return ModelHelper.MODEL_TRANSFORM_BLOCK; - } - - @Override - public ItemOverrides getOverrides() { - return ItemOverrides.EMPTY; - } - - @Override - public ChunkRenderTypeSet getRenderTypes(BlockState state, RandomSource rand, ModelData data) { - return CUTOUT_MIPPED; - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/MachineBlockStateModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineBlockStateModel.java new file mode 100644 index 000000000..fa59c4d96 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineBlockStateModel.java @@ -0,0 +1,134 @@ +package aztech.modern_industrialization.client.machines.models; + +import aztech.modern_industrialization.client.util.ModelHelper; +import aztech.modern_industrialization.machines.models.MachineCasing; +import aztech.modern_industrialization.machines.models.MachineModelClientData; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.BlockModelPart; +import net.minecraft.client.renderer.block.model.BlockStateModel; +import net.minecraft.client.renderer.block.model.SimpleModelWrapper; +import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.QuadCollection; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.DynamicBlockStateModel; +import net.neoforged.neoforge.client.model.pipeline.QuadBakingVertexConsumer; +import net.neoforged.neoforge.client.model.standalone.StandaloneModelKey; +import org.jspecify.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +public class MachineBlockStateModel implements DynamicBlockStateModel { + public static float Z_OFFSET = 5e-4f; // Cannot be lower due to Embeddium compact vertex format + + private final MachineCasing baseCasing; + private final @Nullable TextureAtlasSprite[] defaultOverlays; + private final Map tieredOverlays; + private final boolean noOverlayOnOutputSide; + private final MachineModelClientData defaultData; + + MachineBlockStateModel(MachineCasing baseCasing, + @Nullable TextureAtlasSprite[] defaultOverlays, + Map tieredOverlays, + boolean noOverlayOnOutputSide) { + this.baseCasing = baseCasing; + this.defaultOverlays = defaultOverlays; + this.tieredOverlays = tieredOverlays; + this.noOverlayOnOutputSide = noOverlayOnOutputSide; + this.defaultData = new MachineModelClientData(baseCasing, Direction.NORTH); + } + + public MachineCasing getBaseCasing() { + return baseCasing; + } + + public @Nullable TextureAtlasSprite[] getSprites(@Nullable MachineCasing casing) { + if (casing == null) { + return defaultOverlays; + } + return tieredOverlays.getOrDefault(casing, defaultOverlays); + } + + /** + * Returns null if nothing should be rendered. + */ + @Nullable + public static TextureAtlasSprite getSprite(@Nullable TextureAtlasSprite[] sprites, Direction side, Direction facingDirection, boolean isActive) { + int spriteId; + if (side.getAxis().isHorizontal()) { + spriteId = (facingDirection.get2DDataValue() - side.get2DDataValue() + 4) % 4 * 2; + } else { + spriteId = (facingDirection.get2DDataValue() + 4) * 2; + + if (side == Direction.DOWN) { + spriteId += 8; + } + } + if (isActive) { + spriteId++; + } + return sprites[spriteId]; + } + + public QuadCollection assembleOverlayQuads(MachineModelClientData data) { + MachineCasing casing = Objects.requireNonNullElse(data.casing, baseCasing); + var sprites = getSprites(casing); + + QuadCollection.Builder quads = new QuadCollection.Builder(); + + // Machine overlays + for (var side : Direction.values()) { + if (!noOverlayOnOutputSide || side != data.outputDirection) { + // Draw the "front" texture on the north side if the machine has no facing + var facingDirection = Objects.requireNonNullElse(data.frontDirection, Direction.NORTH); + TextureAtlasSprite sprite = getSprite(sprites, side, facingDirection, false); + if (sprite != null) { + quads.addCulledFace(side, ModelHelper.bakeSprite(side, sprite, -Z_OFFSET)); + } + } + } + + // Output overlays + if (data.outputDirection != null) { + if (sprites[24] != null) { + quads.addCulledFace(data.outputDirection, ModelHelper.bakeSprite(data.outputDirection, sprites[24], -3 * Z_OFFSET)); + } + if (data.itemAutoExtract) { + quads.addCulledFace(data.outputDirection, ModelHelper.bakeSprite(data.outputDirection, sprites[25], -3 * Z_OFFSET)); + } + if (data.fluidAutoExtract) { + quads.addCulledFace(data.outputDirection, ModelHelper.bakeSprite(data.outputDirection, sprites[26], -3 * Z_OFFSET)); + } + } + + return quads.build(); + } + + @Override + public void collectParts(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, List parts) { + var data = level.getModelData(pos).get(MachineModelClientData.KEY); + if (data == null) { + data = defaultData; + } + + var casing = Objects.requireNonNullElse(data.casing, baseCasing); + CasingModels.getCasingModel(casing).model().collectParts(level, pos, state, random, parts); + + var overlayQuads = assembleOverlayQuads(data); + parts.add(new SimpleModelWrapper(overlayQuads, true, particleIcon(), ChunkSectionLayer.CUTOUT)); + } + + @Override + public TextureAtlasSprite particleIcon() { + return CasingModels.getCasingModel(baseCasing).model().particleIcon(); + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/MachineItemModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineItemModel.java new file mode 100644 index 000000000..d35dfcbb3 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineItemModel.java @@ -0,0 +1,75 @@ +package aztech.modern_industrialization.client.machines.models; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.client.util.ModelHelper; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.Sheets; +import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.client.renderer.item.BlockModelWrapper; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.Identifier; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.ItemOwner; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.EmptyBlockAndTintGetter; +import net.minecraft.world.level.block.Block; +import org.jspecify.annotations.Nullable; + +public record MachineItemModel(ItemTransforms transforms, Block machine) implements ItemModel { + @Override + public void update(ItemStackRenderState output, ItemStack item, ItemModelResolver resolver, ItemDisplayContext displayContext, @Nullable ClientLevel level, @Nullable ItemOwner owner, int seed) { + output.appendModelIdentityElement(machine); + + // A bit dirty... + var machineModel = Minecraft.getInstance().getModelManager().getBlockModelShaper().getBlockModel(machine.defaultBlockState()); + + var layer = output.newLayer(); + layer.setUsesBlockLight(true); + layer.setParticleIcon(machineModel.particleIcon()); + layer.setTransform(transforms.getTransform(displayContext)); + + var parts = machineModel.collectParts(EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, machine.defaultBlockState(), RandomSource.create(seed)); + for (var part : parts) { + for (var direction : ModelHelper.DIRECTIONS_WITH_NULL) { + layer.prepareQuadList().addAll(part.getQuads(direction)); + } + } + layer.setRenderType(Sheets.cutoutBlockSheet()); + } + + public record Unbaked(Block machine) implements ItemModel.Unbaked { + public static final Identifier TYPE_ID = MI.id("machine"); + + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(i -> + i.group( + BuiltInRegistries.BLOCK.byNameCodec().fieldOf("machine").forGetter(Unbaked::machine)) + .apply(i, Unbaked::new)); + + private static final Identifier BLOCK_BLOCK = Identifier.withDefaultNamespace("block/block"); + + @Override + public MapCodec type() { + return CODEC; + } + + @Override + public ItemModel bake(BakingContext context) { + return new MachineItemModel( + context.blockModelBaker().getModel(BLOCK_BLOCK).getTopTransforms(), + machine); + } + + @Override + public void resolveDependencies(Resolver resolver) { + resolver.markDependency(BLOCK_BLOCK); + } + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/MachineUnbakedModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineUnbakedModel.java index 15f592b31..98cfd316b 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/models/MachineUnbakedModel.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/MachineUnbakedModel.java @@ -26,176 +26,115 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.machines.models.MachineCasing; -import aztech.modern_industrialization.machines.models.MachineCasings; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; import java.util.HashMap; import java.util.Map; -import java.util.function.Function; -import net.minecraft.client.renderer.block.model.ItemOverrides; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.client.renderer.block.model.BlockStateModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.Material; import net.minecraft.client.resources.model.ModelBaker; -import net.minecraft.client.resources.model.ModelState; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.inventory.InventoryMenu; -import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; -import net.neoforged.neoforge.client.model.geometry.IGeometryLoader; -import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; +import net.minecraft.client.resources.model.SpriteGetter; +import net.minecraft.resources.Identifier; +import net.neoforged.neoforge.client.ClientHooks; +import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel; import org.jspecify.annotations.Nullable; -public class MachineUnbakedModel implements IUnbakedGeometry { - public static final ResourceLocation LOADER_ID = MI.id("machine"); - public static final IGeometryLoader LOADER = (jsonObject, deserializationContext) -> { - return new MachineUnbakedModel(jsonObject); - }; +import static aztech.modern_industrialization.client.machines.models.OverlayName.*; - private static final Gson GSON = new GsonBuilder().registerTypeAdapter(ResourceLocation.class, new ResourceLocation.Serializer()).create(); +public record MachineUnbakedModel( + MachineCasing baseCasing, + Map defaultOverlays, + Map> tieredOverlays, + boolean noOverlayOnOutputSide) implements CustomUnbakedBlockStateModel { + public static final Identifier LOADER_ID = MI.id("machine"); - private final MachineCasing baseCasing; - private final @Nullable Material[] defaultOverlays; - private final Map tieredOverlays = new HashMap<>(); - private final boolean noOverlayOnOutputSide; + private static final Codec> OVERLAYS_CODEC = Codec.unboundedMap(OverlayName.CODEC, Identifier.CODEC); + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(i -> + i.group( + MachineCasing.CODEC.fieldOf("casing").forGetter(MachineUnbakedModel::baseCasing), + OVERLAYS_CODEC.fieldOf("default_overlays").forGetter(MachineUnbakedModel::defaultOverlays), + Codec.unboundedMap(MachineCasing.CODEC, OVERLAYS_CODEC).fieldOf("tiered_overlays").forGetter(MachineUnbakedModel::tieredOverlays), + Codec.BOOL.fieldOf("no_overlay_on_output_side").forGetter(MachineUnbakedModel::noOverlayOnOutputSide)) + .apply(i, MachineUnbakedModel::new)); - private MachineUnbakedModel(JsonObject obj) { - this.baseCasing = MachineCasings.get(GsonHelper.getAsString(obj, "casing")); - - var defaultOverlaysJson = OverlaysJson.parse(GsonHelper.getAsJsonObject(obj, "default_overlays"), null); - this.defaultOverlays = defaultOverlaysJson.toSpriteIds(); - - var tieredOverlays = GsonHelper.getAsJsonObject(obj, "tiered_overlays", new JsonObject()); - for (var casingTier : tieredOverlays.keySet()) { - var casingOverlaysJson = OverlaysJson.parse(GsonHelper.getAsJsonObject(tieredOverlays, casingTier), defaultOverlaysJson); - this.tieredOverlays.put(MachineCasings.get(casingTier), casingOverlaysJson.toSpriteIds()); - } - - this.noOverlayOnOutputSide = GsonHelper.getAsBoolean(obj, "no_overlay_on_output_side", false); + @Override + public MapCodec codec() { + return CODEC; } @Override - public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function spriteGetter, - ModelState modelState, ItemOverrides overrides) { - var defaultOverlays = loadSprites(spriteGetter, this.defaultOverlays); + public BlockStateModel bake(ModelBaker modelBakery) { + var defaultOverlays = loadSprites(modelBakery.sprites(), this.defaultOverlays); var tieredOverlays = new HashMap(); for (var entry : this.tieredOverlays.entrySet()) { - tieredOverlays.put(entry.getKey(), loadSprites(spriteGetter, entry.getValue())); + tieredOverlays.put(entry.getKey(), loadSprites(modelBakery.sprites(), entry.getValue())); } - return new MachineBakedModel(baseCasing, defaultOverlays, tieredOverlays, noOverlayOnOutputSide); + return new MachineBlockStateModel(baseCasing, defaultOverlays, tieredOverlays, noOverlayOnOutputSide); } - private static @Nullable TextureAtlasSprite[] loadSprites(Function textureGetter, @Nullable Material[] ids) { - var sprites = new TextureAtlasSprite[ids.length]; - for (int i = 0; i < ids.length; ++i) { - if (ids[i] != null) { - sprites[i] = textureGetter.apply(ids[i]); + @Override + public void resolveDependencies(Resolver resolver) {} + + private static @Nullable TextureAtlasSprite[] loadSprites(SpriteGetter spriteGetter, Map overlays) { + var selectedMaterials = new OverlaySelector(overlays).toMaterials(); + var sprites = new TextureAtlasSprite[selectedMaterials.length]; + for (int i = 0; i < selectedMaterials.length; ++i) { + if (selectedMaterials[i] != null) { + sprites[i] = spriteGetter.get(selectedMaterials[i], () -> "machine unbaked model"); } } return sprites; } - private static class OverlaysJson { - // All fields are nullable. - private @Nullable ResourceLocation top; - private @Nullable ResourceLocation top_active; - private @Nullable ResourceLocation side; - private @Nullable ResourceLocation side_active; - private @Nullable ResourceLocation bottom; - private @Nullable ResourceLocation bottom_active; - private @Nullable ResourceLocation front; - private @Nullable ResourceLocation front_active; - private @Nullable ResourceLocation left; - private @Nullable ResourceLocation left_active; - private @Nullable ResourceLocation right; - private @Nullable ResourceLocation right_active; - private @Nullable ResourceLocation back; - private @Nullable ResourceLocation back_active; - private @Nullable ResourceLocation top_s; - private @Nullable ResourceLocation top_s_active; - private @Nullable ResourceLocation top_w; - private @Nullable ResourceLocation top_w_active; - private @Nullable ResourceLocation top_n; - private @Nullable ResourceLocation top_n_active; - private @Nullable ResourceLocation top_e; - private @Nullable ResourceLocation top_e_active; - private @Nullable ResourceLocation bottom_s; - private @Nullable ResourceLocation bottom_s_active; - private @Nullable ResourceLocation bottom_w; - private @Nullable ResourceLocation bottom_w_active; - private @Nullable ResourceLocation bottom_n; - private @Nullable ResourceLocation bottom_n_active; - private @Nullable ResourceLocation bottom_e; - private @Nullable ResourceLocation bottom_e_active; - private @Nullable ResourceLocation output; - private @Nullable ResourceLocation item_auto; - private @Nullable ResourceLocation fluid_auto; - - private static OverlaysJson parse(JsonObject json, @Nullable OverlaysJson defaultOverlay) { - var overlays = GSON.fromJson(json, OverlaysJson.class); - - if (defaultOverlay != null) { - // Copy null fields from the default. - try { - for (var field : OverlaysJson.class.getDeclaredFields()) { - if (field.get(overlays) == null) { - field.set(overlays, field.get(defaultOverlay)); - } - } - } catch (IllegalAccessException ex) { - throw new RuntimeException("Failed to copy fields from default overlay", ex); - } - } - - return overlays; - } - + private record OverlaySelector(Map overlays) { /** * Order is as follows: * Active and inactive: front, left, back, right, top S/W/N/E, bottom S/W/N/E, * output, item auto, fluid auto */ - private @Nullable Material[] toSpriteIds() { + private @Nullable Material[] toMaterials() { return new @Nullable Material[] { - select(front, side), - select(front_active, front, side_active, side), - select(left, side), - select(left_active, left, side_active, side), - select(back, side), - select(back_active, back, side_active, side), - select(right, side), - select(right_active, right, side_active, side), - select(top_s, top), - select(top_s_active, top_s, top_active, top), - select(top_w, top), - select(top_w_active, top_w, top_active, top), - select(top_n, top), - select(top_n_active, top_n, top_active, top), - select(top_e, top), - select(top_e_active, top_e, top_active, top), - select(bottom_s, bottom), - select(bottom_s_active, bottom_s, bottom_active, bottom), - select(bottom_w, bottom), - select(bottom_w_active, bottom_w, bottom_active, bottom), - select(bottom_n, bottom), - select(bottom_n_active, bottom_n, bottom_active, bottom), - select(bottom_e, bottom), - select(bottom_e_active, bottom_e, bottom_active, bottom), - select(output), - select(item_auto), - select(fluid_auto), + select(FRONT, SIDE), + select(FRONT_ACTIVE, FRONT, SIDE_ACTIVE, SIDE), + select(LEFT, SIDE), + select(LEFT_ACTIVE, LEFT, SIDE_ACTIVE, SIDE), + select(BACK, SIDE), + select(BACK_ACTIVE, BACK, SIDE_ACTIVE, SIDE), + select(RIGHT, SIDE), + select(RIGHT_ACTIVE, RIGHT, SIDE_ACTIVE, SIDE), + select(TOP_S, TOP), + select(TOP_S_ACTIVE, TOP_S, TOP_ACTIVE, TOP), + select(TOP_W, TOP), + select(TOP_W_ACTIVE, TOP_W, TOP_ACTIVE, TOP), + select(TOP_N, TOP), + select(TOP_N_ACTIVE, TOP_N, TOP_ACTIVE, TOP), + select(TOP_E, TOP), + select(TOP_E_ACTIVE, TOP_E, TOP_ACTIVE, TOP), + select(BOTTOM_S, BOTTOM), + select(BOTTOM_S_ACTIVE, BOTTOM_S, BOTTOM_ACTIVE, BOTTOM), + select(BOTTOM_W, BOTTOM), + select(BOTTOM_W_ACTIVE, BOTTOM_W, BOTTOM_ACTIVE, BOTTOM), + select(BOTTOM_N, BOTTOM), + select(BOTTOM_N_ACTIVE, BOTTOM_N, BOTTOM_ACTIVE, BOTTOM), + select(BOTTOM_E, BOTTOM), + select(BOTTOM_E_ACTIVE, BOTTOM_E, BOTTOM_ACTIVE, BOTTOM), + select(OUTPUT), + select(ITEM_AUTO), + select(FLUID_AUTO), }; } /** - * Select first non-null id, and convert it to a sprite id. + * select first non-null overlay, and convert it to a sprite material. */ @Nullable - private static Material select(@Nullable ResourceLocation... candidates) { - for (var id : candidates) { + private Material select(OverlayName... candidates) { + for (var overlay : candidates) { + var id = overlays.get(overlay); if (id != null) { - return new Material(InventoryMenu.BLOCK_ATLAS, id); + return ClientHooks.getBlockMaterial(id); } } return null; diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/OverlayName.java b/src/client/java/aztech/modern_industrialization/client/machines/models/OverlayName.java new file mode 100644 index 000000000..320650e08 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/OverlayName.java @@ -0,0 +1,51 @@ +package aztech.modern_industrialization.client.machines.models; + +import com.mojang.serialization.Codec; +import net.minecraft.resources.Identifier; +import net.minecraft.util.StringRepresentable; +import org.jspecify.annotations.Nullable; + +import java.util.Locale; + +public enum OverlayName implements StringRepresentable { + TOP, + TOP_ACTIVE, + SIDE, + SIDE_ACTIVE, + BOTTOM, + BOTTOM_ACTIVE, + FRONT, + FRONT_ACTIVE, + LEFT, + LEFT_ACTIVE, + RIGHT, + RIGHT_ACTIVE, + BACK, + BACK_ACTIVE, + TOP_S, + TOP_S_ACTIVE, + TOP_W, + TOP_W_ACTIVE, + TOP_N, + TOP_N_ACTIVE, + TOP_E, + TOP_E_ACTIVE, + BOTTOM_S, + BOTTOM_S_ACTIVE, + BOTTOM_W, + BOTTOM_W_ACTIVE, + BOTTOM_N, + BOTTOM_N_ACTIVE, + BOTTOM_E, + BOTTOM_E_ACTIVE, + OUTPUT, + ITEM_AUTO, + FLUID_AUTO; + + public static final EnumCodec CODEC = StringRepresentable.fromEnum(OverlayName::values); + + @Override + public String getSerializedName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelBakedModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelBakedModel.java index ca6c828bb..0a3ef59d1 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelBakedModel.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelBakedModel.java @@ -24,19 +24,76 @@ package aztech.modern_industrialization.client.machines.models; +import java.util.List; import java.util.function.Supplier; -import net.minecraft.client.resources.model.BakedModel; + +import aztech.modern_industrialization.MI; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BlockModelPart; +import net.minecraft.client.renderer.block.model.BlockStateModel; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelBaker; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.Identifier; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.DynamicBlockStateModel; +import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel; +import net.neoforged.neoforge.common.util.Lazy; +import org.jspecify.annotations.Nullable; + +public record UseBlockModelBakedModel(BlockState targetState, + Supplier stateModel) implements DynamicBlockStateModel { + + // The rest just delegates to stateModel.get() + + @Override + public @Nullable Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) { + return stateModel.get().createGeometryKey(level, pos, state, random); + } + + @Override + public void collectParts(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, List parts) { + stateModel.get().collectParts(level, pos, state, random, parts); + } -public class UseBlockModelBakedModel extends BakedModelWrapper { - private final BlockState targetState; + @Override + public TextureAtlasSprite particleIcon(BlockAndTintGetter level, BlockPos pos, BlockState state) { + return stateModel.get().particleIcon(level, pos, state); + } - public UseBlockModelBakedModel(BlockState targetState, Supplier stateModel) { - super(stateModel); - this.targetState = targetState; + @Override + public TextureAtlasSprite particleIcon() { + return stateModel.get().particleIcon(); } - public BlockState getTargetState() { - return targetState; + public record Unbaked(Block block) implements CustomUnbakedBlockStateModel { + public static final Identifier TYPE_ID = MI.id("use_block_model"); + + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(i -> + i.group( + BuiltInRegistries.BLOCK.byNameCodec().fieldOf("block").forGetter(Unbaked::block) + ).apply(i, Unbaked::new)); + + @Override + public MapCodec codec() { + return CODEC; + } + + @Override + public BlockStateModel bake(ModelBaker modelBakery) { + var targetState = block.defaultBlockState(); + return new UseBlockModelBakedModel( + targetState, + Lazy.of(() -> Minecraft.getInstance().getModelManager().getBlockModelShaper().getBlockModel(targetState))); + } + + @Override + public void resolveDependencies(Resolver resolver) {} } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelUnbakedModel.java b/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelUnbakedModel.java deleted file mode 100644 index bcd75aa6c..000000000 --- a/src/client/java/aztech/modern_industrialization/client/machines/models/UseBlockModelUnbakedModel.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.machines.models; - -import aztech.modern_industrialization.MI; -import com.google.gson.JsonSyntaxException; -import java.util.function.Function; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.BlockModelShaper; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.ModelBaker; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.client.resources.model.ModelState; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; -import net.neoforged.neoforge.client.model.geometry.IGeometryLoader; -import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; -import net.neoforged.neoforge.common.util.Lazy; - -public class UseBlockModelUnbakedModel implements IUnbakedGeometry { - public static final ResourceLocation LOADER_ID = MI.id("use_block_model"); - public static final IGeometryLoader LOADER = (jsonObject, deserializationContext) -> { - - var blockId = GsonHelper.getAsString(jsonObject, "block"); - var block = BuiltInRegistries.BLOCK.getOptional(ResourceLocation.parse(blockId)) - .orElseThrow(() -> new JsonSyntaxException("Expected \"block\" to be a block, was unknown string " + blockId)); - - return new UseBlockModelUnbakedModel(block.defaultBlockState()); - }; - - private final BlockState targetState; - private final ModelResourceLocation delegate; - - private UseBlockModelUnbakedModel(BlockState targetState) { - this.targetState = targetState; - this.delegate = BlockModelShaper.stateToModelLocation(targetState); - } - - @Override - public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function spriteGetter, - ModelState modelState, ItemOverrides overrides) { - return new UseBlockModelBakedModel(targetState, Lazy.of(() -> Minecraft.getInstance().getModelManager().getModel(delegate))); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockErrorHighlight.java b/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockErrorHighlight.java index aa4e8e422..b48910694 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockErrorHighlight.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockErrorHighlight.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.core.BlockPos; @@ -52,38 +51,36 @@ public static void enqueueHighlight(BlockPos pos, @Nullable BlockState state) { highlightQueue.put(pos.immutable(), state); } - private static void end(RenderLevelStageEvent event) { - if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_LEVEL) { - return; - } - if (highlightQueue.size() > 0) { - RenderSystem.clear(256, Minecraft.ON_OSX); - var poseStack = event.getPoseStack(); - poseStack.pushPose(); - poseStack.mulPose(event.getModelViewMatrix()); - for (Map.Entry entry : highlightQueue.entrySet()) { - poseStack.pushPose(); - Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); - BlockPos pos = entry.getKey(); - double x = pos.getX() - cameraPos.x; - double y = pos.getY() - cameraPos.y; - double z = pos.getZ() - cameraPos.z; - poseStack.translate(x + 0.25, y + 0.25, z + 0.25); - poseStack.scale(0.5f, 0.5f, 0.5f); - - BlockState state = entry.getValue(); - if (state == null) { - RenderHelper.drawCube(poseStack, immediate, 1, 50f / 256, 50f / 256, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY); - } else { - Minecraft.getInstance().getBlockRenderer().renderSingleBlock(state, poseStack, immediate, LightTexture.FULL_BRIGHT, - OverlayTexture.NO_OVERLAY); - } - - poseStack.popPose(); - } - poseStack.popPose(); - immediate.endBatch(); - highlightQueue.clear(); - } + private static void end(RenderLevelStageEvent.AfterLevel event) { + // TODO 26.1 +// if (highlightQueue.size() > 0) { +// RenderSystem.clear(256, Minecraft.ON_OSX); +// var poseStack = event.getPoseStack(); +// poseStack.pushPose(); +// poseStack.mulPose(event.getModelViewMatrix()); +// for (Map.Entry entry : highlightQueue.entrySet()) { +// poseStack.pushPose(); +// Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); +// BlockPos pos = entry.getKey(); +// double x = pos.getX() - cameraPos.x; +// double y = pos.getY() - cameraPos.y; +// double z = pos.getZ() - cameraPos.z; +// poseStack.translate(x + 0.25, y + 0.25, z + 0.25); +// poseStack.scale(0.5f, 0.5f, 0.5f); +// +// BlockState state = entry.getValue(); +// if (state == null) { +// RenderHelper.drawCube(poseStack, immediate, 1, 50f / 256, 50f / 256, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY); +// } else { +// Minecraft.getInstance().getBlockRenderer().renderSingleBlock(state, poseStack, immediate, LightTexture.FULL_BRIGHT, +// OverlayTexture.NO_OVERLAY); +// } +// +// poseStack.popPose(); +// } +// poseStack.popPose(); +// immediate.endBatch(); +// highlightQueue.clear(); +// } } } diff --git a/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockMachineBER.java b/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockMachineBER.java index 8087f2dbe..8b4506e8d 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockMachineBER.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockMachineBER.java @@ -54,52 +54,53 @@ public MultiblockMachineBER(BlockEntityRendererProvider.Context ctx) { super(ctx); } - @Override - public void render(MultiblockMachineBlockEntity be, float tickDelta, PoseStack matrices, MultiBufferSource vcp, int light, int overlay) { - super.render(be, tickDelta, matrices, vcp, light, overlay); - - // Only render if holding a wrench AND if the shape is not valid. - boolean drawHighlights = isHoldingWrench() && !be.isShapeValid(); - HatchType hatchType = getHeldHatchType(); - if (drawHighlights || hatchType != null) { - ShapeMatcher matcher = be.createShapeMatcher(); - var player = Minecraft.getInstance().player; - - for (BlockPos pos : matcher.getPositions()) { - if (player != null && player.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()) > MAX_HIGHLIGHT_DISTANCE * MAX_HIGHLIGHT_DISTANCE) { - // Skip blocks that are far from the player to mitigate FPS drops. - continue; - } - - matrices.pushPose(); - matrices.translate(pos.getX() - be.getBlockPos().getX(), pos.getY() - be.getBlockPos().getY(), pos.getZ() - be.getBlockPos().getZ()); - - HatchFlags hatchFlag = matcher.getHatchFlags(pos); - if (hatchType != null) { - if (MIClientConfig.INSTANCE.hatchPlacementOverlay.getAsBoolean() && hatchFlag != null && hatchFlag.allows(hatchType)) { - // Highlight placeable hatches in green - matrices.translate(-0.005, -0.005, -0.005); - matrices.scale(1.01f, 1.01f, 1.01f); - RenderHelper.drawOverlay(matrices, vcp, overlay); - } - } - if (drawHighlights) { - if (!matcher.matches(pos, be.getLevel())) { - var existingState = be.getLevel().getBlockState(pos); - if (existingState.isAir() || /* approximate check for e.g. grass and snow */ existingState.canBeReplaced()) { - // Enqueue state preview - MultiblockErrorHighlight.enqueueHighlight(pos, matcher.getSimpleMember(pos).getPreviewState()); - } else { - // Enqueue red cube - MultiblockErrorHighlight.enqueueHighlight(pos, null); - } - } - } - - matrices.popPose(); - } - } - } + // TODO 26.1 +// @Override +// public void render(MultiblockMachineBlockEntity be, float tickDelta, PoseStack matrices, MultiBufferSource vcp, int light, int overlay) { +// super.render(be, tickDelta, matrices, vcp, light, overlay); +// +// // Only render if holding a wrench AND if the shape is not valid. +// boolean drawHighlights = isHoldingWrench() && !be.isShapeValid(); +// HatchType hatchType = getHeldHatchType(); +// if (drawHighlights || hatchType != null) { +// ShapeMatcher matcher = be.createShapeMatcher(); +// var player = Minecraft.getInstance().player; +// +// for (BlockPos pos : matcher.getPositions()) { +// if (player != null && player.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()) > MAX_HIGHLIGHT_DISTANCE * MAX_HIGHLIGHT_DISTANCE) { +// // Skip blocks that are far from the player to mitigate FPS drops. +// continue; +// } +// +// matrices.pushPose(); +// matrices.translate(pos.getX() - be.getBlockPos().getX(), pos.getY() - be.getBlockPos().getY(), pos.getZ() - be.getBlockPos().getZ()); +// +// HatchFlags hatchFlag = matcher.getHatchFlags(pos); +// if (hatchType != null) { +// if (MIClientConfig.INSTANCE.hatchPlacementOverlay.getAsBoolean() && hatchFlag != null && hatchFlag.allows(hatchType)) { +// // Highlight placeable hatches in green +// matrices.translate(-0.005, -0.005, -0.005); +// matrices.scale(1.01f, 1.01f, 1.01f); +// RenderHelper.drawOverlay(matrices, vcp, overlay); +// } +// } +// if (drawHighlights) { +// if (!matcher.matches(pos, be.getLevel())) { +// var existingState = be.getLevel().getBlockState(pos); +// if (existingState.isAir() || /* approximate check for e.g. grass and snow */ existingState.canBeReplaced()) { +// // Enqueue state preview +// MultiblockErrorHighlight.enqueueHighlight(pos, matcher.getSimpleMember(pos).getPreviewState()); +// } else { +// // Enqueue red cube +// MultiblockErrorHighlight.enqueueHighlight(pos, null); +// } +// } +// } +// +// matrices.popPose(); +// } +// } +// } private static boolean isHoldingWrench() { Player player = Minecraft.getInstance().player; @@ -130,10 +131,11 @@ private static HatchType getHatchType(ItemStack stack) { return null; } - @Override - public boolean shouldRenderOffScreen(MultiblockMachineBlockEntity pBlockEntity) { - return true; - } + // TODO 26.1 +// @Override +// public boolean shouldRenderOffScreen(MultiblockMachineBlockEntity pBlockEntity) { +// return true; +// } @Override public AABB getRenderBoundingBox(MultiblockMachineBlockEntity blockEntity) { diff --git a/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockTankBER.java b/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockTankBER.java index 54e37ad9b..3a4f19b40 100644 --- a/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockTankBER.java +++ b/src/client/java/aztech/modern_industrialization/client/machines/multiblocks/MultiblockTankBER.java @@ -24,17 +24,12 @@ package aztech.modern_industrialization.client.machines.multiblocks; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MutableQuadView; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadBuffer; -import aztech.modern_industrialization.client.thirdparty.fabrictransfer.FluidVariantRendering; import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.machines.blockentities.multiblocks.LargeTankMultiblockBlockEntity; import aztech.modern_industrialization.machines.multiblocks.MultiblockMachineBlockEntity; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -48,116 +43,117 @@ public MultiblockTankBER(BlockEntityRendererProvider.Context context) { super(context); } - @Override - public void render(MultiblockMachineBlockEntity be, float tickDelta, PoseStack ms, MultiBufferSource vcp, int light, int overlay) { - super.render(be, tickDelta, ms, vcp, light, overlay); - LargeTankMultiblockBlockEntity tankBlockEntity = (LargeTankMultiblockBlockEntity) be; - FluidVariant fluid = tankBlockEntity.getFluid(); - if (tankBlockEntity.shapeValid.shapeValid && !fluid.isBlank() && tankBlockEntity.getFullnessFraction() > 0) { - - VertexConsumer vc = vcp.getBuffer(RenderTypeHelper.getEntityRenderType(RenderType.translucent(), false)); - - TextureAtlasSprite sprite = FluidVariantRendering.getSprite(fluid); - - int[] cornerPosition = tankBlockEntity.getCornerPosition(); - - int maxX = cornerPosition[0]; - int totalMaxY = cornerPosition[1]; - int maxZ = cornerPosition[2]; - - int minX = cornerPosition[3]; - int totalMinY = cornerPosition[4]; - int minZ = cornerPosition[5]; - - float fullness = (float) tankBlockEntity.getFullnessFraction(); - // Top and bottom positions of the fluid inside the tank - float topHeight = fullness; - float bottomHeight = 0; - // Render gas from top to bottom - if (fluid.getFluid().getFluidType().isLighterThanAir()) { - topHeight = 1; - bottomHeight = 1 - fullness; - } - - int minY = (int) Math.floor(bottomHeight * (totalMaxY + 1 - totalMinY) + totalMinY); - int maxY = (int) Math.floor(topHeight * (totalMaxY + 1 - totalMinY) + totalMinY); - - int[] mins = new int[] { minX, minY, minZ }; - int[] maxs = new int[] { maxX, maxY, maxZ }; - Vec3i[] dirs = new Vec3i[] { Direction.EAST.getNormal(), Direction.UP.getNormal(), Direction.SOUTH.getNormal() }; - - var emitter = new QuadBuffer(); - - for (Direction direction : Direction.values()) { - emitter.clear(); - ms.pushPose(); - - int u_index = direction.getAxis() == Direction.Axis.X ? 2 : 0; - int v_index = direction.getAxis() == Direction.Axis.Y ? 2 : 1; - - Vec3i offset_u = dirs[u_index]; - Vec3i offset_v = dirs[v_index]; - - int dirAxis = direction.getAxis() == Direction.Axis.X ? 0 : direction.getAxis() == Direction.Axis.Z ? 2 : 1; - int dirWays = direction.get3DDataValue() % 2; - int offset_w = dirWays == 0 ? mins[dirAxis] : maxs[dirAxis]; - - Vec3i origin = offset_u.multiply(mins[u_index]).offset(offset_v.multiply(mins[v_index])).offset(dirs[dirAxis].multiply(offset_w)); - - float originX = origin.getX(); - float originY = origin.getY(); - float originZ = origin.getZ(); - - if (direction == Direction.UP) { - originY = (topHeight * (totalMaxY + 1 - totalMinY)) - 1; - } else if (direction == Direction.DOWN) { - originY = (bottomHeight * (totalMaxY + 1 - totalMinY)); - } - - ms.translate(originX, originY, originZ); - - int max_u = maxs[u_index] - mins[u_index]; - int max_v = maxs[v_index] - mins[v_index]; - - for (int u = 0; u <= max_u; u++) { - ms.pushPose(); - for (int v = 0; v <= max_v; v++) { - - float bottom = 0; - float top = 1; - - if (!direction.getAxis().isVertical()) { - if (v == 0) { - bottom = (bottomHeight * (totalMaxY + 1 - totalMinY)) % 1.0f; - } - if (v == max_v) { - top = (topHeight * (totalMaxY + 1 - totalMinY)) % 1.0f; - } - } - - emitter.square(direction, 0, bottom, 1, top, 0); - emitter.spriteBake(sprite, MutableQuadView.BAKE_LOCK_UV); - emitter.color(-1, -1, -1, -1); - - int color = FluidVariantRendering.getColor(fluid, be.getLevel(), - BlockPos.containing(be.getBlockPos().getX() + originX + offset_u.getX() * u + offset_v.getX() * v, - be.getBlockPos().getY() + originY + offset_u.getY() * u + offset_v.getY() * v, - be.getBlockPos().getZ() + originZ + offset_u.getZ() * u + offset_v.getZ() * v)); - float r = ((color >> 16) & 255) / 256f; - float g = ((color >> 8) & 255) / 256f; - float b = (color & 255) / 256f; - - vc.putBulkData(ms.last(), emitter.toBakedQuad(sprite), r, g, b, 1, RenderHelper.FULL_LIGHT, OverlayTexture.NO_OVERLAY); - - ms.translate(offset_v.getX(), offset_v.getY(), offset_v.getZ()); - } - ms.popPose(); - ms.translate(offset_u.getX(), offset_u.getY(), offset_u.getZ()); - } - - ms.popPose(); - } - - } - } + // TODO 26.1 +// @Override +// public void render(MultiblockMachineBlockEntity be, float tickDelta, PoseStack ms, MultiBufferSource vcp, int light, int overlay) { +// super.render(be, tickDelta, ms, vcp, light, overlay); +// LargeTankMultiblockBlockEntity tankBlockEntity = (LargeTankMultiblockBlockEntity) be; +// FluidVariant fluid = tankBlockEntity.getFluid(); +// if (tankBlockEntity.shapeValid.shapeValid && !fluid.isBlank() && tankBlockEntity.getFullnessFraction() > 0) { +// +// VertexConsumer vc = vcp.getBuffer(RenderTypeHelper.getEntityRenderType(RenderType.translucent(), false)); +// +// TextureAtlasSprite sprite = FluidVariantRendering.getSprite(fluid); +// +// int[] cornerPosition = tankBlockEntity.getCornerPosition(); +// +// int maxX = cornerPosition[0]; +// int totalMaxY = cornerPosition[1]; +// int maxZ = cornerPosition[2]; +// +// int minX = cornerPosition[3]; +// int totalMinY = cornerPosition[4]; +// int minZ = cornerPosition[5]; +// +// float fullness = (float) tankBlockEntity.getFullnessFraction(); +// // Top and bottom positions of the fluid inside the tank +// float topHeight = fullness; +// float bottomHeight = 0; +// // Render gas from top to bottom +// if (fluid.getFluid().getFluidType().isLighterThanAir()) { +// topHeight = 1; +// bottomHeight = 1 - fullness; +// } +// +// int minY = (int) Math.floor(bottomHeight * (totalMaxY + 1 - totalMinY) + totalMinY); +// int maxY = (int) Math.floor(topHeight * (totalMaxY + 1 - totalMinY) + totalMinY); +// +// int[] mins = new int[] { minX, minY, minZ }; +// int[] maxs = new int[] { maxX, maxY, maxZ }; +// Vec3i[] dirs = new Vec3i[] { Direction.EAST.getNormal(), Direction.UP.getNormal(), Direction.SOUTH.getNormal() }; +// +// var emitter = new QuadBuffer(); +// +// for (Direction direction : Direction.values()) { +// emitter.clear(); +// ms.pushPose(); +// +// int u_index = direction.getAxis() == Direction.Axis.X ? 2 : 0; +// int v_index = direction.getAxis() == Direction.Axis.Y ? 2 : 1; +// +// Vec3i offset_u = dirs[u_index]; +// Vec3i offset_v = dirs[v_index]; +// +// int dirAxis = direction.getAxis() == Direction.Axis.X ? 0 : direction.getAxis() == Direction.Axis.Z ? 2 : 1; +// int dirWays = direction.get3DDataValue() % 2; +// int offset_w = dirWays == 0 ? mins[dirAxis] : maxs[dirAxis]; +// +// Vec3i origin = offset_u.multiply(mins[u_index]).offset(offset_v.multiply(mins[v_index])).offset(dirs[dirAxis].multiply(offset_w)); +// +// float originX = origin.getX(); +// float originY = origin.getY(); +// float originZ = origin.getZ(); +// +// if (direction == Direction.UP) { +// originY = (topHeight * (totalMaxY + 1 - totalMinY)) - 1; +// } else if (direction == Direction.DOWN) { +// originY = (bottomHeight * (totalMaxY + 1 - totalMinY)); +// } +// +// ms.translate(originX, originY, originZ); +// +// int max_u = maxs[u_index] - mins[u_index]; +// int max_v = maxs[v_index] - mins[v_index]; +// +// for (int u = 0; u <= max_u; u++) { +// ms.pushPose(); +// for (int v = 0; v <= max_v; v++) { +// +// float bottom = 0; +// float top = 1; +// +// if (!direction.getAxis().isVertical()) { +// if (v == 0) { +// bottom = (bottomHeight * (totalMaxY + 1 - totalMinY)) % 1.0f; +// } +// if (v == max_v) { +// top = (topHeight * (totalMaxY + 1 - totalMinY)) % 1.0f; +// } +// } +// +// emitter.square(direction, 0, bottom, 1, top, 0); +// emitter.spriteBake(sprite, MutableQuadView.BAKE_LOCK_UV); +// emitter.color(-1, -1, -1, -1); +// +// int color = FluidVariantRendering.getColor(fluid, be.getLevel(), +// BlockPos.containing(be.getBlockPos().getX() + originX + offset_u.getX() * u + offset_v.getX() * v, +// be.getBlockPos().getY() + originY + offset_u.getY() * u + offset_v.getY() * v, +// be.getBlockPos().getZ() + originZ + offset_u.getZ() * u + offset_v.getZ() * v)); +// float r = ((color >> 16) & 255) / 256f; +// float g = ((color >> 8) & 255) / 256f; +// float b = (color & 255) / 256f; +// +// vc.putBulkData(ms.last(), emitter.toBakedQuad(sprite), r, g, b, 1, RenderHelper.FULL_LIGHT, OverlayTexture.NO_OVERLAY); +// +// ms.translate(offset_v.getX(), offset_v.getY(), offset_v.getZ()); +// } +// ms.popPose(); +// ms.translate(offset_u.getX(), offset_u.getY(), offset_u.getZ()); +// } +// +// ms.popPose(); +// } +// +// } +// } } diff --git a/src/client/java/aztech/modern_industrialization/client/misc/VersionEvents.java b/src/client/java/aztech/modern_industrialization/client/misc/VersionEvents.java index 58d79eb2e..3b5abebaa 100644 --- a/src/client/java/aztech/modern_industrialization/client/misc/VersionEvents.java +++ b/src/client/java/aztech/modern_industrialization/client/misc/VersionEvents.java @@ -42,6 +42,7 @@ import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.HoverEvent; import net.minecraft.network.chat.Style; +import net.minecraft.util.Util; import net.neoforged.fml.ModContainer; import net.neoforged.fml.ModList; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; @@ -122,9 +123,11 @@ public static void startVersionCheck(ModContainer miContainer, LocalPlayer playe if (latestArtifactVersion.compareTo(currentVersion) > 0) { String url = latestVersion.url; - Style styleClick = Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url)) - .applyFormat(ChatFormatting.UNDERLINE).applyFormat(ChatFormatting.GREEN).withHoverEvent(new HoverEvent( - HoverEvent.Action.SHOW_TEXT, MIText.ClickUrl.text())); + Style styleClick = Style.EMPTY.withClickEvent( + new ClickEvent.OpenUrl(Util.parseAndValidateUntrustedUri(url))) + .applyFormat(ChatFormatting.UNDERLINE) + .applyFormat(ChatFormatting.GREEN) + .withHoverEvent(new HoverEvent.ShowText(MIText.ClickUrl.text())); Minecraft.getInstance().execute(() -> { if (Minecraft.getInstance().player == player) { diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/MIPipesClient.java b/src/client/java/aztech/modern_industrialization/client/pipes/MIPipesClient.java index d3b9538e7..744dc79c2 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/MIPipesClient.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/MIPipesClient.java @@ -44,16 +44,17 @@ import java.util.function.Function; import java.util.stream.Collectors; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.Material; +import net.minecraft.client.resources.model.ModelBaker; +import net.minecraft.data.AtlasIds; import net.minecraft.world.InteractionHand; import net.minecraft.world.inventory.InventoryMenu; import net.minecraft.world.phys.Vec3; import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.client.ClientHooks; import net.neoforged.neoforge.client.event.InputEvent; import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; -import net.neoforged.neoforge.client.event.RenderHighlightEvent; import net.neoforged.neoforge.common.NeoForge; public class MIPipesClient { @@ -63,24 +64,25 @@ public static void setupClient(IEventBus modBus) { }); registerRenderers(); - NeoForge.EVENT_BUS.addListener(RenderHighlightEvent.Block.class, event -> { - var level = Minecraft.getInstance().level; - var pos = event.getTarget().getBlockPos(); - - if (level.getBlockEntity(pos) instanceof PipeBlockEntity pipe && !pipe.hasCamouflage()) { - var shape = PipeBlock.getHitPart(level, pos, event.getTarget()); - - if (shape != null) { - Vec3 camPos = event.getCamera().getPosition(); - RenderHelper.renderVoxelShape(event.getPoseStack(), event.getMultiBufferSource().getBuffer(RenderType.lines()), shape.shape, - pos.getX() - camPos.x(), - pos.getY() - camPos.y(), - pos.getZ() - camPos.z(), - 0, 0, 0, 0.4f); - event.setCanceled(true); - } - } - }); + // TODO 26.1 +// NeoForge.EVENT_BUS.addListener(RenderHighlightEvent.Block.class, event -> { +// var level = Minecraft.getInstance().level; +// var pos = event.getTarget().getBlockPos(); +// +// if (level.getBlockEntity(pos) instanceof PipeBlockEntity pipe && !pipe.hasCamouflage()) { +// var shape = PipeBlock.getHitPart(level, pos, event.getTarget()); +// +// if (shape != null) { +// Vec3 camPos = event.getCamera().getPosition(); +// RenderHelper.renderVoxelShape(event.getPoseStack(), event.getMultiBufferSource().getBuffer(RenderType.lines()), shape.shape, +// pos.getX() - camPos.x(), +// pos.getY() - camPos.y(), +// pos.getZ() - camPos.z(), +// 0, 0, 0, 0.4f); +// event.setCanceled(true); +// } +// } +// }); NeoForge.EVENT_BUS.addListener(InputEvent.MouseScrollingEvent.class, event -> { var player = Objects.requireNonNull(Minecraft.getInstance().player); @@ -99,19 +101,11 @@ public static void setupClient(IEventBus modBus) { private static PipeRenderer.Factory makeRenderer(List sprites, boolean innerQuads) { return new PipeRenderer.Factory() { @Override - public Collection getSpriteDependencies() { - return sprites.stream().map( - n -> new Material(InventoryMenu.BLOCK_ATLAS, MI.id("block/pipes/" + n))) - .collect(Collectors.toList()); - } - - @Override - public PipeRenderer create(Function textureGetter) { + public PipeRenderer create(ModelBaker modelBaker) { Material[] ids = sprites.stream() - .map(n -> new Material(InventoryMenu.BLOCK_ATLAS, - MI.id("block/pipes/" + n))) + .map(n -> ClientHooks.getBlockMaterial(MI.id("block/pipes/" + n))) .toArray(Material[]::new); - return new PipeMeshCache(textureGetter, ids, innerQuads); + return new PipeMeshCache(modelBaker.sprites(), ids, innerQuads); } }; } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/api/PipeRenderer.java b/src/client/java/aztech/modern_industrialization/client/pipes/api/PipeRenderer.java index 5575a2999..b151590e6 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/api/PipeRenderer.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/api/PipeRenderer.java @@ -24,13 +24,13 @@ package aztech.modern_industrialization.client.pipes.api; -import aztech.modern_industrialization.client.pipes.impl.PipeRenderContext; import aztech.modern_industrialization.pipes.api.PipeEndpointType; import aztech.modern_industrialization.pipes.api.PipeNetworkType; -import java.util.Collection; -import java.util.function.Function; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.Material; + +import java.util.function.Consumer; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.resources.model.ModelBaker; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockAndTintGetter; import org.jspecify.annotations.Nullable; @@ -47,18 +47,19 @@ static PipeRenderer.Factory get(PipeNetworkType type) { /** * Draw the connections for a logical slot. * - * @param ctx Render context. * @param logicalSlot The logical slot, so 0 for center, 1 for lower and 2 for * upper. * @param connections For every logical slot, then for every direction, the * connection type or null for no connection. */ - void draw(@Nullable BlockAndTintGetter view, @Nullable BlockPos pos, PipeRenderContext ctx, int logicalSlot, PipeEndpointType[][] connections, - @Nullable Object customData); + void draw( + Consumer cutoutQuads, Consumer translucentQuads, + @Nullable BlockAndTintGetter view, @Nullable BlockPos pos, + int logicalSlot, PipeEndpointType[][] connections, + int color, @Nullable Object customData); + @FunctionalInterface interface Factory { - Collection getSpriteDependencies(); - - PipeRenderer create(Function textureGetter); + PipeRenderer create(ModelBaker modelBaker); } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/fluid/FluidPipeScreen.java b/src/client/java/aztech/modern_industrialization/client/pipes/fluid/FluidPipeScreen.java index 176346966..a96ea9755 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/fluid/FluidPipeScreen.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/fluid/FluidPipeScreen.java @@ -34,23 +34,26 @@ import aztech.modern_industrialization.network.pipes.SetNetworkFluidPacket; import aztech.modern_industrialization.pipes.fluid.FluidPipeInterface; import aztech.modern_industrialization.pipes.fluid.FluidPipeScreenHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.*; -import com.mojang.blaze3d.systems.RenderSystem; + import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; + +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.player.Inventory; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidUtil; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; public class FluidPipeScreen extends PipeScreen { - private static final ResourceLocation TEXTURE = MI.id("textures/gui/pipe/fluid.png"); + private static final Identifier TEXTURE = MI.id("textures/gui/pipe/fluid.png"); public FluidPipeScreen(FluidPipeScreenHandler handler, Inventory inventory, Component title) { super(handler, inventory, title, FluidPipeScreenHandler.HEIGHT); @@ -76,7 +79,7 @@ protected void init() { } @Override - protected ResourceLocation getBackgroundTexture() { + protected Identifier getBackgroundTexture() { return TEXTURE; } @@ -85,7 +88,7 @@ private void addNetworkFluidButton() { new NetworkFluidButton(72 + this.leftPos, 20 + this.topPos, widget -> updateNetworkFluid(), () -> { List lines = new ArrayList<>(); lines.add(FluidHelper.getFluidName(menu.iface.getNetworkFluid(), false)); - if (!menu.iface.getNetworkFluid().isBlank()) { + if (!menu.iface.getNetworkFluid().isEmpty()) { lines.add(MIText.NetworkFluidHelpClear.text().setStyle(TextHelper.GRAY_TEXT)); } else { lines.add(MIText.NetworkFluidHelpSet.text().setStyle(TextHelper.GRAY_TEXT)); @@ -96,22 +99,22 @@ private void addNetworkFluidButton() { private void updateNetworkFluid() { FluidPipeInterface iface = menu.iface; - FluidVariant targetFluid = null; - if (iface.getNetworkFluid().isBlank()) { + FluidResource targetFluid = null; + if (iface.getNetworkFluid().isEmpty()) { // Want to set the fluid - FluidVariant fluid = FluidVariant.of(FluidUtil.getFluidContained(menu.getCarried()).orElse(FluidStack.EMPTY)); - if (!fluid.isBlank()) { + FluidResource fluid = FluidResource.of(FluidUtil.getFluidContained(menu.getCarried()).orElse(FluidStack.EMPTY)); + if (!fluid.isEmpty()) { targetFluid = fluid; } - } else if (hasShiftDown()) { - targetFluid = FluidVariant.blank(); + } else if (Minecraft.getInstance().hasShiftDown()) { + targetFluid = FluidResource.EMPTY; } if (targetFluid != null) { setNetworkFluid(targetFluid); } } - private void setNetworkFluid(FluidVariant fluidKey) { + private void setNetworkFluid(FluidResource fluidKey) { menu.iface.setNetworkFluid(fluidKey); new SetNetworkFluidPacket(menu.containerId, fluidKey).sendToServer(); } @@ -133,33 +136,34 @@ public Component getMessage() { } @Override - public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { + public void renderContents(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { // Render fluid slot - guiGraphics.blit(MachineScreen.SLOT_ATLAS, getX() - 1, getY() - 1, 18, 0, 18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, getX() - 1, getY() - 1, 18, 0, 18, 18, 256, 256); // Render the fluid itself - if (!iface.getNetworkFluid().isBlank()) { + if (!iface.getNetworkFluid().isEmpty()) { RenderHelper.drawFluidInGui(guiGraphics, iface.getNetworkFluid(), getX(), getY()); } // Render the white hover effect if (isHoveredOrFocused()) { - RenderSystem.disableDepthTest(); - RenderSystem.colorMask(true, true, true, false); + // TODO 26.1 +// RenderSystem.disableDepthTest(); +// RenderSystem.colorMask(true, true, true, false); guiGraphics.fillGradient(getX(), getY(), getX() + 16, getY() + 16, -2130706433, -2130706433); - RenderSystem.colorMask(true, true, true, true); - RenderSystem.enableDepthTest(); +// RenderSystem.colorMask(true, true, true, true); +// RenderSystem.enableDepthTest(); } } @Override - public boolean dragFluid(FluidVariant fluidKey, Simulation simulation) { + public boolean dragFluid(FluidResource fluidResource, Simulation simulation) { if (simulation.isActing()) { - setNetworkFluid(fluidKey); + setNetworkFluid(fluidResource); } return true; } @Override - public boolean dragItem(ItemVariant itemKey, Simulation simulation) { + public boolean dragItem(ItemResource itemResource, Simulation simulation) { return false; } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/gui/ConnectionTypeButton.java b/src/client/java/aztech/modern_industrialization/client/pipes/gui/ConnectionTypeButton.java index 13761707c..3b2ba24c9 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/gui/ConnectionTypeButton.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/gui/ConnectionTypeButton.java @@ -53,9 +53,11 @@ public Component getMessage() { }; } - // Text is a bit too large, so override to avoid the default 2 pixel margin for the "scrolling" effect @Override - public void renderString(GuiGraphics guiGraphics, Font font, int color) { - renderScrollingString(guiGraphics, font, 0, color); + protected void renderContents(GuiGraphics graphics, int mouseX, int mouseY, float a) { + this.renderDefaultSprite(graphics); + // Text is a bit too large, so use a 0 (instead of 2) pixel margin for the "scrolling" effect + var output = graphics.textRendererForWidget(this, GuiGraphics.HoveredTextEffects.NONE); + this.renderScrollingStringOverContents(output, getMessage(), 0); } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/gui/PipeScreen.java b/src/client/java/aztech/modern_industrialization/client/pipes/gui/PipeScreen.java index 863b7acce..85b287200 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/gui/PipeScreen.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/gui/PipeScreen.java @@ -25,7 +25,7 @@ package aztech.modern_industrialization.client.pipes.gui; import aztech.modern_industrialization.MIText; -import aztech.modern_industrialization.client.screen.MIHandledScreen; +import aztech.modern_industrialization.client.screen.MIContainerScreen; import aztech.modern_industrialization.network.pipes.IncrementPriorityPacket; import aztech.modern_industrialization.network.pipes.SetConnectionTypePacket; import aztech.modern_industrialization.pipes.gui.iface.ConnectionTypeInterface; @@ -36,30 +36,31 @@ import java.util.List; import java.util.function.BooleanSupplier; import java.util.function.Supplier; + +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; /** * A helper for functionality commonly used by pipe screens. */ -public abstract class PipeScreen extends MIHandledScreen { +public abstract class PipeScreen extends MIContainerScreen { @SuppressWarnings("AssignmentToSuperclassField") - public PipeScreen(SH handler, Inventory inventory, Component title, int backgroundHeight) { - super(handler, inventory, title); + public PipeScreen(SH handler, Inventory inventory, Component title, int imageHeight) { + super(handler, inventory, title, DEFAULT_IMAGE_WIDTH, imageHeight); - this.imageHeight = backgroundHeight; this.inventoryLabelY = this.imageHeight - 94; } - protected abstract ResourceLocation getBackgroundTexture(); + protected abstract Identifier getBackgroundTexture(); @Override protected void renderBg(GuiGraphics guiGraphics, float delta, int mouseX, int mouseY) { - RenderSystem.setShaderColor(1, 1, 1, 1); - guiGraphics.blit(getBackgroundTexture(), this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, getBackgroundTexture(), this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight, 256, 256); } @Override @@ -97,7 +98,7 @@ protected int connectionTypeBackward(ConnectionTypeInterface connectionType) { } protected int connectionTypeNext(ConnectionTypeInterface connectionType) { - if (!hasShiftDown()) { + if (!Minecraft.getInstance().hasShiftDown()) { return connectionTypeForward(connectionType); } else { return connectionTypeBackward(connectionType); diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityButton.java b/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityButton.java index 62b5aba9f..13175e4ce 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityButton.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityButton.java @@ -34,6 +34,7 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; @@ -50,17 +51,13 @@ public PriorityButton(int x, int y, int width, int u, String message, OnPress on } @Override - public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { + public void renderContents(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { this.active = this.isEnabled.getAsBoolean(); Minecraft minecraftClient = Minecraft.getInstance(); Font font = minecraftClient.font; int v = this.isHoveredOrFocused() ? 40 + this.height : 40; - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - RenderSystem.enableDepthTest(); - guiGraphics.blit(PipeGuiHelper.BUTTON_TEXTURE, this.getX(), this.getY(), u, v, this.width, this.height); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, PipeGuiHelper.BUTTON_TEXTURE, this.getX(), this.getY(), u, v, this.width, this.height, 256, 256); int j = this.active ? 16777215 : 10526880; guiGraphics.drawCenteredString(font, getMessage(), this.getX() + this.width / 2, this.getY() + (this.height - 8) / 2, j | Mth.ceil(this.alpha * 255.0F) << 24); diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityDisplay.java b/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityDisplay.java index 895b6181a..14ca560fc 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityDisplay.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/gui/PriorityDisplay.java @@ -33,6 +33,7 @@ import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.network.chat.Component; +import net.minecraft.util.CommonColors; import net.minecraft.util.FormattedCharSequence; class PriorityDisplay extends AbstractWidget { @@ -64,6 +65,6 @@ protected void updateWidgetNarration(NarrationElementOutput narrationElementOutp public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { FormattedCharSequence orderedText = getMessage().getVisualOrderText(); guiGraphics.drawString(textRenderer, orderedText, this.getX() + this.width / 2 - textRenderer.width(orderedText) / 2, - this.getY() + (this.height - 8) / 2, isEnabled.getAsBoolean() ? 0x404040 : 0x707070, false); + this.getY() + (this.height - 8) / 2, isEnabled.getAsBoolean() ? CommonColors.DARK_GRAY : 0xFF707070, false); } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/DelegatingUnbakedModel.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/DelegatingUnbakedModel.java deleted file mode 100644 index 632938f16..000000000 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/DelegatingUnbakedModel.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.pipes.impl; - -import java.util.function.Function; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.Material; -import net.minecraft.client.resources.model.ModelBaker; -import net.minecraft.client.resources.model.ModelState; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.GsonHelper; -import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; -import net.neoforged.neoforge.client.model.geometry.IGeometryLoader; -import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; - -public class DelegatingUnbakedModel implements IUnbakedGeometry { - public static final IGeometryLoader LOADER = (object, context) -> { - var loc = GsonHelper.getAsString(object, "delegate"); - return new DelegatingUnbakedModel(ResourceLocation.parse(loc)); - }; - - private final ResourceLocation delegate; - - public DelegatingUnbakedModel(ResourceLocation delegate) { - this.delegate = delegate; - } - - @Override - public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function spriteGetter, - ModelState modelState, ItemOverrides overrides) { - return baker.bake(delegate, modelState, spriteGetter); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeBakedModel.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeBakedModel.java deleted file mode 100644 index e7f3346fd..000000000 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeBakedModel.java +++ /dev/null @@ -1,343 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.pipes.impl; - -import aztech.modern_industrialization.client.pipes.api.PipeRenderer; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.ModelHelper; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.SpriteFinder; -import aztech.modern_industrialization.pipes.MIPipes; -import aztech.modern_industrialization.pipes.api.PipeEndpointType; -import aztech.modern_industrialization.pipes.api.PipeNetworkType; -import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; -import aztech.modern_industrialization.pipes.impl.PipeItem; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import java.util.*; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.RandomSource; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.client.ChunkRenderTypeSet; -import net.neoforged.neoforge.client.model.IDynamicBakedModel; -import net.neoforged.neoforge.client.model.data.ModelData; -import net.neoforged.neoforge.client.model.data.ModelProperty; -import org.joml.Vector3f; -import org.jspecify.annotations.Nullable; - -/** - * The models of a pipe block. It can handle up to three different pipe types. - * The block is divided in five slots of width SIDE, three for the main pipes - * and two for connection handling. - */ -public class PipeBakedModel implements IDynamicBakedModel { - private static final ChunkRenderTypeSet RENDER_TYPES_NORMAL = ChunkRenderTypeSet.of(RenderType.cutout(), RenderType.translucent()); - - private final TextureAtlasSprite particleSprite; - private final Map renderers; - private final BakedModel @Nullable [] meWireConnectors; - private final SpriteFinder spriteFinder; - - public PipeBakedModel(TextureAtlasSprite particleSprite, Map renderers, BakedModel @Nullable [] meWireConnectors, SpriteFinder spriteFinder) { - this.particleSprite = particleSprite; - this.renderers = renderers; - this.meWireConnectors = meWireConnectors; - this.spriteFinder = spriteFinder; - } - - private record ExtraData(BlockAndTintGetter level, BlockPos pos) { - private static final ModelProperty KEY = new ModelProperty<>(); - } - - @Override - public ModelData getModelData(BlockAndTintGetter level, BlockPos pos, BlockState state, ModelData modelData) { - return modelData.derive() - .with(ExtraData.KEY, new ExtraData(level, pos)) - .build(); - } - - @Override - public ChunkRenderTypeSet getRenderTypes(BlockState state, RandomSource rand, ModelData data) { - var attachment = data.get(PipeBlockEntity.RenderAttachment.KEY); - - if (attachment == null || attachment.camouflage() == null) { - return RENDER_TYPES_NORMAL; - } else { - return ChunkRenderTypeSet.all(); - } - } - - private static boolean checkRenderType(RenderType target, @Nullable RenderType type) { - return type == target || type == null; - } - - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand, ModelData data, - @Nullable RenderType renderType) { - List ret = null; - var attachment = data.get(PipeBlockEntity.RenderAttachment.KEY); - var extraData = data.get(ExtraData.KEY); - - if (attachment == null || extraData == null) { - return List.of(); - } - - var camouflage = attachment.camouflage(); - - if (camouflage == null || MIPipes.transparentCamouflage) { - var renderNormal = checkRenderType(RenderType.cutout(), renderType); - var renderFluid = checkRenderType(RenderType.translucent(), renderType); - - if (renderNormal || renderFluid) { - var renderContext = new PipeRenderContext(spriteFinder, renderNormal, renderFluid); - ret = renderContext.quads; - - int centerSlots = attachment.types().length; - for (int slot = 0; slot < centerSlots; slot++) { - // Set color - int color = attachment.types()[slot].getColor(); - renderContext.pushTransform(getColorTransform(color)); - - renderers.get(PipeRenderer.get(attachment.types()[slot])).draw(extraData.level(), extraData.pos(), renderContext, slot, - attachment.renderedConnections(), attachment.customData()[slot]); - - renderContext.popTransform(); - } - } - - if (renderNormal) { - boolean hasMeWire = false; - if (meWireConnectors != null) { - for (var type : attachment.types()) { - if (type.getIdentifier().getPath().endsWith("me_wire")) { - hasMeWire = true; - } - } - } - if (hasMeWire) { - // Render connector if needed - for (var direction : Direction.values()) { - boolean renderConnector = false; - for (int slot = 0; slot < attachment.types().length; ++slot) { - var conn = attachment.renderedConnections()[slot][direction.get3DDataValue()]; - if (conn == PipeEndpointType.BLOCK && attachment.types()[slot].getIdentifier().getPath().endsWith("me_wire")) { - renderConnector = true; - } - } - - if (renderConnector) { - ret.addAll(meWireConnectors[direction.get3DDataValue()].getQuads(state, side, rand, data, renderType)); - } - } - } - } - } - - boolean processCamouflage = !MIPipes.transparentCamouflage || checkRenderType(RenderType.translucent(), renderType); - - if (camouflage != null && processCamouflage) { - if (MIPipes.transparentCamouflage && side != null) { - var adjacentModelData = extraData.level().getModelData(extraData.pos().relative(side)) - .get(PipeBlockEntity.RenderAttachment.KEY); - if (adjacentModelData != null && adjacentModelData.camouflage() != null) { - // Don't draw faces between camouflaged pipes - return ret != null ? ret : List.of(); - } - } - - var camouflageModel = Minecraft.getInstance().getBlockRenderer().getBlockModel(camouflage); - var camouflageModelData = camouflageModel.getModelData(extraData.level(), extraData.pos(), camouflage, ModelData.EMPTY); - - for (var quad : camouflageModel.getQuads(camouflage, side, rand, camouflageModelData, renderType)) { - if (quad.isTinted() || MIPipes.transparentCamouflage) { - // Copy quad to modify inner data - int[] quadData = quad.getVertices().clone(); - - // Fix tinting - if (quad.isTinted()) { - var blockColorMap = Minecraft.getInstance().getBlockColors(); - int color = 0xFF000000 | blockColorMap.getColor(camouflage, extraData.level(), extraData.pos(), quad.getTintIndex()); - - for (int vertex = 0; vertex < 4; vertex++) { - setColor(quadData, vertex, multiplyColor(color, getColor(quadData, vertex))); - } - } - - if (MIPipes.transparentCamouflage) { - for (int vertex = 0; vertex < 4; ++vertex) { - setColor(quadData, vertex, multiplyColor(0x9FFFFFFF, getColor(quadData, vertex))); - } - } - - quad = new BakedQuad(quadData, -1, quad.getDirection(), quad.getSprite(), quad.isShade(), quad.hasAmbientOcclusion()); - } - - if (ret == null) { - ret = new ArrayList<>(); - } - ret.add(quad); - } - } - - return ret != null ? ret : List.of(); - } - - // Thank you Indigo! - private static int multiplyColor(int color1, int color2) { - if (color1 == -1) { - return color2; - } else if (color2 == -1) { - return color1; - } - - final int alpha = ((color1 >> 24) & 0xFF) * ((color2 >> 24) & 0xFF) / 0xFF; - final int red = ((color1 >> 16) & 0xFF) * ((color2 >> 16) & 0xFF) / 0xFF; - final int green = ((color1 >> 8) & 0xFF) * ((color2 >> 8) & 0xFF) / 0xFF; - final int blue = (color1 & 0xFF) * (color2 & 0xFF) / 0xFF; - - return (alpha << 24) | (red << 16) | (green << 8) | blue; - } - - private static final int QUAD_STRIDE = DefaultVertexFormat.BLOCK.getVertexSize() / 4; - private static final int VERTEX_COLOR = 3; - - private static int getColor(int[] quadData, int vertex) { - return swapBlueRed(quadData[vertex * QUAD_STRIDE + VERTEX_COLOR]); - } - - private static void setColor(int[] quadData, int vertex, int color) { - quadData[vertex * QUAD_STRIDE + VERTEX_COLOR] = swapBlueRed(color); - } - - /** - * Converts between ARGB color and ABGR color. Assumes little endian encoding. - */ - public static int swapBlueRed(int color) { - if (color == -1) { - return -1; - } - - return (color & 0xFF00FF00) | ((color & 0x00FF0000) >>> 16) | ((color & 0x000000FF) << 16); - } - - private static PipeRenderContext.QuadTransform getColorTransform(int color) { - return quad -> { - if (quad.tag() == 0) { - quad.color(color, color, color, color); - } - return true; - }; - } - - private static final PipeRenderContext.QuadTransform ITEM_TRANSFORM = quad -> { - // Scale pipe to make items look better - for (int i = 0; i < 4; ++i) { - Vector3f pos = quad.copyPos(i, null); - quad.pos(i, pos.x(), pos.y() * 2 - 0.5f, pos.z() * 2 - 0.5f); - } - // Remove fluid quads - if (quad.tag() == 1) { - return false; - } - return true; - }; - - @Override - public boolean useAmbientOcclusion() { - return true; - } - - @Override - public boolean isGui3d() { - return false; - } - - @Override - public boolean usesBlockLight() { - return true; - } - - @Override - public boolean isCustomRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleIcon() { - return particleSprite; - } - - @Override - public ItemTransforms getTransforms() { - return ModelHelper.MODEL_TRANSFORM_BLOCK; - } - - @Override - public ItemOverrides getOverrides() { - return ItemOverrides.EMPTY; - } - - @Override - public List getRenderPasses(ItemStack itemStack, boolean fabulous) { - if (itemStack.getItem() instanceof PipeItem pipe) { - PipeNetworkType type = pipe.type; - int color = type.getColor(); - - return List.of(new PipeBakedModel(particleSprite, renderers, meWireConnectors, spriteFinder) { - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand, ModelData data, - @Nullable RenderType renderType) { - if (side != null) { - return List.of(); - } - - var renderContext = new PipeRenderContext(spriteFinder, true, true); - - renderContext.pushTransform(getColorTransform(color)); - renderContext.pushTransform(ITEM_TRANSFORM); - - PipeEndpointType[][] connections = new @Nullable PipeEndpointType[][] { - { null, null, null, null, PipeEndpointType.BLOCK, PipeEndpointType.BLOCK } }; - renderers.get(PipeRenderer.get(type)).draw(null, null, renderContext, 0, connections, new CompoundTag()); - - renderContext.popTransform(); - renderContext.popTransform(); - - return renderContext.quads; - } - }); - } else { - return List.of(this); - } - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeBlockStateModel.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeBlockStateModel.java new file mode 100644 index 000000000..e0c145155 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeBlockStateModel.java @@ -0,0 +1,197 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.client.pipes.impl; + +import aztech.modern_industrialization.client.pipes.api.PipeRenderer; +import aztech.modern_industrialization.client.util.ModelHelper; +import aztech.modern_industrialization.pipes.MIPipes; +import aztech.modern_industrialization.pipes.api.PipeEndpointType; +import aztech.modern_industrialization.pipes.api.PipeNetworkType; +import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; +import aztech.modern_industrialization.pipes.impl.PipeItem; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.BlockModelPart; +import net.minecraft.client.renderer.block.model.SimpleModelWrapper; +import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.QuadCollection; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.util.ARGB; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.DynamicBlockStateModel; +import net.neoforged.neoforge.client.model.quad.BakedColors; +import org.jspecify.annotations.Nullable; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; + +/** + * The models of a pipe block. It can handle up to three different pipe types. + * The block is divided in five slots of width SIDE, three for the main pipes + * and two for connection handling. + */ +public class PipeBlockStateModel implements DynamicBlockStateModel { + private final TextureAtlasSprite particleSprite; + final Map renderers; + private final BlockModelPart @Nullable [] meWireConnectors; + + public PipeBlockStateModel(TextureAtlasSprite particleSprite, Map renderers, BlockModelPart @Nullable [] meWireConnectors) { + this.particleSprite = particleSprite; + this.renderers = renderers; + this.meWireConnectors = meWireConnectors; + } + + @Override + public void collectParts(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, List parts) { + var attachment = level.getModelData(pos).get(PipeBlockEntity.RenderAttachment.KEY); + if (attachment == null) { + return; + } + + var camouflage = attachment.camouflage(); + + if (camouflage == null || MIPipes.transparentCamouflage) { + var cutoutQuads = new QuadCollection.Builder(); + var translucentQuads = new QuadCollection.Builder(); + + int centerSlots = attachment.types().length; + for (int slot = 0; slot < centerSlots; slot++) { + int color = attachment.types()[slot].getColor(); + renderers.get(PipeRenderer.get(attachment.types()[slot])).draw( + cutoutQuads::addUnculledFace, translucentQuads::addUnculledFace, level, pos, slot, + attachment.renderedConnections(), color, attachment.customData()[slot]); + } + + parts.add(new SimpleModelWrapper(cutoutQuads.build(), true, particleSprite, ChunkSectionLayer.CUTOUT)); + var allTranslucentQuads = translucentQuads.build(); + if (!allTranslucentQuads.getAll().isEmpty()) { + parts.add(new SimpleModelWrapper(allTranslucentQuads, true, particleSprite, ChunkSectionLayer.TRANSLUCENT)); + } + + boolean hasMeWire = false; + if (meWireConnectors != null) { + for (var type : attachment.types()) { + if (type.getIdentifier().getPath().endsWith("me_wire")) { + hasMeWire = true; + } + } + } + if (hasMeWire) { + // Render connector if needed + for (var direction : Direction.values()) { + boolean renderConnector = false; + for (int slot = 0; slot < attachment.types().length; ++slot) { + var conn = attachment.renderedConnections()[slot][direction.get3DDataValue()]; + if (conn == PipeEndpointType.BLOCK && attachment.types()[slot].getIdentifier().getPath().endsWith("me_wire")) { + renderConnector = true; + } + } + + if (renderConnector) { + parts.add(meWireConnectors[direction.get3DDataValue()]); + } + } + } + } + + if (camouflage != null) { + var adjacentCamouflages = EnumSet.noneOf(Direction.class); + for (var direction : Direction.values()) { + var adjacentModelData = level.getModelData(pos.relative(direction)) + .get(PipeBlockEntity.RenderAttachment.KEY); + if (adjacentModelData != null && adjacentModelData.camouflage() != null) { + adjacentCamouflages.add(direction); + } + } + + var camouflageModel = Minecraft.getInstance().getBlockRenderer().getBlockModel(camouflage); + for (var basePart : camouflageModel.collectParts(level, pos, camouflage, random)) { + var newQuads = new QuadCollection.Builder(); + for (var direction : aztech.modern_industrialization.client.util.ModelHelper.DIRECTIONS_WITH_NULL) { + if (adjacentCamouflages.contains(direction)) { + // Don't draw faces between camouflaged pipes + continue; + } + + for (var baseQuad : basePart.getQuads(direction)) { + int colorMultiplier = -1; + + if (baseQuad.isTinted()) { + var blockColorMap = Minecraft.getInstance().getBlockColors(); + colorMultiplier = 0xFF000000 | blockColorMap.getColor(camouflage, level, pos, baseQuad.tintIndex()); + } + + if (MIPipes.transparentCamouflage) { + colorMultiplier = ARGB.multiply(0x9FFFFFFF, colorMultiplier); + } + + BakedQuad newQuad; + if (colorMultiplier != -1) { + newQuad = new BakedQuad( + baseQuad.position0(), baseQuad.position1(), baseQuad.position2(), baseQuad.position3(), + baseQuad.packedUV0(), baseQuad.packedUV1(), baseQuad.packedUV2(), baseQuad.packedUV3(), + -1, baseQuad.direction(), baseQuad.sprite(), baseQuad.shade(), baseQuad.lightEmission(), + baseQuad.bakedNormals(), + multiplyColor(baseQuad.bakedColors(), colorMultiplier), + baseQuad.hasAmbientOcclusion()); + } else { + newQuad = baseQuad; + } + + ModelHelper.addQuad(newQuads, direction, newQuad); + } + } + + parts.add(new PipeCamouflagePart( + camouflage, + newQuads.build(), + basePart.ambientOcclusion(), + particleSprite, + MIPipes.transparentCamouflage ? ChunkSectionLayer.TRANSLUCENT : basePart.getRenderType(camouflage))); + } + } + } + + private static BakedColors multiplyColor(BakedColors colors, int color2) { + return switch (colors) { + case BakedColors.PerQuad(int color) -> BakedColors.of(ARGB.multiply(color, color2)); + case BakedColors.PerVertex pv -> BakedColors.of( + ARGB.multiply(pv.color0(), color2), + ARGB.multiply(pv.color1(), color2), + ARGB.multiply(pv.color2(), color2), + ARGB.multiply(pv.color3(), color2)); + }; + } + + @Override + public TextureAtlasSprite particleIcon() { + return particleSprite; + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeCamouflagePart.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeCamouflagePart.java new file mode 100644 index 000000000..446bbb973 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeCamouflagePart.java @@ -0,0 +1,40 @@ +package aztech.modern_industrialization.client.pipes.impl; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.BlockModelPart; +import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.QuadCollection; +import net.minecraft.core.Direction; +import net.minecraft.util.TriState; +import net.minecraft.world.level.block.state.BlockState; +import org.jspecify.annotations.Nullable; + +import java.util.List; + +public record PipeCamouflagePart( + BlockState blockState, + QuadCollection quads, + TriState ambientOcclusion, + TextureAtlasSprite particleIcon, + ChunkSectionLayer layer) implements BlockModelPart { + @Override + public List getQuads(@Nullable Direction direction) { + return quads.getQuads(direction); + } + + @Override + public boolean useAmbientOcclusion() { + return ambientOcclusion != TriState.FALSE; + } + + @Override + public ChunkSectionLayer getRenderType(BlockState state) { + return layer; + } + + // TODO 26.1 - should provide Iris compat but that needs to be verified + public BlockState getBlockAppearance() { + return blockState; + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeItemModel.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeItemModel.java new file mode 100644 index 000000000..20259d27e --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeItemModel.java @@ -0,0 +1,99 @@ +package aztech.modern_industrialization.client.pipes.impl; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.client.pipes.api.PipeRenderer; +import aztech.modern_industrialization.pipes.api.PipeEndpointType; +import aztech.modern_industrialization.pipes.api.PipeNetworkType; +import aztech.modern_industrialization.pipes.impl.PipeItem; +import com.mojang.serialization.MapCodec; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.Sheets; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemTransforms; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.ItemModelResolver; +import net.minecraft.client.renderer.item.ItemStackRenderState; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.Identifier; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.ItemOwner; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.EmptyBlockAndTintGetter; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.state.BlockState; +import net.neoforged.neoforge.client.model.quad.BakedColors; +import org.joml.Vector3f; +import org.joml.Vector3fc; +import org.jspecify.annotations.Nullable; + +import java.util.List; +import java.util.function.Consumer; + +public record PipeItemModel(ItemTransforms transforms, PipeBlockStateModel blockModel) implements ItemModel { + @Override + public void update(ItemStackRenderState output, ItemStack item, ItemModelResolver resolver, ItemDisplayContext displayContext, @Nullable ClientLevel level, @Nullable ItemOwner owner, int seed) { + if (item.getItem() instanceof PipeItem pipe) { + PipeNetworkType type = pipe.type; + output.appendModelIdentityElement(type); + int color = type.getColor(); + + var layer = output.newLayer(); + layer.setUsesBlockLight(true); + layer.setParticleIcon(blockModel.particleIcon()); + layer.setTransform(transforms.getTransform(displayContext)); + Consumer quadConsumer = quad -> { + layer.prepareQuadList().add(new BakedQuad( + scalePos(quad.position0()), scalePos(quad.position1()), scalePos(quad.position2()), scalePos(quad.position3()), + quad.packedUV0(), quad.packedUV1(), quad.packedUV2(), quad.packedUV3(), + quad.tintIndex(), quad.direction(), quad.sprite(), quad.shade(), quad.lightEmission(), + quad.bakedNormals(), quad.bakedColors(), quad.hasAmbientOcclusion())); + }; + + PipeEndpointType[][] connections = new @Nullable PipeEndpointType[][] { + { null, null, null, null, PipeEndpointType.BLOCK, PipeEndpointType.BLOCK } }; + blockModel.renderers.get(PipeRenderer.get(type)).draw( + quadConsumer, q -> {}, + EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, + 0, connections, color, null); + layer.setRenderType(Sheets.cutoutBlockSheet()); + } + } + + /** + * Scale pipe to make items look better. + */ + private static Vector3fc scalePos(Vector3fc pos) { + return new Vector3f(pos.x(), pos.y() * 2 - 0.5f, pos.z() * 2 - 0.5f); + } + + public record Unbaked() implements ItemModel.Unbaked { + public static final Identifier TYPE_ID = MI.id("pipe"); + + public static final Unbaked INSTANCE = new Unbaked(); + public static final MapCodec CODEC = MapCodec.unit(INSTANCE); + + private static final Identifier BLOCK_BLOCK = Identifier.withDefaultNamespace("block/block"); + + @Override + public MapCodec type() { + return CODEC; + } + + @Override + public ItemModel bake(BakingContext context) { + return new PipeItemModel( + context.blockModelBaker().getModel(BLOCK_BLOCK).getTopTransforms(), + PipeUnbakedModel.getOrBakeBlockModel(context.blockModelBaker())); + } + + @Override + public void resolveDependencies(Resolver resolver) { + resolver.markDependency(BLOCK_BLOCK); + } + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshBuilder.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshBuilder.java index 2e18ac6f5..ee7df7a73 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshBuilder.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshBuilder.java @@ -26,41 +26,57 @@ import static net.minecraft.core.Direction.*; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadEmitter; +import aztech.modern_industrialization.client.util.ModelHelper; import aztech.modern_industrialization.pipes.impl.PipePartBuilder; +import net.minecraft.client.model.geom.builders.UVPair; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.Direction; import net.minecraft.world.phys.Vec3; +import net.neoforged.neoforge.client.model.quad.BakedColors; +import net.neoforged.neoforge.client.model.quad.BakedNormals; +import org.joml.Vector3f; +import org.joml.Vector3fc; + +import java.util.List; public class PipeMeshBuilder extends PipePartBuilder { - protected final QuadEmitter emitter; + private final List pipeQuads; + private final List innerQuads; + private final boolean addInnerQuads; + private final TextureAtlasSprite sprite; private final float spriteSizeU; private final float spriteSizeV; - PipeMeshBuilder(QuadEmitter emitter, int slotPos, Direction direction, TextureAtlasSprite sprite) { + private final Vector3f[] workPos = new Vector3f[] { new Vector3f(), new Vector3f(), new Vector3f(), new Vector3f() }; + private final long[] workUv = new long[4]; + + PipeMeshBuilder(List pipeQuads, List innerQuads, boolean addInnerQuads, int slotPos, Direction direction, TextureAtlasSprite sprite) { super(slotPos, direction); - this.emitter = emitter; + this.pipeQuads = pipeQuads; + this.innerQuads = innerQuads; + this.addInnerQuads = addInnerQuads; this.sprite = sprite; this.spriteSizeU = sprite.getU1() - sprite.getU0(); this.spriteSizeV = sprite.getV1() - sprite.getV0(); } - /** - * Add a quad, BUT DON'T EMIT. - */ - protected void quad(Direction direction, float left, float bottom, float right, float top, float depth) { - emitter.square(direction, left, bottom, right, top, depth); - emitter.cullFace(null); - } + private void quad(Direction direction, float left, float bottom, float right, float top, float depth) { + // Already emit the fluid quad, the UV will be baked when rendering so it's not needed here + if (addInnerQuads) { + ModelHelper.square(workPos, direction, left, bottom, right, top, depth + 0.001f); + innerQuads.add(new BakedQuad( + new Vector3f(workPos[0]), new Vector3f(workPos[1]), new Vector3f(workPos[2]), new Vector3f(workPos[3]), + 0, 0, 0, 0, + -1, direction, sprite, true, 0, + BakedNormals.UNSPECIFIED, BakedColors.DEFAULT, true)); + } - /** - * Add a quad with double arguments, BUT DON'T EMIT. - */ - private void quad(Direction direction, double left, double bottom, double right, double top, double depth) { - quad(direction, (float) left, (float) bottom, (float) right, (float) top, (float) depth); + ModelHelper.square(workPos, direction, left, bottom, right, top, depth); } + // TODO: reformat and use vec2 for uvs /** * Add a quad with four corners and the facing direction. It is important that 1 * and 4 be opposite corners! UVs are actually (u, v, whatever) @@ -68,11 +84,11 @@ private void quad(Direction direction, double left, double bottom, double right, private void quad(Vec3 facing, Vec3[] corners, Vec3[] uvs) { if (corners.length != 4 || uvs.length != 4) throw new RuntimeException("This is a bug, please report!"); - Vec3 c1 = corners[0]; - Vec3 c4 = corners[3]; - Direction direction = Direction.getNearest(facing.x, facing.y, facing.z); - double x = Math.min(c1.x, c4.x), y = Math.min(c1.y, c4.y), z = Math.min(c1.z, c4.z); - double X = Math.max(c1.x, c4.x), Y = Math.max(c1.y, c4.y), Z = Math.max(c1.z, c4.z); + Vector3fc c1 = corners[0].toVector3f(); + Vector3fc c4 = corners[3].toVector3f(); + Direction direction = Direction.getApproximateNearest(facing.x, facing.y, facing.z); + float x = Math.min(c1.x(), c4.x()), y = Math.min(c1.y(), c4.y()), z = Math.min(c1.z(), c4.z()); + float X = Math.max(c1.x(), c4.x()), Y = Math.max(c1.y(), c4.y()), Z = Math.max(c1.z(), c4.z()); if (direction == UP) quad(UP, x, 1 - Z, X, 1 - z, 1 - Y); else if (direction == DOWN) @@ -88,17 +104,21 @@ else if (direction == SOUTH) // Map the uvs onto the quad for (int i = 0; i < 4; ++i) { - Vec3 vertexPos = new Vec3(emitter.copyPos(i, null)); + Vec3 vertexPos = new Vec3(workPos[i]); for (int j = 0; j < 4; ++j) { if (vertexPos.subtract(corners[j]).lengthSqr() < 1e-6) { float realU = sprite.getU0() + spriteSizeU * (float) uvs[j].x(); float realV = sprite.getV0() + spriteSizeV * (float) uvs[j].y(); - emitter.uv(i, realU, realV); + workUv[i] = UVPair.pack(realU, realV); } } } - emitter.emit(); + pipeQuads.add(new BakedQuad( + new Vector3f(workPos[0]), new Vector3f(workPos[1]), new Vector3f(workPos[2]), new Vector3f(workPos[3]), + workUv[0], workUv[1], workUv[2], workUv[3], + -1, direction, sprite, true, 0, + BakedNormals.UNSPECIFIED, BakedColors.DEFAULT, true)); } private static final double COL_WIDTH = 1 / 8.0; @@ -159,14 +179,14 @@ protected void drawPipe(float length, Intent intent, boolean end) { * @param directions: a bitset with the directions */ void noConnection(int directions) { - if ((directions & (1 << Direction.getNearest(facing.x, facing.y, facing.z).get3DDataValue())) > 0) { + if ((directions & (1 << Direction.getApproximateNearest(facing.x, facing.y, facing.z).get3DDataValue())) > 0) { return; // don't render when there is already a connection in this direction } // Get the 4 connections as '0's and '1's int[] sidesDirections = new int[4]; for (int i = 0; i < 4; ++i) { Vec3 up = up(); - Direction sideDir = Direction.getNearest(up.x, up.y, up.z); + Direction sideDir = Direction.getApproximateNearest(up.x, up.y, up.z); sidesDirections[i] = (directions >> sideDir.get3DDataValue()) & 1; rotateCw(); } @@ -206,22 +226,4 @@ private void rotate(Vec3[] arr) { arr[3] = arr[1]; arr[1] = tmp; } - - public static class InnerQuads extends PipeMeshBuilder { - InnerQuads(QuadEmitter emitter, int slotPos, Direction direction, TextureAtlasSprite sprite) { - super(emitter, slotPos, direction, sprite); - } - - @Override - protected void quad(Direction direction, float left, float bottom, float right, float top, float depth) { - // create the inner qud - super.quad(direction, left, bottom, right, top, depth + 0.001f); - // set the tag - emitter.tag(1); - // emit the quad - emitter.emit(); - // create the actual quad - super.quad(direction, left, bottom, right, top, depth); - } - } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshCache.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshCache.java index 8855798ba..21d91e921 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshCache.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeMeshCache.java @@ -25,25 +25,35 @@ package aztech.modern_industrialization.client.pipes.impl; import aztech.modern_industrialization.client.pipes.api.PipeRenderer; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.Mesh; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MeshBuilder; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MeshBuilderImpl; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MutableQuadView; -import aztech.modern_industrialization.client.thirdparty.fabrictransfer.FluidVariantRendering; +import aztech.modern_industrialization.client.util.ModelHelper; +import aztech.modern_industrialization.client.util.RenderHelper; import aztech.modern_industrialization.pipes.api.PipeEndpointType; import aztech.modern_industrialization.pipes.impl.PipePartBuilder; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; + +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.function.Consumer; import java.util.function.Function; + +import net.minecraft.client.model.geom.builders.UVPair; +import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.Material; +import net.minecraft.client.resources.model.SpriteGetter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockAndTintGetter; +import net.neoforged.neoforge.client.model.quad.BakedColors; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import org.joml.Vector2fc; +import org.joml.Vector3fc; import org.jspecify.annotations.Nullable; public class PipeMeshCache implements PipeRenderer { + private record Mesh(List pipeQuads, List innerQuads) {} + /** * The cached meshes for the connections. Indexed by: [endpoint * type][logicalSlot][direction id]["render type" - 1]. "render type" is 0, 1, @@ -69,7 +79,7 @@ private record CenterMeshKey(int logicalSlot, int bitmask) {} * * @param innerQuads Whether to add inner quads, e.g. for fluid rendering. */ - public PipeMeshCache(Function textureGetter, Material[] spriteIds, boolean innerQuads) { + public PipeMeshCache(SpriteGetter spriteGetter, Material[] spriteIds, boolean innerQuads) { // Build the connection cache connectionMeshBuilder = key -> { int i = key.endpointType; @@ -77,15 +87,10 @@ public PipeMeshCache(Function textureGetter, Mater Direction direction = Direction.from3DDataValue(key.directionId); int j = key.renderType; - TextureAtlasSprite sprite = textureGetter.apply(spriteIds[i]); + TextureAtlasSprite sprite = spriteGetter.get(spriteIds[i], () -> "pipe model"); - MeshBuilder meshBuilder = new MeshBuilderImpl(); - PipeMeshBuilder pmb; - if (innerQuads) { - pmb = new PipeMeshBuilder.InnerQuads(meshBuilder.getEmitter(), PipePartBuilder.getSlotPos(logicalSlot), direction, sprite); - } else { - pmb = new PipeMeshBuilder(meshBuilder.getEmitter(), PipePartBuilder.getSlotPos(logicalSlot), direction, sprite); - } + var mesh = new Mesh(new ArrayList<>(), new ArrayList<>()); + PipeMeshBuilder pmb = new PipeMeshBuilder(mesh.pipeQuads, mesh.innerQuads, innerQuads, PipePartBuilder.getSlotPos(logicalSlot), direction, sprite); boolean reduced = j >= 4; boolean end = i != 0; int renderType = j % 4; @@ -99,42 +104,30 @@ public PipeMeshCache(Function textureGetter, Mater pmb.longBend(reduced, end); } - return meshBuilder.build(); + return mesh; }; // Build the center cache - TextureAtlasSprite sprite = textureGetter.apply(spriteIds[0]); + TextureAtlasSprite sprite = spriteGetter.get(spriteIds[0], () -> "pipe model"); centerMeshBuilder = key -> { int logicalSlot = key.logicalSlot; int mask = key.bitmask; - MeshBuilder meshBuilder = new MeshBuilderImpl(); + var mesh = new Mesh(new ArrayList<>(), new ArrayList<>()); for (Direction direction : Direction.values()) { - PipeMeshBuilder pmb; - if (innerQuads) { - pmb = new PipeMeshBuilder.InnerQuads(meshBuilder.getEmitter(), PipePartBuilder.getSlotPos(logicalSlot), direction, sprite); - } else { - pmb = new PipeMeshBuilder(meshBuilder.getEmitter(), PipePartBuilder.getSlotPos(logicalSlot), direction, sprite); - } + PipeMeshBuilder pmb = new PipeMeshBuilder(mesh.pipeQuads, mesh.innerQuads, innerQuads, PipePartBuilder.getSlotPos(logicalSlot), direction, sprite); pmb.noConnection(mask); } - return meshBuilder.build(); + return mesh; }; } - /** - * Draw the connections for a logical slot. - * - * @param ctx Render context. - * @param logicalSlot The logical slot, so 0 for center, 1 for lower and 2 for - * upper. - * @param connections For every logical slot, then for every direction, the - * connection type or null for no connection. - */ - public void draw(@Nullable BlockAndTintGetter view, @Nullable BlockPos pos, PipeRenderContext ctx, int logicalSlot, - @Nullable PipeEndpointType[][] connections, - @Nullable Object customData) { + public void draw( + Consumer cutoutQuads, Consumer translucentQuads, + @Nullable BlockAndTintGetter view, @Nullable BlockPos pos, + int logicalSlot, PipeEndpointType[][] connections, + int color, @Nullable Object customData) { // The render type of the connections (0 for no connection, 1 for straight pipe, // 2 for short bend, etc...) int[] renderTypes = new int[6]; @@ -156,23 +149,14 @@ public void draw(@Nullable BlockAndTintGetter view, @Nullable BlockPos pos, Pipe } } - // Fluid handling logic - if (customData instanceof FluidVariant fluid) { - TextureAtlasSprite still = FluidVariantRendering.getSprite(fluid); - int color = FluidVariantRendering.getColor(fluid, view, pos); - ctx.pushTransform(quad -> { - if (quad.tag() == 1) { - if (still != null) { - quad.spriteBake(still, MutableQuadView.BAKE_LOCK_UV); - quad.color(color, color, color, color); - return true; - } else { - return false; - } - } else { - return true; - } - }); + TextureAtlasSprite still; + int fluidColor; + if (customData instanceof FluidResource fluid) { + still = RenderHelper.getFluidSprite(fluid); + fluidColor = RenderHelper.getFluidColor(fluid, view, pos); + } else { + still = null; + fluidColor = -1; } // Render every connection @@ -183,18 +167,42 @@ public void draw(@Nullable BlockAndTintGetter view, @Nullable BlockPos pos, Pipe if (connectionsInDirection[initialDirections[i].get3DDataValue()] > 1) { renderType += 4; // Conflict handling } - Mesh mesh = connectionMeshes.computeIfAbsent(new ConnectionMeshKey(endpointType.getId(), logicalSlot, i, renderType), + Mesh mesh = connectionMeshes.computeIfAbsent( + new ConnectionMeshKey(endpointType.getId(), logicalSlot, i, renderType), connectionMeshBuilder); - mesh.outputTo(ctx.getEmitter()); + + for (var pipeQuad : mesh.pipeQuads) { + cutoutQuads.accept(setColor(pipeQuad, color)); + } + if (still != null) { + for (var innerQuad : mesh.innerQuads) { + var newUVs = ModelHelper.bakeUvs(new Vector3fc[] { + innerQuad.position0(), innerQuad.position1(), innerQuad.position2(), innerQuad.position3(), + }, still, innerQuad.direction()); + + translucentQuads.accept(new BakedQuad( + innerQuad.position0(), innerQuad.position1(), innerQuad.position2(), innerQuad.position3(), + newUVs[0], newUVs[1], newUVs[2], newUVs[3], + // TODO 26.1 - double check light emission + innerQuad.tintIndex(), innerQuad.direction(), still, innerQuad.shade(), 15, + innerQuad.bakedNormals(), BakedColors.of(fluidColor), innerQuad.hasAmbientOcclusion())); + } + } } } // Render the center connector - centerMeshes.computeIfAbsent(new CenterMeshKey(logicalSlot, directionsMask), centerMeshBuilder).outputTo(ctx.getEmitter()); - - // Fluid handling logic - if (customData instanceof FluidVariant) { - ctx.popTransform(); + var centerMesh = centerMeshes.computeIfAbsent(new CenterMeshKey(logicalSlot, directionsMask), centerMeshBuilder); + for (var pipeQuad : centerMesh.pipeQuads) { + cutoutQuads.accept(setColor(pipeQuad, color)); } } + + private static BakedQuad setColor(BakedQuad quad, int newColor) { + return new BakedQuad( + quad.position0(), quad.position1(), quad.position2(), quad.position3(), + quad.packedUV0(), quad.packedUV1(), quad.packedUV2(), quad.packedUV3(), + quad.tintIndex(), quad.direction(), quad.sprite(), quad.shade(), quad.lightEmission(), + quad.bakedNormals(), BakedColors.of(newColor), quad.hasAmbientOcclusion()); + } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeRenderContext.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeRenderContext.java deleted file mode 100644 index 5ab556179..000000000 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeRenderContext.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.pipes.impl; - -import aztech.modern_industrialization.client.thirdparty.fabricrendering.EncodingFormat; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MutableQuadView; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MutableQuadViewImpl; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadEmitter; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.SpriteFinder; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.client.renderer.block.model.BakedQuad; - -public class PipeRenderContext { - private final SpriteFinder spriteFinder; - private final boolean acceptNormalQuads; - private final boolean acceptFluidQuads; - private final List transforms = new ArrayList<>(); - final List quads = new ArrayList<>(); - private final MutableQuadViewImpl editorQuad = new MutableQuadViewImpl() { - { - data = new int[EncodingFormat.TOTAL_STRIDE]; - clear(); - } - - @Override - public void emitDirectly() { - var tag = tag(); - if (!acceptNormalQuads && tag == 0 || !acceptFluidQuads && tag == 1) { - return; - } - - if (!passTransforms(this)) { - return; - } - - quads.add(editorQuad.toBakedQuad(spriteFinder.find(editorQuad))); - } - }; - - public PipeRenderContext(SpriteFinder spriteFinder, boolean acceptNormalQuads, boolean acceptFluidQuads) { - this.spriteFinder = spriteFinder; - this.acceptNormalQuads = acceptNormalQuads; - this.acceptFluidQuads = acceptFluidQuads; - } - - private boolean passTransforms(MutableQuadView q) { - int i = transforms.size() - 1; - - while (i >= 0) { - if (!transforms.get(i--).transform(q)) { - return false; - } - } - - return true; - } - - public void pushTransform(QuadTransform transform) { - this.transforms.add(transform); - } - - public void popTransform() { - this.transforms.remove(this.transforms.size() - 1); - } - - public QuadEmitter getEmitter() { - return this.editorQuad; - } - - public interface QuadTransform { - boolean transform(MutableQuadView quad); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeUnbakedModel.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeUnbakedModel.java index 3860bc295..2b136d841 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeUnbakedModel.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/PipeUnbakedModel.java @@ -1,80 +1,69 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - package aztech.modern_industrialization.client.pipes.impl; import aztech.modern_industrialization.MI; import aztech.modern_industrialization.client.pipes.MIPipesClient; import aztech.modern_industrialization.client.pipes.api.PipeRenderer; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.SpriteFinderImpl; import aztech.modern_industrialization.config.MIStartupConfig; -import java.util.IdentityHashMap; -import java.util.Map; -import java.util.function.Function; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; +import com.mojang.serialization.MapCodec; +import net.minecraft.client.renderer.block.model.BlockModelPart; import net.minecraft.client.resources.model.Material; import net.minecraft.client.resources.model.ModelBaker; -import net.minecraft.client.resources.model.ModelState; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.InventoryMenu; -import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext; -import net.neoforged.neoforge.client.model.geometry.IGeometryLoader; -import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.data.AtlasIds; +import net.minecraft.resources.Identifier; +import net.neoforged.neoforge.client.ClientHooks; +import net.neoforged.neoforge.client.model.block.CustomUnbakedBlockStateModel; + +import java.util.IdentityHashMap; +import java.util.Map; + +public class PipeUnbakedModel implements CustomUnbakedBlockStateModel { + public static final Identifier TYPE_ID = MI.id("pipe"); -public class PipeUnbakedModel implements IUnbakedGeometry { - public static final ResourceLocation LOADER_ID = MI.id("pipe"); - public static final IGeometryLoader LOADER = (object, context) -> { - return new PipeUnbakedModel(); - }; + public static final PipeUnbakedModel INSTANCE = new PipeUnbakedModel(); + public static final MapCodec CODEC = MapCodec.unit(INSTANCE); - private static final ResourceLocation ME_WIRE_CONNECTOR_MODEL = MI.id("part/me_wire_connector"); - private static final Material PARTICLE_SPRITE = new Material(InventoryMenu.BLOCK_ATLAS, - ResourceLocation.parse("minecraft:block/iron_block")); + private static final Identifier ME_WIRE_CONNECTOR_MODEL = MI.id("part/me_wire_connector"); + private static final Material PARTICLE_SPRITE = ClientHooks.getBlockMaterial(Identifier.parse("minecraft:block/iron_block")); @Override - public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function spriteGetter, - ModelState modelState, ItemOverrides overrides) { - Map renderers = new IdentityHashMap<>(); - for (PipeRenderer.Factory rendererFactory : MIPipesClient.RENDERERS) { - renderers.put(rendererFactory, rendererFactory.create(spriteGetter)); - } + public MapCodec codec() { + return CODEC; + } - BakedModel[] meWireConnectors = null; - if (MIStartupConfig.INSTANCE.loadAe2Compat()) { - meWireConnectors = RotatedModelHelper.loadRotatedModels(ME_WIRE_CONNECTOR_MODEL, baker, spriteGetter); - } + public static PipeBlockStateModel getOrBakeBlockModel(ModelBaker modelBakery) { + return modelBakery.compute(SharedBlockModel.INSTANCE); + } + + @Override + public PipeBlockStateModel bake(ModelBaker modelBaker) { + return getOrBakeBlockModel(modelBaker); + } + + @Override + public void resolveDependencies(Resolver resolver) { + resolver.markDependency(ME_WIRE_CONNECTOR_MODEL); + } + + private static class SharedBlockModel implements ModelBaker.SharedOperationKey { + private static final SharedBlockModel INSTANCE = new SharedBlockModel(); - var blockAtlas = Minecraft.getInstance().getModelManager().getAtlas(InventoryMenu.BLOCK_ATLAS); - var spriteFinder = new SpriteFinderImpl(blockAtlas.getTextures(), blockAtlas); + @Override + public PipeBlockStateModel compute(ModelBaker modelBakery) { + Map renderers = new IdentityHashMap<>(); + for (PipeRenderer.Factory rendererFactory : MIPipesClient.RENDERERS) { + renderers.put(rendererFactory, rendererFactory.create(modelBakery)); + } - return new PipeBakedModel( - spriteGetter.apply(PARTICLE_SPRITE), - renderers, - meWireConnectors, - spriteFinder); + BlockModelPart[] meWireConnectors = null; + if (MIStartupConfig.INSTANCE.loadAe2Compat()) { + meWireConnectors = RotatedModelHelper.loadRotatedModels(ME_WIRE_CONNECTOR_MODEL, modelBakery); + } + + return new PipeBlockStateModel( + modelBakery.sprites().get(PARTICLE_SPRITE, () -> "pipe model"), + renderers, + meWireConnectors); + } } } diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/impl/RotatedModelHelper.java b/src/client/java/aztech/modern_industrialization/client/pipes/impl/RotatedModelHelper.java index 9bc4d1501..844c0740d 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/impl/RotatedModelHelper.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/impl/RotatedModelHelper.java @@ -25,49 +25,54 @@ package aztech.modern_industrialization.client.pipes.impl; import com.mojang.math.Axis; +import com.mojang.math.OctahedralGroup; import com.mojang.math.Transformation; import java.util.function.Function; + +import net.minecraft.client.renderer.block.model.BlockModelPart; +import net.minecraft.client.renderer.block.model.SimpleModelWrapper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.BlockModelRotation; import net.minecraft.client.resources.model.Material; import net.minecraft.client.resources.model.ModelBaker; import net.minecraft.client.resources.model.ModelState; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class RotatedModelHelper { + // TODO 26.1 - cleanup this mess, and then copy to MD /** * The model rotation to rotate a model facing NORTH to the correct facing direction. * Rotations are indexed by {@link Direction} id. */ public static final ModelState[] PIPE_BAKE_SETTINGS = new ModelState[] { - preRotated(BlockModelRotation.X90_Y0, 270), - BlockModelRotation.X270_Y0, - BlockModelRotation.X0_Y0, - preRotated(BlockModelRotation.X0_Y180, 90), - preRotated(BlockModelRotation.X0_Y270, 90), - BlockModelRotation.X0_Y90, + preRotated(BlockModelRotation.get(OctahedralGroup.ROT_90_X_NEG), 270), + BlockModelRotation.get(OctahedralGroup.ROT_90_X_NEG.compose(OctahedralGroup.ROT_90_X_NEG).compose(OctahedralGroup.ROT_90_X_NEG)), + BlockModelRotation.IDENTITY, + preRotated(BlockModelRotation.get(OctahedralGroup.ROT_90_Y_NEG.compose(OctahedralGroup.ROT_90_Y_NEG)), 90), + preRotated(BlockModelRotation.get(OctahedralGroup.ROT_90_Y_NEG.compose(OctahedralGroup.ROT_90_Y_NEG).compose(OctahedralGroup.ROT_90_Y_NEG)), 90), + BlockModelRotation.get(OctahedralGroup.ROT_90_Y_NEG), }; public static ModelState preRotated(BlockModelRotation rotation, float preAngle) { Transformation preRotation = new Transformation(null, Axis.ZP.rotationDegrees(preAngle), null, null); - Transformation combined = rotation.getRotation().compose(preRotation); + Transformation combined = rotation.transformation().compose(preRotation); return new ModelState() { @Override - public Transformation getRotation() { + public Transformation transformation() { return combined; } }; } - public static BakedModel[] loadRotatedModels(ResourceLocation modelId, ModelBaker modelBaker, - Function spriteGetter) { + public static BlockModelPart[] loadRotatedModels( + Identifier modelId, + ModelBaker modelBaker) { // Load side models - BakedModel[] models = new BakedModel[6]; + BlockModelPart[] models = new BlockModelPart[6]; for (int i = 0; i < 6; ++i) { - models[i] = modelBaker.bake(modelId, PIPE_BAKE_SETTINGS[i], spriteGetter); + models[i] = SimpleModelWrapper.bake(modelBaker, modelId, PIPE_BAKE_SETTINGS[i]); } return models; diff --git a/src/client/java/aztech/modern_industrialization/client/pipes/item/ItemPipeScreen.java b/src/client/java/aztech/modern_industrialization/client/pipes/item/ItemPipeScreen.java index ead557954..49ad7d89b 100644 --- a/src/client/java/aztech/modern_industrialization/client/pipes/item/ItemPipeScreen.java +++ b/src/client/java/aztech/modern_industrialization/client/pipes/item/ItemPipeScreen.java @@ -40,14 +40,16 @@ import java.util.function.Supplier; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextColor; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.util.CommonColors; import net.minecraft.world.entity.player.Inventory; public class ItemPipeScreen extends PipeScreen { - private static final ResourceLocation TEXTURE = MI.id("textures/gui/pipe/item.png"); + private static final Identifier TEXTURE = MI.id("textures/gui/pipe/item.png"); private static final Style SECONDARY_INFO = Style.EMPTY.withColor(TextColor.fromRgb(0xa9a9a9)).withItalic(true); public ItemPipeScreen(ItemPipeScreenHandler handler, Inventory inventory, Component title) { @@ -116,8 +118,8 @@ protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { title = title.copy().append(Component.literal(" ")) .append(MIText.EmptyWhitelistWarning.text().setStyle(TextHelper.WARNING_TEXT)); } - guiGraphics.drawString(font, title, this.titleLabelX, this.titleLabelY, 0x404040, false); - guiGraphics.drawString(font, this.playerInventoryTitle, this.inventoryLabelX, this.inventoryLabelY, 0x404040, false); + guiGraphics.drawString(font, title, this.titleLabelX, this.titleLabelY, CommonColors.DARK_GRAY, false); + guiGraphics.drawString(font, this.playerInventoryTitle, this.inventoryLabelX, this.inventoryLabelY, CommonColors.DARK_GRAY, false); } @Override @@ -133,12 +135,12 @@ protected void renderTooltip(GuiGraphics guiGraphics, int x, int y) { MIText.PipeConnectionIn.text().setStyle(MITooltips.HIGHLIGHT_STYLE)) .setStyle(TextHelper.GRAY_TEXT)); } - guiGraphics.renderTooltip(font, RenderHelper.splitTooltip(lines), x, y); + guiGraphics.setTooltipForNextFrame(font, RenderHelper.splitTooltip(lines), x, y); } } @Override - protected ResourceLocation getBackgroundTexture() { + protected Identifier getBackgroundTexture() { return TEXTURE; } @@ -157,12 +159,11 @@ public Component getMessage() { } @Override - public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { + public void renderContents(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta) { int u = menu.pipeInterface.isWhitelist() ? 0 : 20; int v = this.isHoveredOrFocused() ? 20 : 0; - RenderSystem.enableDepthTest(); - guiGraphics.blit(PipeGuiHelper.BUTTON_TEXTURE, this.getX(), this.getY(), u, v, this.width, this.height); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, PipeGuiHelper.BUTTON_TEXTURE, this.getX(), this.getY(), u, v, this.width, this.height, 256, 256); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/screen/MIContainerScreen.java b/src/client/java/aztech/modern_industrialization/client/screen/MIContainerScreen.java new file mode 100644 index 000000000..4f7cc1287 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/screen/MIContainerScreen.java @@ -0,0 +1,56 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.client.screen; + +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.Slot; + +/** + * Base class for MI screen handlers, grants access to a few protected fields to the REI plugin. + */ +public abstract class MIContainerScreen extends AbstractContainerScreen { + public MIContainerScreen(T handler, Inventory inventory, Component title) { + super(handler, inventory, title); + } + + public MIContainerScreen(T handler, Inventory inventory, Component title, int imageWidth, int imageHeight) { + super(handler, inventory, title, imageWidth, imageHeight); + } + + public Slot getFocusedSlot() { + return hoveredSlot; + } + + public int getX() { + return leftPos; + } + + public int getY() { + return topPos; + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/screen/MIHandledScreen.java b/src/client/java/aztech/modern_industrialization/client/screen/MIHandledScreen.java deleted file mode 100644 index d66480130..000000000 --- a/src/client/java/aztech/modern_industrialization/client/screen/MIHandledScreen.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.screen; - -import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.Slot; - -/** - * Base class for MI screen handlers, grants access to a few protected fields to the REI plugin. - */ -public abstract class MIHandledScreen extends AbstractContainerScreen { - public MIHandledScreen(T handler, Inventory inventory, Component title) { - super(handler, inventory, title); - } - - public Slot getFocusedSlot() { - return hoveredSlot; - } - - public int getX() { - return leftPos; - } - - public int getY() { - return topPos; - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/textures/MITextures.java b/src/client/java/aztech/modern_industrialization/client/textures/MITextures.java index 39f754504..01c209cad 100644 --- a/src/client/java/aztech/modern_industrialization/client/textures/MITextures.java +++ b/src/client/java/aztech/modern_industrialization/client/textures/MITextures.java @@ -43,15 +43,14 @@ import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; import java.util.function.Consumer; -import net.minecraft.Util; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Util; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.resources.ResourceProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jspecify.annotations.Nullable; public final class MITextures { public static CompletableFuture offerTextures(BiConsumer textureWriter, BiConsumer mcMetaWriter, - ResourceProvider manager, ExistingFileHelper fileHelper) { + ResourceProvider manager) { TextureManager mtm = new TextureManager(manager, textureWriter, mcMetaWriter); // Texture generation runs in two phases: @@ -107,9 +106,6 @@ public static CompletableFuture offerTextures(BiConsumer // Do second phase work return mtm.doEndWork(); }, Util.backgroundExecutor()) - .thenRun(() -> { - mtm.markTexturesAsGenerated(fileHelper); - }) .thenRun(() -> MI.LOGGER.info("I used the png to destroy the png.")); } @@ -226,7 +222,7 @@ public static void casingFromTexture(TextureManager tm, String casing, NativeIma } } - public static void casingFromTextureBricked(TextureManager tm, MachineCasing casing, ResourceLocation topTexturePath) { + public static void casingFromTextureBricked(TextureManager tm, MachineCasing casing, Identifier topTexturePath) { try ( var topTexture = tm.getAssetAsTexture(topTexturePath.toString()); var brickTexture = tm.getAssetAsTexture("modern_industrialization:textures/block/fire_clay_bricks.png")) { @@ -237,7 +233,7 @@ public static void casingFromTextureBricked(TextureManager tm, MachineCasing cas try (NativeImage copy = TextureHelper.copy(topTexture)) { for (int i = 0; i < copy.getWidth(); ++i) { for (int j = copy.getHeight() / 2; j < copy.getHeight(); j++) { - copy.setPixelRGBA(i, j, brickTexture.getPixelRGBA(i, j)); + copy.setPixel(i, j, brickTexture.getPixel(i, j)); } } String s = String.format("%s:textures/block/casings/%s.png", casing.key.getNamespace(), casing.key.getPath()); diff --git a/src/client/java/aztech/modern_industrialization/client/textures/PartTextureGenerator.java b/src/client/java/aztech/modern_industrialization/client/textures/PartTextureGenerator.java index f8596b0af..3e6a85ff6 100644 --- a/src/client/java/aztech/modern_industrialization/client/textures/PartTextureGenerator.java +++ b/src/client/java/aztech/modern_industrialization/client/textures/PartTextureGenerator.java @@ -37,7 +37,7 @@ import com.mojang.blaze3d.platform.NativeImage; import java.io.IOException; import java.util.Objects; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; /** * All the per-part texture processing logic. @@ -64,7 +64,7 @@ private PartTextureGenerator(Coloramp coloramp, TextureManager mtm, Material mat this.mtm = mtm; this.material = material; this.materialName = material.name; - this.itemPath = ResourceLocation.parse(part.getItemId()).getPath(); + this.itemPath = Identifier.parse(part.getItemId()).getPath(); } private void build(MaterialItemPart part) throws IOException { @@ -155,12 +155,12 @@ private void processHotIngot() { material.get(SET).name, itemPath, false, new HotIngotColoramp(coloramp, 0.1, 0.5)); } - private void processOre(ResourceLocation stoneType, MaterialOreSet oreSet) throws IOException { + private void processOre(Identifier stoneType, MaterialOreSet oreSet) throws IOException { String template = String.format("modern_industrialization:textures/materialsets/ores/%s.png", oreSet.name); - ResourceLocation from; + Identifier from; boolean deepslate = stoneType.equals(OrePart.TYPE_DEEPSLATE); if (stoneType.equals(OrePart.TYPE_STONE) || deepslate) { - from = ResourceLocation.withDefaultNamespace(switch (oreSet) { + from = Identifier.withDefaultNamespace(switch (oreSet) { case IRON -> deepslate ? "deepslate_iron_ore" : "iron_ore"; case COPPER -> deepslate ? "deepslate_copper_ore" : "copper_ore"; case LAPIS -> deepslate ? "deepslate_lapis_ore" : "lapis_ore"; diff --git a/src/client/java/aztech/modern_industrialization/client/textures/TextureHelper.java b/src/client/java/aztech/modern_industrialization/client/textures/TextureHelper.java index 05b795da7..1d21cfcbe 100644 --- a/src/client/java/aztech/modern_industrialization/client/textures/TextureHelper.java +++ b/src/client/java/aztech/modern_industrialization/client/textures/TextureHelper.java @@ -35,13 +35,13 @@ public class TextureHelper { public static void colorize(NativeImage image, Coloramp colorramp) { for (int i = 0; i < image.getWidth(); ++i) { for (int j = 0; j < image.getHeight(); ++j) { - int color = image.getPixelRGBA(i, j); + int color = image.getPixel(i, j); double l = getLuminance(color); int rgb = colorramp.getRGB(l); int r = getRrgb(rgb); int g = getGrgb(rgb); int b = getBrgb(rgb); - image.setPixelRGBA(i, j, fromArgb(getA(color), r, g, b)); + image.setPixel(i, j, fromArgb(getA(color), r, g, b)); } } } @@ -49,11 +49,11 @@ public static void colorize(NativeImage image, Coloramp colorramp) { public static void setAlpha(NativeImage image, int alpha) { for (int i = 0; i < image.getWidth(); ++i) { for (int j = 0; j < image.getHeight(); ++j) { - int color = image.getPixelRGBA(i, j); + int color = image.getPixel(i, j); int r = getR(color); int g = getG(color); int b = getB(color); - image.setPixelRGBA(i, j, fromArgb(alpha, r, g, b)); + image.setPixel(i, j, fromArgb(alpha, r, g, b)); } } } @@ -61,7 +61,7 @@ public static void setAlpha(NativeImage image, int alpha) { public static void increaseBrightness(NativeImage image, float minBrightness) { for (int i = 0; i < image.getWidth(); ++i) { for (int j = 0; j < image.getHeight(); ++j) { - int color = image.getPixelRGBA(i, j); + int color = image.getPixel(i, j); double l = getLuminance(color); int r = getR(color); int g = getG(color); @@ -72,7 +72,7 @@ public static void increaseBrightness(NativeImage image, float minBrightness) { g = getGrgb(rgb); b = getBrgb(rgb); - image.setPixelRGBA(i, j, fromArgb(getA(color), r, g, b)); + image.setPixel(i, j, fromArgb(getA(color), r, g, b)); } } } @@ -160,7 +160,7 @@ public static void adjustDimensions(List images) { for (int i = 0; i < maxWidth; ++i) { for (int j = 0; j < maxHeight; ++j) { - newImage.setPixelRGBA(i, j, image.getPixelRGBA(i / wFactor, j / hFactor)); + newImage.setPixel(i, j, image.getPixel(i / wFactor, j / hFactor)); } } @@ -181,14 +181,14 @@ public static NativeImage blend(NativeImage originalSource, NativeImage original for (int i = 0; i < source.getWidth(); ++i) { for (int j = 0; j < source.getHeight(); ++j) { - int sourceColor = source.getPixelRGBA(i, j); - int topColor = top.getPixelRGBA(i, j); + int sourceColor = source.getPixel(i, j); + int topColor = top.getPixel(i, j); double alphaSource = getA(sourceColor) / 255.0; double alphaTop = getA(topColor) / 255.0; double alphaOut = alphaTop + alphaSource * (1 - alphaTop); BiFunction mergeAlpha = (sourceValue, topValue) -> (int) ((topValue * alphaTop + sourceValue * alphaSource * (1 - alphaTop)) / alphaOut); - output.setPixelRGBA(i, j, fromArgb((int) (alphaOut * 255), mergeAlpha.apply(getR(sourceColor), getR(topColor)), + output.setPixel(i, j, fromArgb((int) (alphaOut * 255), mergeAlpha.apply(getR(sourceColor), getR(topColor)), mergeAlpha.apply(getG(sourceColor), getG(topColor)), mergeAlpha.apply(getB(sourceColor), getB(topColor)))); } } @@ -208,9 +208,9 @@ public static NativeImage tripleTexture(NativeImage im1, NativeImage im2, Native for (int x = 0; x < lowerIngot.getWidth(); ++x) { for (int y = lowerIngot.getHeight(); y-- > 0;) { if (y >= shiftDown) { - lowerIngot.setPixelRGBA(x, y, lowerIngot.getPixelRGBA(x, y - shiftDown)); + lowerIngot.setPixel(x, y, lowerIngot.getPixel(x, y - shiftDown)); } else { - lowerIngot.setPixelRGBA(x, y, 0); + lowerIngot.setPixel(x, y, 0); } } } @@ -221,9 +221,9 @@ public static NativeImage tripleTexture(NativeImage im1, NativeImage im2, Native for (int x = 0; x < upperIngot.getWidth(); ++x) { for (int y = 0; y < upperIngot.getHeight(); ++y) { if (y + shiftUp < upperIngot.getHeight()) { - upperIngot.setPixelRGBA(x, y, upperIngot.getPixelRGBA(x, y + shiftUp)); + upperIngot.setPixel(x, y, upperIngot.getPixel(x, y + shiftUp)); } else { - upperIngot.setPixelRGBA(x, y, 0); + upperIngot.setPixel(x, y, 0); } } } @@ -241,9 +241,9 @@ public static void doubleIngot(NativeImage image) { for (int x = 0; x < lowerIngot.getWidth(); ++x) { for (int y = lowerIngot.getHeight(); y-- > 0;) { if (y >= shiftDown) { - lowerIngot.setPixelRGBA(x, y, lowerIngot.getPixelRGBA(x, y - shiftDown)); + lowerIngot.setPixel(x, y, lowerIngot.getPixel(x, y - shiftDown)); } else { - lowerIngot.setPixelRGBA(x, y, 0); + lowerIngot.setPixel(x, y, 0); } } } @@ -254,9 +254,9 @@ public static void doubleIngot(NativeImage image) { for (int x = 0; x < upperIngot.getWidth(); ++x) { for (int y = 0; y < upperIngot.getHeight(); ++y) { if (y + shiftUp < upperIngot.getHeight()) { - upperIngot.setPixelRGBA(x, y, upperIngot.getPixelRGBA(x, y + shiftUp)); + upperIngot.setPixel(x, y, upperIngot.getPixel(x, y + shiftUp)); } else { - upperIngot.setPixelRGBA(x, y, 0); + upperIngot.setPixel(x, y, 0); } } } @@ -298,13 +298,13 @@ public static void flip(NativeImage image) { for (int i = 0; i < width; i++) { for (int j = 0; j < height; j++) { - flipped[i][height - j - 1] = image.getPixelRGBA(i, j); + flipped[i][height - j - 1] = image.getPixel(i, j); } } for (int i = 0; i < width; i++) { for (int j = 0; j < height; j++) { - image.setPixelRGBA(i, j, flipped[i][j]); + image.setPixel(i, j, flipped[i][j]); } } } diff --git a/src/client/java/aztech/modern_industrialization/client/textures/TextureManager.java b/src/client/java/aztech/modern_industrialization/client/textures/TextureManager.java index e2b652ec4..8ed467a0c 100644 --- a/src/client/java/aztech/modern_industrialization/client/textures/TextureManager.java +++ b/src/client/java/aztech/modern_industrialization/client/textures/TextureManager.java @@ -36,19 +36,17 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.BiConsumer; -import net.minecraft.Util; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Util; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; public class TextureManager { private final ResourceProvider rm; private final BiConsumer textureWriter; private final BiConsumer mcMetaWriter; private final Queue endRunnables = new ConcurrentLinkedQueue<>(); - private final Set generatedTextures = ConcurrentHashMap.newKeySet(); private final Gson GSON = new Gson(); @@ -59,11 +57,11 @@ public TextureManager(ResourceProvider rm, BiConsumer textu } public boolean hasAsset(String asset) { - return rm.getResource(ResourceLocation.parse(asset)).isPresent(); + return rm.getResource(Identifier.parse(asset)).isPresent(); } public NativeImage getAssetAsTexture(String textureId) throws IOException { - var resource = rm.getResource(ResourceLocation.parse(textureId)); + var resource = rm.getResource(Identifier.parse(textureId)); if (resource.isPresent()) { try (var stream = resource.get().open()) { return NativeImage.read(stream); @@ -89,7 +87,7 @@ public void addTexture(String textureId, NativeImage image, boolean closeImage) } String overrideId = textureId.replace(":textures/", ":datagen_texture_overrides/"); - Optional overrideResource = rm.getResource(ResourceLocation.parse(overrideId)); + Optional overrideResource = rm.getResource(Identifier.parse(overrideId)); if (overrideResource.isPresent()) { // Copy the override over @@ -102,8 +100,6 @@ public void addTexture(String textureId, NativeImage image, boolean closeImage) textureWriter.accept(image, textureId); } - generatedTextures.add(textureId.replace(":textures/", ":")); - // Close image in any case... if (closeImage) { image.close(); @@ -124,10 +120,4 @@ public CompletableFuture doEndWork() { endRunnables.clear(); return ret; } - - public void markTexturesAsGenerated(ExistingFileHelper helper) { - for (var texture : generatedTextures) { - helper.trackGenerated(ResourceLocation.parse(texture), PackType.CLIENT_RESOURCES, "", "textures"); - } - } } diff --git a/src/client/java/aztech/modern_industrialization/client/textures/coloramp/Coloramp.java b/src/client/java/aztech/modern_industrialization/client/textures/coloramp/Coloramp.java index dffdcc6c2..11c60fa24 100644 --- a/src/client/java/aztech/modern_industrialization/client/textures/coloramp/Coloramp.java +++ b/src/client/java/aztech/modern_industrialization/client/textures/coloramp/Coloramp.java @@ -42,7 +42,7 @@ default NativeImage bakeAsImage() { int r = getRrgb(rgb); int g = getGrgb(rgb); int b = getBrgb(rgb); - image.setPixelRGBA(i, j, fromArgb(255, r, g, b)); + image.setPixelABGR(i, j, fromArgb(255, r, g, b)); } } return image; diff --git a/src/client/java/aztech/modern_industrialization/client/textures/coloramp/TabulatedColoramp.java b/src/client/java/aztech/modern_industrialization/client/textures/coloramp/TabulatedColoramp.java index 9a67ba30d..c4d174b6b 100644 --- a/src/client/java/aztech/modern_industrialization/client/textures/coloramp/TabulatedColoramp.java +++ b/src/client/java/aztech/modern_industrialization/client/textures/coloramp/TabulatedColoramp.java @@ -43,7 +43,7 @@ public TabulatedColoramp(TextureManager mtm, int meanRGB, String name) { if (mtm.hasAsset(gradientMapPath)) { try (NativeImage gradientMap = mtm.getAssetAsTexture(gradientMapPath)) { for (int i = 0; i < 256; i++) { - int color = gradientMap.getPixelRGBA(i, 0); + int color = gradientMap.getPixel(i, 0); int r = getR(color); int g = getG(color); int b = getB(color); diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/ColorHelper.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/ColorHelper.java deleted file mode 100644 index de5f4b4ab..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/ColorHelper.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.nio.ByteOrder; - -/** - * Static routines of general utility for renderer implementations. Renderers are not required to use these helpers, but - * they were designed to be usable without the default renderer. - */ -public abstract class ColorHelper { - private ColorHelper() {} - - private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN; - - /* - * Renderer color format: ARGB (0xAARRGGBB) Vanilla color format (little endian): ABGR (0xAABBGGRR) Vanilla color - * format (big endian): RGBA (0xRRGGBBAA) - * - * Why does the vanilla color format change based on endianness? See VertexConsumer#quad. Quad data is loaded as - * integers into a native byte order buffer. Color is read directly from bytes 12, 13, 14 of each vertex. A - * different byte order will yield different results. - * - * The renderer always uses ARGB because the API color methods always consume and return ARGB. Vanilla block and - * item colors also use ARGB. - */ - - /** - * Converts from ARGB color to ABGR color if little endian or RGBA color if big endian. - */ - public static int toVanillaColor(int color) { - if (color == -1) { - return -1; - } - - if (BIG_ENDIAN) { - // ARGB to RGBA - return ((color & 0x00FFFFFF) << 8) | ((color & 0xFF000000) >>> 24); - } else { - // ARGB to ABGR - return (color & 0xFF00FF00) | ((color & 0x00FF0000) >>> 16) | ((color & 0x000000FF) << 16); - } - } - - /** - * Converts to ARGB color from ABGR color if little endian or RGBA color if big endian. - */ - public static int fromVanillaColor(int color) { - if (color == -1) { - return -1; - } - - if (BIG_ENDIAN) { - // RGBA to ARGB - return ((color & 0xFFFFFF00) >>> 8) | ((color & 0x000000FF) << 24); - } else { - // ABGR to ARGB - return (color & 0xFF00FF00) | ((color & 0x00FF0000) >>> 16) | ((color & 0x000000FF) << 16); - } - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/EncodingFormat.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/EncodingFormat.java deleted file mode 100644 index 5ad03eddd..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/EncodingFormat.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import com.google.common.base.Preconditions; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.VertexFormat; -import net.minecraft.core.Direction; -import net.minecraft.util.Mth; - -/** - * Holds all the array offsets and bit-wise encoders/decoders for packing/unpacking quad data in an array of integers. - * All of this is implementation-specific - that's why it isn't a "helper" class. - */ -public abstract class EncodingFormat { - private EncodingFormat() {} - - static final int HEADER_BITS = 0; - static final int HEADER_COLOR_INDEX = 1; - static final int HEADER_TAG = 2; - public static final int HEADER_STRIDE = 3; - - static final int VERTEX_X; - static final int VERTEX_Y; - static final int VERTEX_Z; - static final int VERTEX_COLOR; - static final int VERTEX_U; - static final int VERTEX_V; - static final int VERTEX_LIGHTMAP; - static final int VERTEX_NORMAL; - public static final int VERTEX_STRIDE; - - public static final int QUAD_STRIDE; - public static final int QUAD_STRIDE_BYTES; - public static final int TOTAL_STRIDE; - - static { - final VertexFormat format = DefaultVertexFormat.BLOCK; - VERTEX_X = HEADER_STRIDE + 0; - VERTEX_Y = HEADER_STRIDE + 1; - VERTEX_Z = HEADER_STRIDE + 2; - VERTEX_COLOR = HEADER_STRIDE + 3; - VERTEX_U = HEADER_STRIDE + 4; - VERTEX_V = VERTEX_U + 1; - VERTEX_LIGHTMAP = HEADER_STRIDE + 6; - VERTEX_NORMAL = HEADER_STRIDE + 7; - VERTEX_STRIDE = format.getVertexSize() / 4; - QUAD_STRIDE = VERTEX_STRIDE * 4; - QUAD_STRIDE_BYTES = QUAD_STRIDE * 4; - TOTAL_STRIDE = HEADER_STRIDE + QUAD_STRIDE; - - Preconditions.checkState(VERTEX_STRIDE == QuadView.VANILLA_VERTEX_STRIDE, - "Indigo vertex stride (%s) mismatched with rendering API (%s)", VERTEX_STRIDE, - QuadView.VANILLA_VERTEX_STRIDE); - Preconditions.checkState(QUAD_STRIDE == QuadView.VANILLA_QUAD_STRIDE, - "Indigo quad stride (%s) mismatched with rendering API (%s)", QUAD_STRIDE, - QuadView.VANILLA_QUAD_STRIDE); - } - - /** used for quick clearing of quad buffers. */ - static final int[] EMPTY = new int[TOTAL_STRIDE]; - - private static final int DIRECTION_MASK = Mth.smallestEncompassingPowerOfTwo(ModelHelper.NULL_FACE_ID) - 1; - private static final int DIRECTION_BIT_COUNT = Integer.bitCount(DIRECTION_MASK); - private static final int CULL_SHIFT = 0; - private static final int CULL_INVERSE_MASK = ~(DIRECTION_MASK << CULL_SHIFT); - private static final int LIGHT_SHIFT = CULL_SHIFT + DIRECTION_BIT_COUNT; - private static final int LIGHT_INVERSE_MASK = ~(DIRECTION_MASK << LIGHT_SHIFT); - private static final int NORMALS_SHIFT = LIGHT_SHIFT + DIRECTION_BIT_COUNT; - private static final int NORMALS_COUNT = 4; - private static final int NORMALS_MASK = (1 << NORMALS_COUNT) - 1; - private static final int NORMALS_INVERSE_MASK = ~(NORMALS_MASK << NORMALS_SHIFT); - private static final int GEOMETRY_SHIFT = NORMALS_SHIFT + NORMALS_COUNT; - private static final int GEOMETRY_MASK = (1 << GeometryHelper.FLAG_BIT_COUNT) - 1; - private static final int GEOMETRY_INVERSE_MASK = ~(GEOMETRY_MASK << GEOMETRY_SHIFT); - private static final int MATERIAL_SHIFT = GEOMETRY_SHIFT + GeometryHelper.FLAG_BIT_COUNT; - private static final int MATERIAL_MASK = Mth.smallestEncompassingPowerOfTwo(1) - 1; - private static final int MATERIAL_BIT_COUNT = Integer.bitCount(MATERIAL_MASK); - private static final int MATERIAL_INVERSE_MASK = ~(MATERIAL_MASK << MATERIAL_SHIFT); - - static { - Preconditions.checkArgument(MATERIAL_SHIFT + MATERIAL_BIT_COUNT <= 32, - "Indigo header encoding bit count (%s) exceeds integer bit length)", TOTAL_STRIDE); - } - - static Direction cullFace(int bits) { - return ModelHelper.faceFromIndex((bits >> CULL_SHIFT) & DIRECTION_MASK); - } - - static int cullFace(int bits, Direction face) { - return (bits & CULL_INVERSE_MASK) | (ModelHelper.toFaceIndex(face) << CULL_SHIFT); - } - - static Direction lightFace(int bits) { - return ModelHelper.faceFromIndex((bits >> LIGHT_SHIFT) & DIRECTION_MASK); - } - - static int lightFace(int bits, Direction face) { - return (bits & LIGHT_INVERSE_MASK) | (ModelHelper.toFaceIndex(face) << LIGHT_SHIFT); - } - - /** indicate if vertex normal has been set - bits correspond to vertex ordinals. */ - static int normalFlags(int bits) { - return (bits >> NORMALS_SHIFT) & NORMALS_MASK; - } - - static int normalFlags(int bits, int normalFlags) { - return (bits & NORMALS_INVERSE_MASK) | ((normalFlags & NORMALS_MASK) << NORMALS_SHIFT); - } - - static int geometryFlags(int bits) { - return (bits >> GEOMETRY_SHIFT) & GEOMETRY_MASK; - } - - static int geometryFlags(int bits, int geometryFlags) { - return (bits & GEOMETRY_INVERSE_MASK) | ((geometryFlags & GEOMETRY_MASK) << GEOMETRY_SHIFT); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/GeometryHelper.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/GeometryHelper.java deleted file mode 100644 index 3be22ba5d..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/GeometryHelper.java +++ /dev/null @@ -1,274 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import static net.minecraft.util.Mth.equal; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.core.Direction; -import net.minecraft.core.Direction.Axis; -import net.minecraft.core.Direction.AxisDirection; -import org.joml.Vector3f; -import org.jspecify.annotations.Nullable; - -/** - * Static routines of general utility for renderer implementations. Renderers are not required to use these helpers, but - * they were designed to be usable without the default renderer. - */ -public abstract class GeometryHelper { - private GeometryHelper() {} - - /** set when a quad touches all four corners of a unit cube. */ - public static final int CUBIC_FLAG = 1; - - /** set when a quad is parallel to (but not necessarily on) a its light face. */ - public static final int AXIS_ALIGNED_FLAG = CUBIC_FLAG << 1; - - /** set when a quad is coplanar with its light face. Implies {@link #AXIS_ALIGNED_FLAG} */ - public static final int LIGHT_FACE_FLAG = AXIS_ALIGNED_FLAG << 1; - - /** how many bits quad header encoding should reserve for encoding geometry flags. */ - public static final int FLAG_BIT_COUNT = 3; - - private static final float EPS_MIN = 0.0001f; - private static final float EPS_MAX = 1.0f - EPS_MIN; - - /** - * Analyzes the quad and returns a value with some combination of {@link #AXIS_ALIGNED_FLAG}, - * {@link #LIGHT_FACE_FLAG} and {@link #CUBIC_FLAG}. Intended use is to optimize lighting when the geometry is - * regular. Expects convex quads with all points co-planar. - */ - public static int computeShapeFlags(QuadView quad) { - Direction lightFace = quad.lightFace(); - int bits = 0; - - if (isQuadParallelToFace(lightFace, quad)) { - bits |= AXIS_ALIGNED_FLAG; - - if (isParallelQuadOnFace(lightFace, quad)) { - bits |= LIGHT_FACE_FLAG; - } - } - - if (isQuadCubic(lightFace, quad)) { - bits |= CUBIC_FLAG; - } - - return bits; - } - - /** - * Returns true if quad is parallel to the given face. Does not validate quad winding order. Expects convex quads - * with all points co-planar. - */ - public static boolean isQuadParallelToFace(@Nullable Direction face, QuadView quad) { - if (face == null) { - return false; - } - - int i = face.getAxis().ordinal(); - final float val = quad.posByIndex(0, i); - return equal(val, quad.posByIndex(1, i)) && equal(val, quad.posByIndex(2, i)) - && equal(val, quad.posByIndex(3, i)); - } - - /** - * True if quad - already known to be parallel to a face - is actually coplanar with it. For compatibility with - * vanilla resource packs, also true if quad is outside the face. - * - *

- * Test will be unreliable if not already parallel, use {@link #isQuadParallelToFace(Direction, QuadView)} for that - * purpose. Expects convex quads with all points co-planar. - */ - public static boolean isParallelQuadOnFace(@Nullable Direction lightFace, QuadView quad) { - if (lightFace == null) - return false; - - final float x = quad.posByIndex(0, lightFace.getAxis().ordinal()); - return lightFace.getAxisDirection() == AxisDirection.POSITIVE ? x >= EPS_MAX : x <= EPS_MIN; - } - - /** - * Returns true if quad is truly a quad (not a triangle) and fills a full block cross-section. If known to be true, - * allows use of a simpler/faster AO lighting algorithm. - * - *

- * Does not check if quad is actually coplanar with the light face, nor does it check that all quad vertices are - * coplanar with each other. - * - *

- * Expects convex quads with all points co-planar. - * - * @param lightFace MUST be non-null. - */ - public static boolean isQuadCubic(@Nullable Direction lightFace, QuadView quad) { - if (lightFace == null) { - return false; - } - - int a, b; - - switch (lightFace) { - case EAST: - case WEST: - a = 1; - b = 2; - break; - case UP: - case DOWN: - a = 0; - b = 2; - break; - case SOUTH: - case NORTH: - a = 1; - b = 0; - break; - default: - // handle WTF case - return false; - } - - return confirmSquareCorners(a, b, quad); - } - - /** - * Used by {@link #isQuadCubic(Direction, QuadView)}. True if quad touches all four corners of unit square. - * - *

- * For compatibility with resource packs that contain models with quads exceeding block boundaries, considers - * corners outside the block to be at the corners. - */ - private static boolean confirmSquareCorners(int aCoordinate, int bCoordinate, QuadView quad) { - int flags = 0; - - for (int i = 0; i < 4; i++) { - final float a = quad.posByIndex(i, aCoordinate); - final float b = quad.posByIndex(i, bCoordinate); - - if (a <= EPS_MIN) { - if (b <= EPS_MIN) { - flags |= 1; - } else if (b >= EPS_MAX) { - flags |= 2; - } else { - return false; - } - } else if (a >= EPS_MAX) { - if (b <= EPS_MIN) { - flags |= 4; - } else if (b >= EPS_MAX) { - flags |= 8; - } else { - return false; - } - } else { - return false; - } - } - - return flags == 15; - } - - /** - * Identifies the face to which the quad is most closely aligned. This mimics the value that - * {@link BakedQuad#getDirection()} returns, and is used in the vanilla renderer for all diffuse lighting. - * - *

- * Derived from the quad face normal and expects convex quads with all points co-planar. - */ - public static Direction lightFace(QuadView quad) { - final Vector3f normal = quad.faceNormal(); - switch (GeometryHelper.longestAxis(normal)) { - case X: - return normal.x() > 0 ? Direction.EAST : Direction.WEST; - - case Y: - return normal.y() > 0 ? Direction.UP : Direction.DOWN; - - case Z: - return normal.z() > 0 ? Direction.SOUTH : Direction.NORTH; - - default: - // handle WTF case - return Direction.UP; - } - } - - /** - * Simple 4-way compare, doesn't handle NaN values. - */ - public static float min(float a, float b, float c, float d) { - final float x = a < b ? a : b; - final float y = c < d ? c : d; - return x < y ? x : y; - } - - /** - * Simple 4-way compare, doesn't handle NaN values. - */ - public static float max(float a, float b, float c, float d) { - final float x = a > b ? a : b; - final float y = c > d ? c : d; - return x > y ? x : y; - } - - /** - * @see #longestAxis(float, float, float) - */ - public static Axis longestAxis(Vector3f vec) { - return longestAxis(vec.x(), vec.y(), vec.z()); - } - - /** - * Identifies the largest (max absolute magnitude) component (X, Y, Z) in the given vector. - */ - public static Axis longestAxis(float normalX, float normalY, float normalZ) { - Axis result = Axis.Y; - float longest = Math.abs(normalY); - float a = Math.abs(normalX); - - if (a > longest) { - result = Axis.X; - longest = a; - } - - return Math.abs(normalZ) > longest - ? Axis.Z - : result; - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/Mesh.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/Mesh.java deleted file mode 100644 index 76a3ba485..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/Mesh.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.function.Consumer; - -/** - * A bundle of one or more {@link QuadView} instances encoded by the renderer. - * - *

- * Similar in purpose to the {@code List} instances returned by BakedModel, but affords the renderer the - * ability to optimize the format for performance and memory allocation. - * - *

- * Only the renderer should implement or extend this interface. - */ -public interface Mesh { - /** - * Use to access all of the quads encoded in this mesh. The quad instances sent to the consumer will likely be - * threadlocal/reused and should never be retained by the consumer. - */ - void forEach(Consumer consumer); - - /** - * Outputs all quads in this mesh to the given quad emitter. - * - * @apiNote The default implementation will be removed in the next breaking release. - */ - void outputTo(QuadEmitter emitter); -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshBuilder.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshBuilder.java deleted file mode 100644 index 236d0eca2..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshBuilder.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import com.mojang.blaze3d.vertex.BufferBuilder; - -/** - * Similar in purpose to {@link BufferBuilder} but simpler and not tied to NIO or any other specific implementation, - * plus designed to handle both static and dynamic building. - * - *

- * Decouples models from the vertex format(s) used by ModelRenderer to allow compatibility across diverse - * implementations. - */ -public interface MeshBuilder { - /** - * Returns the {@link QuadEmitter} used to append quad to this mesh. Calling this method a second time invalidates - * any prior result. Do not retain references outside the context of building the mesh. - */ - QuadEmitter getEmitter(); - - /** - * Returns a new {@link Mesh} instance containing all quads added to this builder and resets the builder to an empty - * state. - */ - Mesh build(); -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshBuilderImpl.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshBuilderImpl.java deleted file mode 100644 index 4e0e83745..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshBuilderImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Our implementation of {@link MeshBuilder}, used for static mesh creation and baking. Not much to it - mainly it just - * needs to grow the int[] array as quads are appended and maintain/provide a properly-configured - * {@link MutableQuadView} instance. All the encoding and other work is handled in the quad base classes. The one - * interesting bit is in {@link Maker#emit()}. - */ -public class MeshBuilderImpl implements MeshBuilder { - int[] data = new int[256]; - private final Maker maker = new Maker(); - int index = 0; - int limit = data.length; - - protected void ensureCapacity(int stride) { - if (stride > limit - index) { - limit *= 2; - final int[] bigger = new int[limit]; - System.arraycopy(data, 0, bigger, 0, index); - data = bigger; - maker.data = bigger; - } - } - - @Override - public Mesh build() { - final int[] packed = new int[index]; - System.arraycopy(data, 0, packed, 0, index); - index = 0; - maker.begin(data, index); - return new MeshImpl(packed); - } - - @Override - public QuadEmitter getEmitter() { - ensureCapacity(EncodingFormat.TOTAL_STRIDE); - maker.begin(data, index); - return maker; - } - - /** - * Our base classes are used differently so we define final encoding steps in subtypes. This will be a static mesh - * used at render time so we want to capture all geometry now and apply non-location-dependent lighting. - */ - private class Maker extends MutableQuadViewImpl { - @Override - public void emitDirectly() { - computeGeometry(); - index += EncodingFormat.TOTAL_STRIDE; - ensureCapacity(EncodingFormat.TOTAL_STRIDE); - baseIndex = index; - } - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshImpl.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshImpl.java deleted file mode 100644 index a5a58d2c2..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MeshImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.function.Consumer; - -/** - * Implementation of {@link Mesh}. The way we encode meshes makes it very simple. - */ -public class MeshImpl implements Mesh { - /** Used to satisfy external calls to {@link #forEach(Consumer)}. */ - ThreadLocal POOL = ThreadLocal.withInitial(QuadViewImpl::new); - - final int[] data; - - MeshImpl(int[] data) { - this.data = data; - } - - public int[] data() { - return data; - } - - @Override - public void forEach(Consumer consumer) { - forEach(consumer, POOL.get()); - } - - /** - * The renderer will call this with it's own cursor to avoid the performance hit of a thread-local lookup. Also - * means renderer can hold final references to quad buffers. - */ - void forEach(Consumer consumer, QuadViewImpl cursor) { - final int limit = data.length; - int index = 0; - - while (index < limit) { - cursor.load(data, index); - consumer.accept(cursor); - index += EncodingFormat.TOTAL_STRIDE; - } - } - - @Override - public void outputTo(QuadEmitter emitter) { - MutableQuadViewImpl e = (MutableQuadViewImpl) emitter; - final int[] data = this.data; - final int limit = data.length; - int index = 0; - - while (index < limit) { - System.arraycopy(data, index, e.data, e.baseIndex, EncodingFormat.TOTAL_STRIDE); - e.load(); - e.emitDirectly(); - index += EncodingFormat.TOTAL_STRIDE; - } - - e.clear(); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/ModelHelper.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/ModelHelper.java deleted file mode 100644 index 8524831fd..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/ModelHelper.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Arrays; -import net.minecraft.client.renderer.block.model.ItemTransform; -import net.minecraft.client.renderer.block.model.ItemTransforms; -import net.minecraft.core.Direction; -import net.minecraft.util.Mth; -import org.joml.Vector3f; -import org.jspecify.annotations.Nullable; - -/** - * Collection of utilities for model implementations. - */ -public abstract class ModelHelper { - private ModelHelper() {} - - /** Result from {@link #toFaceIndex(Direction)} for null values. */ - public static final int NULL_FACE_ID = 6; - - /** - * Convenient way to encode faces that may be null. Null is returned as {@link #NULL_FACE_ID}. Use - * {@link #faceFromIndex(int)} to retrieve encoded face. - */ - public static int toFaceIndex(@Nullable Direction face) { - return face == null ? NULL_FACE_ID : face.get3DDataValue(); - } - - /** - * Use to decode a result from {@link #toFaceIndex(Direction)}. Return value will be null if encoded value was null. - * Can also be used for no-allocation iteration of {@link Direction#values()}, optionally including the null face. - * (Use < or <= {@link #NULL_FACE_ID} to exclude or include the null value, respectively.) - */ - public static @Nullable Direction faceFromIndex(int faceIndex) { - return FACES[faceIndex]; - } - - /** @see #faceFromIndex(int) */ - private static final @Nullable Direction[] FACES = Arrays.copyOf(Direction.values(), 7); - - /** - * The vanilla model transformation logic is closely coupled with model deserialization. That does little good for - * modded model loaders and procedurally generated models. This convenient construction method applies the same - * scaling factors used for vanilla models. This means you can use values from a vanilla JSON file as inputs to this - * method. - */ - private static ItemTransform makeTransform(float rotationX, float rotationY, float rotationZ, float translationX, - float translationY, float translationZ, float scaleX, float scaleY, float scaleZ) { - Vector3f translation = new Vector3f(translationX, translationY, translationZ); - translation.mul(0.0625f); - translation = new Vector3f( - Mth.clamp(translation.x, -5f, 5f), - Mth.clamp(translation.y, -5f, 5f), - Mth.clamp(translation.z, -5f, 5f)); - return new ItemTransform(new Vector3f(rotationX, rotationY, rotationZ), translation, - new Vector3f(scaleX, scaleY, scaleZ)); - } - - public static final ItemTransform TRANSFORM_BLOCK_GUI = makeTransform(30, 225, 0, 0, 0, 0, 0.625f, 0.625f, 0.625f); - public static final ItemTransform TRANSFORM_BLOCK_GROUND = makeTransform(0, 0, 0, 0, 3, 0, 0.25f, 0.25f, 0.25f); - public static final ItemTransform TRANSFORM_BLOCK_FIXED = makeTransform(0, 0, 0, 0, 0, 0, 0.5f, 0.5f, 0.5f); - public static final ItemTransform TRANSFORM_BLOCK_3RD_PERSON_RIGHT = makeTransform(75, 45, 0, 0, 2.5f, 0, 0.375f, - 0.375f, 0.375f); - public static final ItemTransform TRANSFORM_BLOCK_1ST_PERSON_RIGHT = makeTransform(0, 45, 0, 0, 0, 0, 0.4f, 0.4f, - 0.4f); - public static final ItemTransform TRANSFORM_BLOCK_1ST_PERSON_LEFT = makeTransform(0, 225, 0, 0, 0, 0, 0.4f, 0.4f, - 0.4f); - - /** - * Mimics the vanilla model transformation used for most vanilla blocks, and should be suitable for most custom - * block-like models. - */ - public static final ItemTransforms MODEL_TRANSFORM_BLOCK = new ItemTransforms(TRANSFORM_BLOCK_3RD_PERSON_RIGHT, - TRANSFORM_BLOCK_3RD_PERSON_RIGHT, TRANSFORM_BLOCK_1ST_PERSON_LEFT, TRANSFORM_BLOCK_1ST_PERSON_RIGHT, - ItemTransform.NO_TRANSFORM, TRANSFORM_BLOCK_GUI, TRANSFORM_BLOCK_GROUND, TRANSFORM_BLOCK_FIXED); -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MutableQuadView.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MutableQuadView.java deleted file mode 100644 index 0dff1bc8f..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MutableQuadView.java +++ /dev/null @@ -1,283 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; - -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.core.Direction; -import org.joml.Vector2f; -import org.joml.Vector3f; -import org.jspecify.annotations.Nullable; - -/** - * A mutable {@link QuadView} instance. The base interface for {@link QuadEmitter} and for dynamic renders/mesh - * transforms. - * - *

- * Instances of {@link MutableQuadView} will practically always be thread local and/or reused - do not retain - * references. - * - *

- * Only the renderer should implement or extend this interface. - */ -public interface MutableQuadView extends QuadView { - /** - * Causes texture to appear with no rotation. Pass in bakeFlags parameter to - * {@link #spriteBake(TextureAtlasSprite, int)}. - */ - int BAKE_ROTATE_NONE = 0; - - /** - * Causes texture to appear rotated 90 deg. clockwise relative to nominal face. Pass in bakeFlags parameter to - * {@link #spriteBake(TextureAtlasSprite, int)}. - */ - int BAKE_ROTATE_90 = 1; - - /** - * Causes texture to appear rotated 180 deg. relative to nominal face. Pass in bakeFlags parameter to - * {@link #spriteBake(TextureAtlasSprite, int)}. - */ - int BAKE_ROTATE_180 = 2; - - /** - * Causes texture to appear rotated 270 deg. clockwise relative to nominal face. Pass in bakeFlags parameter to - * {@link #spriteBake(TextureAtlasSprite, int)}. - */ - int BAKE_ROTATE_270 = 3; - - /** - * When enabled, texture coordinate are assigned based on vertex position. Any existing UV coordinates will be - * replaced. Pass in bakeFlags parameter to {@link #spriteBake(TextureAtlasSprite, int)}. - * - *

- * UV lock always derives texture coordinates based on nominal face, even when the quad is not co-planar with that - * face, and the result is the same as if the quad were projected onto the nominal face, which is usually the - * desired result. - */ - int BAKE_LOCK_UV = 4; - - /** - * When set, U texture coordinates for the given sprite are flipped as part of baking. Can be useful for some - * randomization and texture mapping scenarios. Results are different from what can be obtained via rotation and - * both can be applied. Pass in bakeFlags parameter to {@link #spriteBake(TextureAtlasSprite, int)}. - */ - int BAKE_FLIP_U = 8; - - /** - * Same as {@link #BAKE_FLIP_U} but for V coordinate. - */ - int BAKE_FLIP_V = 16; - - /** - * UV coordinates by default are assumed to be 0-16 scale for consistency with conventional Minecraft model format. - * This is scaled to 0-1 during baking before interpolation. Model loaders that already have 0-1 coordinates can - * avoid wasteful multiplication/division by passing 0-1 coordinates directly. Pass in bakeFlags parameter to - * {@link #spriteBake(TextureAtlasSprite, int)}. - */ - int BAKE_NORMALIZED = 32; - - /** - * Sets the geometric vertex position for the given vertex, relative to block origin, (0,0,0). Minecraft rendering - * is designed for models that fit within a single block space and is recommended that coordinates remain in the 0-1 - * range, with multi-block meshes split into multiple per-block models. - */ - MutableQuadView pos(int vertexIndex, float x, float y, float z); - - /** - * Same as {@link #pos(int, float, float, float)} but accepts vector type. - */ - default MutableQuadView pos(int vertexIndex, Vector3f pos) { - return pos(vertexIndex, pos.x(), pos.y(), pos.z()); - } - - /** - * Set vertex color. - */ - MutableQuadView color(int vertexIndex, int color); - - /** - * Convenience: set vertex color for all vertices at once. - */ - default MutableQuadView color(int c0, int c1, int c2, int c3) { - color(0, c0); - color(1, c1); - color(2, c2); - color(3, c3); - return this; - } - - /** - * Set texture coordinates. - */ - MutableQuadView uv(int vertexIndex, float u, float v); - - /** - * Set texture coordinates. - * - *

- * Only use this function if you already have a {@link Vector2f}. Otherwise, see - * {@link MutableQuadView#uv(int, float, float)}. - */ - default MutableQuadView uv(int vertexIndex, Vector2f uv) { - return uv(vertexIndex, uv.x, uv.y); - } - - /** - * Assigns sprite atlas u,v coordinates to this quad for the given sprite. Can handle UV locking, rotation, - * interpolation, etc. Control this behavior by passing additive combinations of the BAKE_ flags defined in this - * interface. - */ - MutableQuadView spriteBake(TextureAtlasSprite sprite, int bakeFlags); - - /** - * Accept vanilla lightmap values. Input values will override lightmap values computed from world state if input - * values are higher. Exposed for completeness but some rendering implementations with non-standard lighting model - * may not honor it. - * - *

- * For emissive rendering, it is better to use {@link MaterialFinder#emissive(boolean)}. - */ - MutableQuadView lightmap(int vertexIndex, int lightmap); - - /** - * Convenience: set lightmap for all vertices at once. - * - *

- * For emissive rendering, it is better to use {@link MaterialFinder#emissive(boolean)}. See - * {@link #lightmap(int, int)}. - */ - default MutableQuadView lightmap(int b0, int b1, int b2, int b3) { - lightmap(0, b0); - lightmap(1, b1); - lightmap(2, b2); - lightmap(3, b3); - return this; - } - - /** - * Adds a vertex normal. Models that have per-vertex normals should include them to get correct lighting when it - * matters. Computed face normal is used when no vertex normal is provided. - * - *

- * {@link Renderer} implementations should honor vertex normals for diffuse lighting - modifying vertex color(s) or - * packing normals in the vertex buffer as appropriate for the rendering method/vertex format in effect. - */ - MutableQuadView normal(int vertexIndex, float x, float y, float z); - - /** - * Same as {@link #normal(int, float, float, float)} but accepts vector type. - */ - default MutableQuadView normal(int vertexIndex, Vector3f normal) { - return normal(vertexIndex, normal.x(), normal.y(), normal.z()); - } - - /** - * If non-null, quad is coplanar with a block face which, if known, simplifies or shortcuts geometric analysis that - * might otherwise be needed. Set to null if quad is not coplanar or if this is not known. Also controls face - * culling during block rendering. - * - *

- * Null by default. - * - *

- * When called with a non-null value, also sets {@link #nominalFace(Direction)} to the same value. - * - *

- * This is different from the value reported by {@link BakedQuad#getDirection()}. That value is computed based on - * face geometry and must be non-null in vanilla quads. That computed value is returned by {@link #lightFace()}. - */ - MutableQuadView cullFace(@Nullable Direction face); - - /** - * Provides a hint to renderer about the facing of this quad. Not required, but if provided can shortcut some - * geometric analysis if the quad is parallel to a block face. Should be the expected value of {@link #lightFace()}. - * Value will be confirmed and if invalid the correct light face will be calculated. - * - *

- * Null by default, and set automatically by {@link #cullFace()}. - * - *

- * Models may also find this useful as the face for texture UV locking and rotation semantics. - * - *

- * Note: This value is not persisted independently when the quad is encoded. When reading encoded quads, this value - * will always be the same as {@link #lightFace()}. - */ - MutableQuadView nominalFace(@Nullable Direction face); - - /** - * Value functions identically to {@link BakedQuad#getTintIndex()} and is used by renderer / model builder in same - * way. Default value is -1. - */ - MutableQuadView colorIndex(int colorIndex); - - /** - * Encodes an integer tag with this quad that can later be retrieved via {@link QuadView#tag()}. Useful for models - * that want to perform conditional transformation or filtering on static meshes. - */ - MutableQuadView tag(int tag); - - /** - * Enables bulk vertex data transfer using the standard Minecraft vertex formats. Only the - * {@link BakedQuad#getVertices() quad vertex data} is copied. This method should be performant whenever caller's - * vertex representation makes it feasible. - * - *

- * Use {@link #fromVanilla(BakedQuad, RenderMaterial, Direction) the other overload} which has better encapsulation - * unless you have a specific reason to use this one. - * - *

- * Calling this method does not emit the quad. - */ - MutableQuadView fromVanilla(int[] quadData, int startIndex); - - /** - * Enables bulk vertex data transfer using the standard Minecraft quad format. - * - *

- * Calling this method does not emit the quad. - * - *

- * The material applied to this quad view might be slightly different from the {@code material} parameter regarding - * diffuse shading. If either the baked quad {@link BakedQuad#isShade() does not have shade} or the material - * {@link MaterialFinder#disableDiffuse(boolean) does not have shade}, diffuse shading will be disabled for this - * quad view. This is reflected in the quad view's {@link #material()}, but the {@code material} parameter is - * unchanged (it is immutable anyway). - */ - MutableQuadView fromVanilla(BakedQuad quad, @Nullable Direction cullFace); -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MutableQuadViewImpl.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MutableQuadViewImpl.java deleted file mode 100644 index 15a5e7b54..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/MutableQuadViewImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import static aztech.modern_industrialization.client.thirdparty.fabricrendering.EncodingFormat.*; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.core.Direction; -import org.jspecify.annotations.Nullable; - -/** - * Almost-concrete implementation of a mutable quad. The only missing part is {@link #emit()}, because that depends on - * where/how it is used. (Mesh encoding vs. render-time transformation). - */ -public abstract class MutableQuadViewImpl extends QuadViewImpl implements QuadEmitter { - public final void begin(int[] data, int baseIndex) { - this.data = data; - this.baseIndex = baseIndex; - clear(); - } - - public void clear() { - System.arraycopy(EMPTY, 0, data, baseIndex, EncodingFormat.TOTAL_STRIDE); - isGeometryInvalid = true; - nominalFace = null; - normalFlags(0); - tag(0); - colorIndex(-1); - cullFace(null); - } - - @Override - public MutableQuadViewImpl pos(int vertexIndex, float x, float y, float z) { - final int index = baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_X; - data[index] = Float.floatToRawIntBits(x); - data[index + 1] = Float.floatToRawIntBits(y); - data[index + 2] = Float.floatToRawIntBits(z); - isGeometryInvalid = true; - return this; - } - - @Override - public MutableQuadViewImpl color(int vertexIndex, int color) { - data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_COLOR] = color; - return this; - } - - @Override - public MutableQuadViewImpl uv(int vertexIndex, float u, float v) { - final int i = baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_U; - data[i] = Float.floatToRawIntBits(u); - data[i + 1] = Float.floatToRawIntBits(v); - return this; - } - - @Override - public MutableQuadViewImpl spriteBake(TextureAtlasSprite sprite, int bakeFlags) { - TextureHelper.bakeSprite(this, sprite, bakeFlags); - return this; - } - - @Override - public MutableQuadViewImpl lightmap(int vertexIndex, int lightmap) { - data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_LIGHTMAP] = lightmap; - return this; - } - - protected void normalFlags(int flags) { - data[baseIndex + HEADER_BITS] = EncodingFormat.normalFlags(data[baseIndex + HEADER_BITS], flags); - } - - @Override - public MutableQuadViewImpl normal(int vertexIndex, float x, float y, float z) { - normalFlags(normalFlags() | (1 << vertexIndex)); - data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_NORMAL] = NormalHelper.packNormal(x, y, z, 0); - return this; - } - - /** - * Internal helper method. Copies face normals to vertex normals lacking one. - */ - public final void populateMissingNormals() { - final int normalFlags = this.normalFlags(); - - if (normalFlags == 0b1111) - return; - - final int packedFaceNormal = NormalHelper.packNormal(faceNormal(), 0); - - for (int v = 0; v < 4; v++) { - if ((normalFlags & (1 << v)) == 0) { - data[baseIndex + v * VERTEX_STRIDE + VERTEX_NORMAL] = packedFaceNormal; - } - } - - normalFlags(0b1111); - } - - @Override - public final MutableQuadViewImpl cullFace(@Nullable Direction face) { - data[baseIndex + HEADER_BITS] = EncodingFormat.cullFace(data[baseIndex + HEADER_BITS], face); - nominalFace(face); - return this; - } - - @Override - public final MutableQuadViewImpl nominalFace(@Nullable Direction face) { - nominalFace = face; - return this; - } - - @Override - public final MutableQuadViewImpl colorIndex(int colorIndex) { - data[baseIndex + HEADER_COLOR_INDEX] = colorIndex; - return this; - } - - @Override - public final MutableQuadViewImpl tag(int tag) { - data[baseIndex + HEADER_TAG] = tag; - return this; - } - - @Override - public final MutableQuadViewImpl fromVanilla(int[] quadData, int startIndex) { - System.arraycopy(quadData, startIndex, data, baseIndex + HEADER_STRIDE, VANILLA_QUAD_STRIDE); - isGeometryInvalid = true; - - int colorIndex = baseIndex + VERTEX_COLOR; - - for (int i = 0; i < 4; i++) { - data[colorIndex] = ColorHelper.fromVanillaColor(data[colorIndex]); - colorIndex += VERTEX_STRIDE; - } - - return this; - } - - @Override - public final MutableQuadViewImpl fromVanilla(BakedQuad quad, @Nullable Direction cullFace) { - fromVanilla(quad.getVertices(), 0); - data[baseIndex + HEADER_BITS] = EncodingFormat.cullFace(0, cullFace); - nominalFace(quad.getDirection()); - colorIndex(quad.getTintIndex()); - - tag(0); - return this; - } - - /** - * Emit the quad without clearing the underlying data. - * Geometry is not guaranteed to be valid when called, but can be computed by calling {@link #computeGeometry()}. - */ - public abstract void emitDirectly(); - - @Override - public final MutableQuadViewImpl emit() { - emitDirectly(); - clear(); - return this; - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/NormalHelper.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/NormalHelper.java deleted file mode 100644 index 5e2925830..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/NormalHelper.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import net.minecraft.core.Direction; -import net.minecraft.core.Vec3i; -import net.minecraft.util.Mth; -import org.joml.Vector3f; - -/** - * Static routines of general utility for renderer implementations. Renderers are not required to use these helpers, but - * they were designed to be usable without the default renderer. - */ -public abstract class NormalHelper { - private NormalHelper() {} - - /** - * Stores a normal plus an extra value as a quartet of signed bytes. This is the same normal format that vanilla - * item rendering expects. The extra value is for use by shaders. - */ - public static int packNormal(float x, float y, float z, float w) { - x = Mth.clamp(x, -1, 1); - y = Mth.clamp(y, -1, 1); - z = Mth.clamp(z, -1, 1); - w = Mth.clamp(w, -1, 1); - - return ((int) (x * 127) & 255) | (((int) (y * 127) & 255) << 8) | (((int) (z * 127) & 255) << 16) - | (((int) (w * 127) & 255) << 24); - } - - /** - * Version of {@link #packNormal(float, float, float, float)} that accepts a vector type. - */ - public static int packNormal(Vector3f normal, float w) { - return packNormal(normal.x(), normal.y(), normal.z(), w); - } - - /** - * Retrieves values packed by {@link #packNormal(float, float, float, float)}. - * - *

- * Components are x, y, z, w - zero based. - */ - public static float getPackedNormalComponent(int packedNormal, int component) { - return ((byte) (packedNormal >> (8 * component))) / 127f; - } - - /** - * Computes the face normal of the given quad and saves it in the provided non-null vector. If - * {@link QuadView#nominalFace()} is set will optimize by confirming quad is parallel to that face and, if so, use - * the standard normal for that face direction. - * - *

- * Will work with triangles also. Assumes counter-clockwise winding order, which is the norm. Expects convex quads - * with all points co-planar. - */ - public static void computeFaceNormal(Vector3f saveTo, QuadView q) { - final Direction nominalFace = q.nominalFace(); - - if (GeometryHelper.isQuadParallelToFace(nominalFace, q)) { - Vec3i vec = nominalFace.getNormal(); - saveTo.set(vec.getX(), vec.getY(), vec.getZ()); - return; - } - - final float x0 = q.x(0); - final float y0 = q.y(0); - final float z0 = q.z(0); - final float x1 = q.x(1); - final float y1 = q.y(1); - final float z1 = q.z(1); - final float x2 = q.x(2); - final float y2 = q.y(2); - final float z2 = q.z(2); - final float x3 = q.x(3); - final float y3 = q.y(3); - final float z3 = q.z(3); - - final float dx0 = x2 - x0; - final float dy0 = y2 - y0; - final float dz0 = z2 - z0; - final float dx1 = x3 - x1; - final float dy1 = y3 - y1; - final float dz1 = z3 - z1; - - float normX = dy0 * dz1 - dz0 * dy1; - float normY = dz0 * dx1 - dx0 * dz1; - float normZ = dx0 * dy1 - dy0 * dx1; - - float l = (float) Math.sqrt(normX * normX + normY * normY + normZ * normZ); - - if (l != 0) { - normX /= l; - normY /= l; - normZ /= l; - } - - saveTo.set(normX, normY, normZ); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadBuffer.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadBuffer.java deleted file mode 100644 index 54dd3eabe..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadBuffer.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; - -public class QuadBuffer extends MutableQuadViewImpl { - { - data = new int[EncodingFormat.TOTAL_STRIDE]; - clear(); - } - - @Override - public void emitDirectly() {} -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadEmitter.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadEmitter.java deleted file mode 100644 index 7d2c9130d..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadEmitter.java +++ /dev/null @@ -1,187 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.core.Direction; -import org.joml.Vector2f; -import org.joml.Vector3f; - -/** - * Specialized {@link MutableQuadView} obtained via {@link MeshBuilder#getEmitter()} to append quads during mesh - * building. - * - *

- * Instances of {@link QuadEmitter} will practically always be threadlocal and/or reused - do not retain references. - * - *

- * Only the renderer should implement or extend this interface. - */ -public interface QuadEmitter extends MutableQuadView { - @Override - QuadEmitter pos(int vertexIndex, float x, float y, float z); - - @Override - default QuadEmitter pos(int vertexIndex, Vector3f pos) { - MutableQuadView.super.pos(vertexIndex, pos); - return this; - } - - @Override - QuadEmitter color(int vertexIndex, int color); - - @Override - default QuadEmitter color(int c0, int c1, int c2, int c3) { - MutableQuadView.super.color(c0, c1, c2, c3); - return this; - } - - @Override - QuadEmitter uv(int vertexIndex, float u, float v); - - @Override - default QuadEmitter uv(int vertexIndex, Vector2f uv) { - MutableQuadView.super.uv(vertexIndex, uv); - return this; - } - - @Override - QuadEmitter spriteBake(TextureAtlasSprite sprite, int bakeFlags); - - default QuadEmitter uvUnitSquare() { - uv(0, 0, 0); - uv(1, 0, 1); - uv(2, 1, 1); - uv(3, 1, 0); - return this; - } - - @Override - QuadEmitter lightmap(int vertexIndex, int lightmap); - - @Override - default QuadEmitter lightmap(int b0, int b1, int b2, int b3) { - MutableQuadView.super.lightmap(b0, b1, b2, b3); - return this; - } - - @Override - QuadEmitter normal(int vertexIndex, float x, float y, float z); - - @Override - default QuadEmitter normal(int vertexIndex, Vector3f normal) { - MutableQuadView.super.normal(vertexIndex, normal); - return this; - } - - @Override - QuadEmitter cullFace(Direction face); - - @Override - QuadEmitter nominalFace(Direction face); - - @Override - QuadEmitter colorIndex(int colorIndex); - - @Override - QuadEmitter tag(int tag); - - @Override - QuadEmitter fromVanilla(int[] quadData, int startIndex); - - /** - * Tolerance for determining if the depth parameter to {@link #square(Direction, float, float, float, float, float)} - * is effectively zero - meaning the face is a cull face. - */ - float CULL_FACE_EPSILON = 0.00001f; - - /** - * Helper method to assign vertex coordinates for a square aligned with the given face. Ensures that vertex order is - * consistent with vanilla convention. (Incorrect order can lead to bad AO lighting unless enhanced lighting logic - * is available/enabled.) - * - *

- * Square will be parallel to the given face and coplanar with the face (and culled if the face is occluded) if the - * depth parameter is approximately zero. See {@link #CULL_FACE_EPSILON}. - * - *

- * All coordinates should be normalized (0-1). - */ - default QuadEmitter square(Direction nominalFace, float left, float bottom, float right, float top, float depth) { - if (Math.abs(depth) < CULL_FACE_EPSILON) { - cullFace(nominalFace); - depth = 0; // avoid any inconsistency for face quads - } else { - cullFace(null); - } - - nominalFace(nominalFace); - switch (nominalFace) { - case UP: - depth = 1 - depth; - top = 1 - top; - bottom = 1 - bottom; - - case DOWN: - pos(0, left, depth, top); - pos(1, left, depth, bottom); - pos(2, right, depth, bottom); - pos(3, right, depth, top); - break; - - case EAST: - depth = 1 - depth; - left = 1 - left; - right = 1 - right; - - case WEST: - pos(0, depth, top, left); - pos(1, depth, bottom, left); - pos(2, depth, bottom, right); - pos(3, depth, top, right); - break; - - case SOUTH: - depth = 1 - depth; - left = 1 - left; - right = 1 - right; - - case NORTH: - pos(0, 1 - left, top, depth); - pos(1, 1 - left, bottom, depth); - pos(2, 1 - right, bottom, depth); - pos(3, 1 - right, top, depth); - break; - } - - return this; - } - - /** - * In static mesh building, causes quad to be appended to the mesh being built. In a dynamic render context, create - * a new quad to be output to rendering. In both cases, current instance is reset to default values. - */ - QuadEmitter emit(); -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadView.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadView.java deleted file mode 100644 index 26bae9418..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadView.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.core.Direction; -import org.joml.Vector2f; -import org.joml.Vector3f; -import org.jspecify.annotations.Nullable; - -/** - * Interface for reading quad data encoded by {@link MeshBuilder}. Enables models to do analysis, re-texturing or - * translation without knowing the renderer's vertex formats and without retaining redundant information. - * - *

- * Only the renderer should implement or extend this interface. - */ -public interface QuadView { - /** Count of integers in a conventional (un-modded) block or item vertex. */ - int VANILLA_VERTEX_STRIDE = DefaultVertexFormat.BLOCK.getVertexSize() / 4; - - /** Count of integers in a conventional (un-modded) block or item quad. */ - int VANILLA_QUAD_STRIDE = VANILLA_VERTEX_STRIDE * 4; - - /** - * Retrieve geometric position, x coordinate. - */ - float x(int vertexIndex); - - /** - * Retrieve geometric position, y coordinate. - */ - float y(int vertexIndex); - - /** - * Retrieve geometric position, z coordinate. - */ - float z(int vertexIndex); - - /** - * Convenience: access x, y, z by index 0-2. - */ - float posByIndex(int vertexIndex, int coordinateIndex); - - /** - * Pass a non-null target to avoid allocation - will be returned with values. Otherwise returns a new instance. - */ - Vector3f copyPos(int vertexIndex, @Nullable Vector3f target); - - /** - * Retrieve vertex color. - */ - int color(int vertexIndex); - - /** - * Retrieve horizontal texture coordinates. - */ - float u(int vertexIndex); - - /** - * Retrieve vertical texture coordinates. - */ - float v(int vertexIndex); - - /** - * Pass a non-null target to avoid allocation - will be returned with values. Otherwise returns a new instance. - */ - default Vector2f copyUv(int vertexIndex, @Nullable Vector2f target) { - if (target == null) { - target = new Vector2f(); - } - - target.set(u(vertexIndex), v(vertexIndex)); - return target; - } - - /** - * Minimum block brightness. Zero if not set. - */ - int lightmap(int vertexIndex); - - /** - * If false, no vertex normal was provided. Lighting should use face normal in that case. - */ - boolean hasNormal(int vertexIndex); - - /** - * Will return {@link Float#NaN} if normal not present. - */ - float normalX(int vertexIndex); - - /** - * Will return {@link Float#NaN} if normal not present. - */ - float normalY(int vertexIndex); - - /** - * Will return {@link Float#NaN} if normal not present. - */ - float normalZ(int vertexIndex); - - /** - * Pass a non-null target to avoid allocation - will be returned with values. Otherwise returns a new instance. - * Returns null if normal not present. - */ - @Nullable - Vector3f copyNormal(int vertexIndex, @Nullable Vector3f target); - - /** - * If non-null, quad should not be rendered in-world if the opposite face of a neighbor block occludes it. - * - * @see MutableQuadView#cullFace(Direction) - */ - @Nullable - Direction cullFace(); - - /** - * Equivalent to {@link BakedQuad#getDirection()}. This is the face used for vanilla lighting calculations and will - * be the block face to which the quad is most closely aligned. Always the same as cull face for quads that are on a - * block face, but never null. - */ - Direction lightFace(); - - /** - * See {@link MutableQuadView#nominalFace(Direction)}. - */ - Direction nominalFace(); - - /** - * Normal of the quad as implied by geometry. Will be invalid if quad vertices are not co-planar. Typically computed - * lazily on demand and not encoded. - * - *

- * Not typically needed by models. Exposed to enable standard lighting utility functions for use by renderers. - */ - Vector3f faceNormal(); - - /** - * Retrieves the quad color index serialized with the quad. - */ - int colorIndex(); - - /** - * Retrieves the integer tag encoded with this quad via {@link MutableQuadView#tag(int)}. Will return zero if no tag - * was set. For use by models. - */ - int tag(); - - /** - * Extracts all quad properties except material to the given {@link MutableQuadView} instance. Must be used before - * calling {link QuadEmitter#emit()} on the target instance. Meant for re-texturing, analysis and static - * transformation use cases. - */ - void copyTo(MutableQuadView target); - - /** - * Reads baked vertex data and outputs standard {@link BakedQuad#getVertices() baked quad vertex data} in the given - * array and location. - * - * @param target Target array for the baked quad data. - * - * @param targetIndex Starting position in target array - array must have at least 28 elements available at this - * index. - */ - void toVanilla(int[] target, int targetIndex); - - /** - * Generates a new BakedQuad instance with texture coordinates and colors from the given sprite. - * - * @param sprite {@link MutableQuadView} does not serialize sprites so the sprite must be provided by the caller. - * - * @return A new baked quad instance with the closest-available appearance supported by vanilla features. Will - * retain emissive light maps, for example, but the standard Minecraft renderer will not use them. - */ - default BakedQuad toBakedQuad(TextureAtlasSprite sprite) { - int[] vertexData = new int[VANILLA_QUAD_STRIDE]; - toVanilla(vertexData, 0); - // TODO material inspection: set shade as !disableDiffuse - // TODO material inspection: set color index to -1 if the material disables it - return new BakedQuad(vertexData, colorIndex(), lightFace(), sprite, true); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadViewImpl.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadViewImpl.java deleted file mode 100644 index 8971548ff..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/QuadViewImpl.java +++ /dev/null @@ -1,284 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import static aztech.modern_industrialization.client.thirdparty.fabricrendering.EncodingFormat.*; - -import net.minecraft.core.Direction; -import org.joml.Vector3f; -import org.jspecify.annotations.Nullable; - -/** - * Base class for all quads / quad makers. Handles the ugly bits of maintaining and encoding the quad state. - */ -public class QuadViewImpl implements QuadView { - protected Direction nominalFace; - /** True when geometry flags or light face may not match geometry. */ - protected boolean isGeometryInvalid = true; - protected final Vector3f faceNormal = new Vector3f(); - private boolean shade = true; - - /** Size and where it comes from will vary in subtypes. But in all cases quad is fully encoded to array. */ - protected int[] data; - - /** Beginning of the quad. Also the header index. */ - protected int baseIndex = 0; - - /** - * Use when subtype is "attached" to a pre-existing array. Sets data reference and index and decodes state from - * array. - */ - final void load(int[] data, int baseIndex) { - this.data = data; - this.baseIndex = baseIndex; - load(); - } - - /** - * Like {@link #load(int[], int)} but assumes array and index already set. Only does the decoding part. - */ - public final void load() { - isGeometryInvalid = false; - nominalFace = lightFace(); - - // face normal isn't encoded - NormalHelper.computeFaceNormal(faceNormal, this); - } - - /** Reference to underlying array. Use with caution. Meant for fast renderer access */ - public int[] data() { - return data; - } - - public int normalFlags() { - return EncodingFormat.normalFlags(data[baseIndex + HEADER_BITS]); - } - - /** True if any vertex normal has been set. */ - public boolean hasVertexNormals() { - return normalFlags() != 0; - } - - /** gets flags used for lighting - lazily computed via {@link GeometryHelper#computeShapeFlags(QuadView)}. */ - public int geometryFlags() { - computeGeometry(); - return EncodingFormat.geometryFlags(data[baseIndex + HEADER_BITS]); - } - - protected void computeGeometry() { - if (isGeometryInvalid) { - isGeometryInvalid = false; - - NormalHelper.computeFaceNormal(faceNormal, this); - - // depends on face normal - data[baseIndex + HEADER_BITS] = EncodingFormat.lightFace(data[baseIndex + HEADER_BITS], - GeometryHelper.lightFace(this)); - - // depends on light face - data[baseIndex + HEADER_BITS] = EncodingFormat.geometryFlags(data[baseIndex + HEADER_BITS], - GeometryHelper.computeShapeFlags(this)); - } - } - - @Override - public final int colorIndex() { - return data[baseIndex + HEADER_COLOR_INDEX]; - } - - @Override - public final int tag() { - return data[baseIndex + HEADER_TAG]; - } - - @Override - public final Direction lightFace() { - computeGeometry(); - return EncodingFormat.lightFace(data[baseIndex + HEADER_BITS]); - } - - @Override - public final Direction cullFace() { - return EncodingFormat.cullFace(data[baseIndex + HEADER_BITS]); - } - - @Override - public final Direction nominalFace() { - return nominalFace; - } - - @Override - public final Vector3f faceNormal() { - computeGeometry(); - return faceNormal; - } - - @Override - public void copyTo(MutableQuadView target) { - computeGeometry(); - - final MutableQuadViewImpl quad = (MutableQuadViewImpl) target; - // copy everything except the material - System.arraycopy(data, baseIndex, quad.data, quad.baseIndex, EncodingFormat.TOTAL_STRIDE); - quad.faceNormal.set(faceNormal.x(), faceNormal.y(), faceNormal.z()); - quad.nominalFace = this.nominalFace; - quad.isGeometryInvalid = false; - } - - @Override - public Vector3f copyPos(int vertexIndex, @Nullable Vector3f target) { - if (target == null) { - target = new Vector3f(); - } - - final int index = baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_X; - target.set(Float.intBitsToFloat(data[index]), Float.intBitsToFloat(data[index + 1]), - Float.intBitsToFloat(data[index + 2])); - return target; - } - - @Override - public float posByIndex(int vertexIndex, int coordinateIndex) { - return Float.intBitsToFloat(data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_X + coordinateIndex]); - } - - @Override - public float x(int vertexIndex) { - return Float.intBitsToFloat(data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_X]); - } - - @Override - public float y(int vertexIndex) { - return Float.intBitsToFloat(data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_Y]); - } - - @Override - public float z(int vertexIndex) { - return Float.intBitsToFloat(data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_Z]); - } - - @Override - public boolean hasNormal(int vertexIndex) { - return (normalFlags() & (1 << vertexIndex)) != 0; - } - - protected final int normalIndex(int vertexIndex) { - return baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_NORMAL; - } - - @Override - @Nullable - public Vector3f copyNormal(int vertexIndex, @Nullable Vector3f target) { - if (hasNormal(vertexIndex)) { - if (target == null) { - target = new Vector3f(); - } - - final int normal = data[normalIndex(vertexIndex)]; - target.set(NormalHelper.getPackedNormalComponent(normal, 0), - NormalHelper.getPackedNormalComponent(normal, 1), NormalHelper.getPackedNormalComponent(normal, 2)); - return target; - } else { - return null; - } - } - - @Override - public float normalX(int vertexIndex) { - return hasNormal(vertexIndex) ? NormalHelper.getPackedNormalComponent(data[normalIndex(vertexIndex)], 0) - : Float.NaN; - } - - @Override - public float normalY(int vertexIndex) { - return hasNormal(vertexIndex) ? NormalHelper.getPackedNormalComponent(data[normalIndex(vertexIndex)], 1) - : Float.NaN; - } - - @Override - public float normalZ(int vertexIndex) { - return hasNormal(vertexIndex) ? NormalHelper.getPackedNormalComponent(data[normalIndex(vertexIndex)], 2) - : Float.NaN; - } - - @Override - public int lightmap(int vertexIndex) { - return data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_LIGHTMAP]; - } - - @Override - public int color(int vertexIndex) { - return data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_COLOR]; - } - - @Override - public float u(int vertexIndex) { - return Float.intBitsToFloat(data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_U]); - } - - @Override - public float v(int vertexIndex) { - return Float.intBitsToFloat(data[baseIndex + vertexIndex * VERTEX_STRIDE + VERTEX_V]); - } - - public int vertexStart() { - return baseIndex + HEADER_STRIDE; - } - - public boolean hasShade() { - return shade; - } - - public void shade(boolean shade) { - this.shade = shade; - } - - @Override - public final void toVanilla(int[] target, int targetIndex) { - System.arraycopy(data, baseIndex + HEADER_STRIDE, target, targetIndex, QUAD_STRIDE); - - // The color is the fourth integer in each vertex. - // EncodingFormat.VERTEX_COLOR is not used because it also - // contains the header size; vanilla quads do not have a header. - int colorIndex = targetIndex + 3; - - for (int i = 0; i < 4; i++) { - target[colorIndex] = ColorHelper.toVanillaColor(target[colorIndex]); - colorIndex += VANILLA_VERTEX_STRIDE; - } - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/SpriteFinder.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/SpriteFinder.java deleted file mode 100644 index 9cbfe3ebc..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/SpriteFinder.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; - -/** - * Indexes a texture atlas to allow fast lookup of Sprites from baked vertex coordinates. Main use is for - * {@link Mesh}-based models to generate vanilla quads on demand without tracking and retaining the sprites that were - * baked into the mesh. In other words, this class supplies the sprite parameter for - * {@link QuadView#toBakedQuad(int, TextureAtlasSprite, boolean)}. - */ -public interface SpriteFinder { - /** - * Finds the atlas sprite containing the vertex centroid of the quad. Vertex centroid is essentially the mean u,v - * coordinate - the intent being to find a point that is unambiguously inside the sprite (vs on an edge.) - * - *

- * Should be reliable for any convex quad or triangle. May fail for non-convex quads. Note that all the above refers - * to u,v coordinates. Geometric vertex does not matter, except to the extent it was used to determine u,v. - */ - TextureAtlasSprite find(QuadView quad); - - /** - * Alternative to {@link #find(QuadView, int)} when vertex centroid is already known or unsuitable. Expects - * normalized (0-1) coordinates on the atlas texture, which should already be the case for u,v values in vanilla - * baked quads and in {@link QuadView} after calling - * {@link MutableQuadView#spriteBake(int, TextureAtlasSprite, int)}. - * - *

- * Coordinates must be in the sprite interior for reliable results. Generally will be easier to use - * {@link #find(QuadView, int)} unless you know the vertex centroid will somehow not be in the quad interior. This - * method will be slightly faster if you already have the centroid or another appropriate value. - */ - TextureAtlasSprite find(float u, float v); -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/SpriteFinderImpl.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/SpriteFinderImpl.java deleted file mode 100644 index fa74e315c..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/SpriteFinderImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.util.Map; -import java.util.function.Consumer; -import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.resources.ResourceLocation; -import org.jspecify.annotations.Nullable; - -/** - * Indexes an atlas sprite to allow fast lookup of Sprites from baked vertex coordinates. Implementation is a - * straightforward quad tree. Other options that were considered were linear search (slow) and direct indexing of - * fixed-size cells. Direct indexing would be fastest but would be memory-intensive for large atlases and unsuitable for - * any atlas that isn't consistently aligned to a fixed cell size. - */ -public class SpriteFinderImpl implements SpriteFinder { - private final Node root; - private final TextureAtlas spriteAtlasTexture; - - public SpriteFinderImpl(Map sprites, TextureAtlas spriteAtlasTexture) { - root = new Node(0.5f, 0.5f, 0.25f); - this.spriteAtlasTexture = spriteAtlasTexture; - sprites.values().forEach(root::add); - } - - @Override - public TextureAtlasSprite find(QuadView quad) { - float u = 0; - float v = 0; - - for (int i = 0; i < 4; i++) { - u += quad.u(i); - v += quad.v(i); - } - - return find(u * 0.25f, v * 0.25f); - } - - @Override - public TextureAtlasSprite find(float u, float v) { - return root.find(u, v); - } - - private class Node { - final float midU; - final float midV; - final float cellRadius; - @Nullable - Object lowLow = null; - @Nullable - Object lowHigh = null; - @Nullable - Object highLow = null; - @Nullable - Object highHigh = null; - - Node(float midU, float midV, float radius) { - this.midU = midU; - this.midV = midV; - cellRadius = radius; - } - - static final float EPS = 0.00001f; - - void add(TextureAtlasSprite sprite) { - final boolean lowU = sprite.getU0() < midU - EPS; - final boolean highU = sprite.getU1() > midU + EPS; - final boolean lowV = sprite.getV0() < midV - EPS; - final boolean highV = sprite.getV1() > midV + EPS; - - if (lowU && lowV) { - addInner(sprite, lowLow, -1, -1, q -> lowLow = q); - } - - if (lowU && highV) { - addInner(sprite, lowHigh, -1, 1, q -> lowHigh = q); - } - - if (highU && lowV) { - addInner(sprite, highLow, 1, -1, q -> highLow = q); - } - - if (highU && highV) { - addInner(sprite, highHigh, 1, 1, q -> highHigh = q); - } - } - - private void addInner(TextureAtlasSprite sprite, @Nullable Object quadrant, int uStep, int vStep, - Consumer setter) { - if (quadrant == null) { - setter.accept(sprite); - } else if (quadrant instanceof Node) { - ((Node) quadrant).add(sprite); - } else { - Node n = new Node(midU + cellRadius * uStep, midV + cellRadius * vStep, cellRadius * 0.5f); - - if (quadrant instanceof TextureAtlasSprite) { - n.add((TextureAtlasSprite) quadrant); - } - - n.add(sprite); - setter.accept(n); - } - } - - private TextureAtlasSprite find(float u, float v) { - if (u < midU) { - return v < midV ? findInner(lowLow, u, v) : findInner(lowHigh, u, v); - } else { - return v < midV ? findInner(highLow, u, v) : findInner(highHigh, u, v); - } - } - - private TextureAtlasSprite findInner(@Nullable Object quadrant, float u, float v) { - if (quadrant instanceof TextureAtlasSprite) { - return (TextureAtlasSprite) quadrant; - } else if (quadrant instanceof Node) { - return ((Node) quadrant).find(u, v); - } else { - return spriteAtlasTexture.getSprite(MissingTextureAtlasSprite.getLocation()); - } - } - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/TextureHelper.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/TextureHelper.java deleted file mode 100644 index a8074502a..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/TextureHelper.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabricrendering; -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.core.Direction; - -/** - * Handles most texture-baking use cases for model loaders and model libraries via - * {@link #bakeSprite(MutableQuadView, TextureAtlasSprite, int)}. Also used by the API itself to implement automatic - * block-breaking models for enhanced models. - */ -public class TextureHelper { - private TextureHelper() {} - - private static final float NORMALIZER = 1f / 16f; - - /** - * Bakes textures in the provided vertex data, handling UV locking, rotation, interpolation, etc. Textures must not - * be already baked. - */ - public static void bakeSprite(MutableQuadView quad, TextureAtlasSprite sprite, int bakeFlags) { - if (quad.nominalFace() != null && (MutableQuadView.BAKE_LOCK_UV & bakeFlags) != 0) { - // Assigns normalized UV coordinates based on vertex positions - applyModifier(quad, UVLOCKERS[quad.nominalFace().get3DDataValue()]); - } else if ((MutableQuadView.BAKE_NORMALIZED & bakeFlags) == 0) { // flag is NOT set, UVs are assumed to not be - // normalized yet as is the default, normalize - // through dividing by 16 - // Scales from 0-16 to 0-1 - applyModifier(quad, (q, i) -> q.uv(i, q.u(i) * NORMALIZER, q.v(i) * NORMALIZER)); - } - - final int rotation = bakeFlags & 3; - - if (rotation != 0) { - // Rotates texture around the center of sprite. - // Assumes normalized coordinates. - applyModifier(quad, ROTATIONS[rotation]); - } - - if ((MutableQuadView.BAKE_FLIP_U & bakeFlags) != 0) { - // Inverts U coordinates. Assumes normalized (0-1) values. - applyModifier(quad, (q, i) -> q.uv(i, 1 - q.u(i), q.v(i))); - } - - if ((MutableQuadView.BAKE_FLIP_V & bakeFlags) != 0) { - // Inverts V coordinates. Assumes normalized (0-1) values. - applyModifier(quad, (q, i) -> q.uv(i, q.u(i), 1 - q.v(i))); - } - - interpolate(quad, sprite); - } - - /** - * Faster than sprite method. Sprite computes span and normalizes inputs each call, so we'd have to denormalize - * before we called, only to have the sprite renormalize immediately. - */ - private static void interpolate(MutableQuadView q, TextureAtlasSprite sprite) { - final float uMin = sprite.getU0(); - final float uSpan = sprite.getU1() - uMin; - final float vMin = sprite.getV0(); - final float vSpan = sprite.getV1() - vMin; - - for (int i = 0; i < 4; i++) { - q.uv(i, uMin + q.u(i) * uSpan, vMin + q.v(i) * vSpan); - } - } - - @FunctionalInterface - private interface VertexModifier { - void apply(MutableQuadView quad, int vertexIndex); - } - - private static void applyModifier(MutableQuadView quad, VertexModifier modifier) { - for (int i = 0; i < 4; i++) { - modifier.apply(quad, i); - } - } - - private static final VertexModifier[] ROTATIONS = new VertexModifier[] { - null, - (q, i) -> q.uv(i, q.v(i), 1 - q.u(i)), // 90 - (q, i) -> q.uv(i, 1 - q.u(i), 1 - q.v(i)), // 180 - (q, i) -> q.uv(i, 1 - q.v(i), q.u(i)) // 270 - }; - - private static final VertexModifier[] UVLOCKERS = new VertexModifier[6]; - - static { - UVLOCKERS[Direction.EAST.get3DDataValue()] = (q, i) -> q.uv(i, 1 - q.z(i), 1 - q.y(i)); - UVLOCKERS[Direction.WEST.get3DDataValue()] = (q, i) -> q.uv(i, q.z(i), 1 - q.y(i)); - UVLOCKERS[Direction.NORTH.get3DDataValue()] = (q, i) -> q.uv(i, 1 - q.x(i), 1 - q.y(i)); - UVLOCKERS[Direction.SOUTH.get3DDataValue()] = (q, i) -> q.uv(i, q.x(i), 1 - q.y(i)); - UVLOCKERS[Direction.DOWN.get3DDataValue()] = (q, i) -> q.uv(i, q.x(i), 1 - q.z(i)); - UVLOCKERS[Direction.UP.get3DDataValue()] = (q, i) -> q.uv(i, q.x(i), q.z(i)); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/package-info.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/package-info.java deleted file mode 100644 index 3a06330bd..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabricrendering/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.client.thirdparty.fabricrendering; - -import org.jspecify.annotations.NullMarked; diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabrictransfer/FluidVariantRendering.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabrictransfer/FluidVariantRendering.java deleted file mode 100644 index 475bc57e0..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabrictransfer/FluidVariantRendering.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.client.thirdparty.fabrictransfer; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariantAttributes; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.chat.Component; -import net.minecraft.world.inventory.InventoryMenu; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockAndTintGetter; -import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; -import org.jspecify.annotations.Nullable; - -/** - * Client-side display of fluid variants. - */ -public final class FluidVariantRendering { - private FluidVariantRendering() {} - - /** - * Return the render handler for the passed fluid, if available, or the default instance otherwise. - */ - public static IClientFluidTypeExtensions getExtensions(FluidVariant variant) { - return IClientFluidTypeExtensions.of(variant.getFluid().getFluidType()); - } - - /** - * Return a mutable list: the tooltip for the passed fluid variant, including the name and additional lines if available - * and the id of the fluid if advanced tooltips are enabled. - * - *

- * Compared to {@linkplain #getTooltip(FluidVariant, TooltipFlag) the other overload}, the current tooltip context is automatically used. - */ - public static List getTooltip(FluidVariant fluidVariant) { - return getTooltip(fluidVariant, - Minecraft.getInstance().options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL); - } - - /** - * Return a mutable list: the tooltip for the passed fluid variant, including the name and additional lines if available - * and the id of the fluid if advanced tooltips are enabled. - */ - public static List getTooltip(FluidVariant fluidVariant, TooltipFlag context) { - List tooltip = new ArrayList<>(); - - // Name first - tooltip.add(FluidVariantAttributes.getName(fluidVariant)); - - // If advanced tooltips are enabled, render the fluid id - if (context.isAdvanced()) { - tooltip.add(Component.literal(BuiltInRegistries.FLUID.getKey(fluidVariant.getFluid()).toString()).withStyle(ChatFormatting.DARK_GRAY)); - } - - // TODO: consider adding an event to append to tooltips? - - return tooltip; - } - - /** - * Return the still sprite that should be used to render the passed fluid variant, or null if it's not available. - * The sprite should be rendered using the color returned by {@link #getColor}. - */ - @Nullable - public static TextureAtlasSprite getSprite(FluidVariant fluidVariant) { - if (fluidVariant.isBlank()) { - return null; - } - return Minecraft.getInstance().getTextureAtlas(InventoryMenu.BLOCK_ATLAS) - .apply(getExtensions(fluidVariant).getStillTexture(fluidVariant.toStack(1))); - } - - /** - * Return the position-independent color that should be used to render {@linkplain #getSprite the sprite} of the passed fluid variant. - */ - public static int getColor(FluidVariant fluidVariant) { - return getExtensions(fluidVariant).getTintColor(fluidVariant.toStack(1)); - } - - /** - * Return the position-independent color that should be used to render {@linkplain #getSprite the sprite} of the passed fluid variant. - */ - public static int getColor(FluidVariant fluidVariant, @Nullable BlockAndTintGetter level, BlockPos pos) { - if (level == null) { - return getColor(fluidVariant); - } - return getExtensions(fluidVariant).getTintColor(fluidVariant.getFluid().defaultFluidState(), level, pos); - } -} diff --git a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabrictransfer/package-info.java b/src/client/java/aztech/modern_industrialization/client/thirdparty/fabrictransfer/package-info.java deleted file mode 100644 index 0fde442e1..000000000 --- a/src/client/java/aztech/modern_industrialization/client/thirdparty/fabrictransfer/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.client.thirdparty.fabrictransfer; - -import org.jspecify.annotations.NullMarked; diff --git a/src/client/java/aztech/modern_industrialization/client/util/ModelHelper.java b/src/client/java/aztech/modern_industrialization/client/util/ModelHelper.java index ab212c95b..323ebd619 100644 --- a/src/client/java/aztech/modern_industrialization/client/util/ModelHelper.java +++ b/src/client/java/aztech/modern_industrialization/client/util/ModelHelper.java @@ -26,15 +26,22 @@ import com.google.common.collect.ImmutableMap; import java.util.Arrays; + +import net.minecraft.client.model.geom.builders.UVPair; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemTransform; import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.QuadCollection; import net.minecraft.core.Direction; import net.minecraft.util.Mth; import net.neoforged.neoforge.client.model.pipeline.QuadBakingVertexConsumer; +import net.neoforged.neoforge.client.model.quad.BakedColors; +import net.neoforged.neoforge.client.model.quad.BakedNormals; import org.joml.Vector2f; +import org.joml.Vector2fc; import org.joml.Vector3f; +import org.joml.Vector3fc; import org.jspecify.annotations.Nullable; public class ModelHelper { @@ -47,31 +54,35 @@ public static int nullableDirectionIndex(@Nullable Direction side) { return side == null ? 6 : side.get3DDataValue(); } - public static BakedQuad bakeSprite(QuadBakingVertexConsumer vc, Direction d, TextureAtlasSprite sprite, float depth) { - vc.setTintIndex(-1); - vc.setDirection(d); - vc.setSprite(sprite); - vc.setShade(true); - vc.setHasAmbientOcclusion(true); + // TODO: PR to NeoForge + public static void addQuad(QuadCollection.Builder quads, @Nullable Direction side, BakedQuad quad) { + if (side == null) { + quads.addUnculledFace(quad); + } else { + quads.addCulledFace(side, quad); + } + } + + private static final float CULL_FACE_EPSILON = 0.00001f; + public static BakedQuad bakeSprite(Direction d, TextureAtlasSprite sprite, float depth) { Vector3f[] pos = new Vector3f[] { new Vector3f(), new Vector3f(), new Vector3f(), new Vector3f() }; ModelHelper.square(pos, d, 0, 0, 1, 1, depth); - Vector2f[] uv = ModelHelper.bakeUvs(pos, sprite, d); + long[] uv = ModelHelper.bakeUvs(pos, sprite, d); - for (int i = 0; i < 4; ++i) { - vc.addVertex(pos[i].x, pos[i].y, pos[i].z); - vc.setColor(255, 255, 255, 255); - vc.setUv(uv[i].x, uv[i].y); - vc.setLight(0); - var normal = d.getNormal(); - vc.setNormal(normal.getX(), normal.getY(), normal.getZ()); - } - - return vc.bakeQuad(); + return new BakedQuad( + pos[0], pos[1], pos[2], pos[3], + uv[0], uv[1], uv[2], uv[3], + -1, d, sprite, true, 0, + BakedNormals.of(BakedNormals.pack(d.getUnitVec3f())), BakedColors.DEFAULT, true); } public static void square(Vector3f[] out, Direction nominalFace, float left, float bottom, float right, float top, float depth) { + if (Math.abs(depth) < CULL_FACE_EPSILON) { + depth = 0; // avoid any inconsistency for face quads + } + switch (nominalFace) { case UP: depth = 1 - depth; @@ -111,16 +122,16 @@ public static void square(Vector3f[] out, Direction nominalFace, float left, flo } } - public static Vector2f[] bakeUvs(Vector3f[] pos, TextureAtlasSprite sprite, Direction face) { + public static long[] bakeUvs(Vector3fc[] pos, TextureAtlasSprite sprite, Direction face) { Vector2f[] uvs = new Vector2f[4]; for (int i = 0; i < 4; i++) { uvs[i] = lockUvs(pos[i], face); } interpolate(uvs, sprite); - return uvs; + return new long[] { packUV(uvs[0]), packUV(uvs[1]), packUV(uvs[2]), packUV(uvs[3]) }; } - private static Vector2f lockUvs(Vector3f pos, Direction face) { + private static Vector2f lockUvs(Vector3fc pos, Direction face) { return switch (face) { case EAST -> new Vector2f(1 - pos.z(), 1 - pos.y()); case WEST -> new Vector2f(pos.z(), 1 - pos.y()); @@ -146,32 +157,7 @@ private static void interpolate(Vector2f[] uvs, TextureAtlasSprite sprite) { } } - /** - * The vanilla model transformation logic is closely coupled with model deserialization. - * That does little good for modded model loaders and procedurally generated models. - * This convenient construction method applies the same scaling factors used for vanilla models. - * This means you can use values from a vanilla JSON file as inputs to this method. - */ - private static ItemTransform makeTransform(float rotationX, float rotationY, float rotationZ, float translationX, float translationY, - float translationZ, float scaleX, float scaleY, float scaleZ) { - Vector3f translation = new Vector3f(translationX, translationY, translationZ); - translation.mul(0.0625f); - translation.set(Mth.clamp(translation.x, -5.0F, 5.0F), Mth.clamp(translation.y, -5.0F, 5.0F), Mth.clamp(translation.z, -5.0F, 5.0F)); - return new ItemTransform(new Vector3f(rotationX, rotationY, rotationZ), translation, new Vector3f(scaleX, scaleY, scaleZ)); + private static long packUV(Vector2fc uv) { + return UVPair.pack(uv.x(), uv.y()); } - - public static final ItemTransform TRANSFORM_BLOCK_GUI = makeTransform(30, 225, 0, 0, 0, 0, 0.625f, 0.625f, 0.625f); - public static final ItemTransform TRANSFORM_BLOCK_GROUND = makeTransform(0, 0, 0, 0, 3, 0, 0.25f, 0.25f, 0.25f); - public static final ItemTransform TRANSFORM_BLOCK_FIXED = makeTransform(0, 0, 0, 0, 0, 0, 0.5f, 0.5f, 0.5f); - public static final ItemTransform TRANSFORM_BLOCK_3RD_PERSON_RIGHT = makeTransform(75, 45, 0, 0, 2.5f, 0, 0.375f, 0.375f, 0.375f); - public static final ItemTransform TRANSFORM_BLOCK_1ST_PERSON_RIGHT = makeTransform(0, 45, 0, 0, 0, 0, 0.4f, 0.4f, 0.4f); - public static final ItemTransform TRANSFORM_BLOCK_1ST_PERSON_LEFT = makeTransform(0, 225, 0, 0, 0, 0, 0.4f, 0.4f, 0.4f); - - /** - * Mimics the vanilla model transformation used for most vanilla blocks, - * and should be suitable for most custom block-like models. - */ - public static final ItemTransforms MODEL_TRANSFORM_BLOCK = new ItemTransforms(TRANSFORM_BLOCK_3RD_PERSON_RIGHT, TRANSFORM_BLOCK_3RD_PERSON_RIGHT, - TRANSFORM_BLOCK_1ST_PERSON_LEFT, TRANSFORM_BLOCK_1ST_PERSON_RIGHT, ItemTransform.NO_TRANSFORM, TRANSFORM_BLOCK_GUI, - TRANSFORM_BLOCK_GROUND, TRANSFORM_BLOCK_FIXED, ImmutableMap.of()); } diff --git a/src/client/java/aztech/modern_industrialization/client/util/QuadCube.java b/src/client/java/aztech/modern_industrialization/client/util/QuadCube.java index 91c93f16f..ad48fa875 100644 --- a/src/client/java/aztech/modern_industrialization/client/util/QuadCube.java +++ b/src/client/java/aztech/modern_industrialization/client/util/QuadCube.java @@ -24,29 +24,28 @@ package aztech.modern_industrialization.client.util; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MutableQuadView; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadBuffer; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadEmitter; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.Material; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.inventory.InventoryMenu; +import net.minecraft.data.AtlasIds; +import net.minecraft.resources.Identifier; +import net.neoforged.neoforge.client.ClientHooks; import org.jspecify.annotations.Nullable; public class QuadCube { - private final ResourceLocation spriteLocation; + private final Material spriteLocation; private BakedQuad @Nullable [] quads; - public QuadCube(ResourceLocation spriteLocation) { - this.spriteLocation = spriteLocation; + public QuadCube(Identifier spriteLocation) { + this.spriteLocation = ClientHooks.getBlockMaterial(spriteLocation); } public BakedQuad[] getQuads() { - var sprite = Minecraft.getInstance().getTextureAtlas(InventoryMenu.BLOCK_ATLAS).apply(spriteLocation); + var sprite = Minecraft.getInstance().getAtlasManager().get(spriteLocation); // Rebuild quads if the sprite changed - if (quads == null || quads[0].getSprite() != sprite) { + if (quads == null || quads[0].sprite() != sprite) { quads = buildQuads(sprite); } return quads; @@ -55,10 +54,7 @@ public BakedQuad[] getQuads() { private static BakedQuad[] buildQuads(TextureAtlasSprite sprite) { var quads = new BakedQuad[6]; for (Direction direction : Direction.values()) { - QuadEmitter emitter = new QuadBuffer(); - emitter.square(direction, 0, 0, 1, 1, 0); - emitter.spriteBake(sprite, MutableQuadView.BAKE_LOCK_UV); - quads[direction.get3DDataValue()] = emitter.toBakedQuad(sprite); + quads[direction.get3DDataValue()] = ModelHelper.bakeSprite(direction, sprite, 0); } return quads; } diff --git a/src/client/java/aztech/modern_industrialization/client/util/RenderHelper.java b/src/client/java/aztech/modern_industrialization/client/util/RenderHelper.java index 74c3ab8f7..1fd719be8 100644 --- a/src/client/java/aztech/modern_industrialization/client/util/RenderHelper.java +++ b/src/client/java/aztech/modern_industrialization/client/util/RenderHelper.java @@ -25,158 +25,171 @@ package aztech.modern_industrialization.client.util; import aztech.modern_industrialization.MI; -import aztech.modern_industrialization.client.MIRenderTypes; import aztech.modern_industrialization.client.compat.sodium.SodiumCompat; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.MutableQuadView; -import aztech.modern_industrialization.client.thirdparty.fabricrendering.QuadBuffer; -import aztech.modern_industrialization.client.thirdparty.fabrictransfer.FluidVariantRendering; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.BufferUploader; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.blaze3d.vertex.VertexFormat; + import java.util.ArrayList; import java.util.List; -import java.util.Objects; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.LevelRenderer; -import net.minecraft.client.renderer.LightTexture; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; +import net.minecraft.client.renderer.ShapeRenderer; import net.minecraft.client.renderer.Sheets; +import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.Material; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.data.AtlasIds; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.util.ARGB; import net.minecraft.util.FormattedCharSequence; -import net.minecraft.world.inventory.InventoryMenu; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; -import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.neoforge.client.RenderTypeHelper; -import org.joml.Matrix4f; +import net.neoforged.neoforge.client.ClientHooks; +import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; +import net.neoforged.neoforge.client.model.quad.BakedColors; +import net.neoforged.neoforge.client.model.quad.BakedNormals; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import org.joml.Vector3f; import org.jspecify.annotations.Nullable; public class RenderHelper { private static final QuadCube overlayQuads = new QuadCube(MI.id("block/hatch_placement_overlay")); - public static void drawOverlay(PoseStack ms, MultiBufferSource vcp, int overlay) { - VertexConsumer vc = vcp.getBuffer(MIRenderTypes.cutoutHighlight()); - for (BakedQuad overlayQuad : overlayQuads.getQuads()) { - vc.putBulkData(ms.last(), overlayQuad, 1.0f, 1.0f, 1.0f, 1.0f, LightTexture.FULL_BRIGHT, /* not used by shader */ overlay); + // TODO 26.1 +// public static void drawOverlay(PoseStack ms, MultiBufferSource vcp, int overlay) { +// VertexConsumer vc = vcp.getBuffer(MIRenderTypes.cutoutHighlight()); +// for (BakedQuad overlayQuad : overlayQuads.getQuads()) { +// vc.putBulkData(ms.last(), overlayQuad, 1.0f, 1.0f, 1.0f, 1.0f, LightTexture.FULL_BRIGHT, /* not used by shader */ overlay); +// } +// } + + private static final QuadCube whiteQuads = new QuadCube(Identifier.fromNamespaceAndPath("neoforge", "white")); + + // TODO 26.1 +// public static void drawCube(PoseStack ms, MultiBufferSource vcp, float r, float g, float b, int light, int overlay) { +// VertexConsumer vc = vcp.getBuffer(MIRenderTypes.cutoutHighlight()); +// for (BakedQuad cubeQuad : whiteQuads.getQuads()) { +// vc.putBulkData(ms.last(), cubeQuad, r, g, b, 1.0f, light, overlay); +// } +// } + + /** + * Return the render handler for the passed fluid, if available, or the default instance otherwise. + */ + private static IClientFluidTypeExtensions getExtensions(FluidResource resource) { + return IClientFluidTypeExtensions.of(resource.getFluid().getFluidType()); + } + + /** + * Return the still sprite that should be used to render the passed fluid resource, or null if it's not available. + * The sprite should be rendered using the color returned by {@link #getFluidColor}. + */ + @Nullable + public static TextureAtlasSprite getFluidSprite(FluidResource fluidResource) { + if (fluidResource.isEmpty()) { + return null; } + return Minecraft.getInstance().getAtlasManager().getAtlasOrThrow(AtlasIds.BLOCKS) + .getSprite(getExtensions(fluidResource).getStillTexture(fluidResource.toStack(1))); } - private static final QuadCube whiteQuads = new QuadCube(ResourceLocation.fromNamespaceAndPath("neoforge", "white")); + /** + * Return the position-independent color that should be used to render {@linkplain #getFluidSprite the sprite} of the passed fluid variant. + */ + public static int getFluidColor(FluidResource fluidResource) { + return getExtensions(fluidResource).getTintColor(fluidResource.toStack(1)); + } - public static void drawCube(PoseStack ms, MultiBufferSource vcp, float r, float g, float b, int light, int overlay) { - VertexConsumer vc = vcp.getBuffer(MIRenderTypes.cutoutHighlight()); - for (BakedQuad cubeQuad : whiteQuads.getQuads()) { - vc.putBulkData(ms.last(), cubeQuad, r, g, b, 1.0f, light, overlay); + /** + * Return the position-dependent color that should be used to render {@linkplain #getFluidSprite the sprite} of the passed fluid variant. + */ + public static int getFluidColor(FluidResource fluidResource, @Nullable BlockAndTintGetter level, BlockPos pos) { + if (level == null) { + return getFluidColor(fluidResource); } + return getExtensions(fluidResource).getTintColor(fluidResource.getFluid().defaultFluidState(), level, pos); } private static final float TANK_W = 1 / 16f + 0.001f; public static final int FULL_LIGHT = 0x00F0_00F0; - public static void drawFluidInTank(BlockEntity be, PoseStack ms, MultiBufferSource vcp, FluidVariant fluid, float fill) { - drawFluidInTank(be.getLevel(), be.getBlockPos(), ms, vcp, fluid, fill); - } - - public static void drawFluidInTank(@Nullable Level world, BlockPos pos, PoseStack ms, MultiBufferSource vcp, FluidVariant fluid, float fill) { - VertexConsumer vc = vcp.getBuffer(RenderTypeHelper.getEntityRenderType(RenderType.translucent(), false)); - TextureAtlasSprite sprite = FluidVariantRendering.getSprite(fluid); - int color = FluidVariantRendering.getColor(fluid, world, pos); - float r = ((color >> 16) & 255) / 256f; - float g = ((color >> 8) & 255) / 256f; - float b = (color & 255) / 256f; + public static void drawFluidInTank(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, FluidResource fluid, float fillLevel, int color) { + submitNodeCollector.submitCustomGeometry(poseStack, Sheets.translucentBlockItemSheet(), (pose, vc) -> { + TextureAtlasSprite sprite = getFluidSprite(fluid); + if (sprite == null) { + return; + } + float r = ((color >> 16) & 255) / 256f; + float g = ((color >> 8) & 255) / 256f; + float b = (color & 255) / 256f; + + SodiumCompat.markSpriteActive(sprite); + + // Make sure fill is within [TANK_W, 1 - TANK_W] + float fill = fillLevel; + fill = TANK_W + (1 - 2 * TANK_W) * Math.min(1, Math.max(fill, 0)); + // Top and bottom positions of the fluid inside the tank + float topHeight = fill; + float bottomHeight = TANK_W; + // Render gas from top to bottom + if (fluid.getFluid().getFluidType().isLighterThanAir()) { + topHeight = 1 - TANK_W; + bottomHeight = 1 - fill; + } - SodiumCompat.markSpriteActive(sprite); + for (Direction direction : Direction.values()) { + Vector3f[] pos = new Vector3f[] { new Vector3f(), new Vector3f(), new Vector3f(), new Vector3f() }; + if (direction.getAxis().isVertical()) { + ModelHelper.square(pos, direction, TANK_W, TANK_W, 1 - TANK_W, 1 - TANK_W, direction == Direction.UP ? 1 - topHeight : bottomHeight); + } else { + ModelHelper.square(pos, direction, TANK_W, bottomHeight, 1 - TANK_W, topHeight, TANK_W); + } - // Make sure fill is within [TANK_W, 1 - TANK_W] - fill = TANK_W + (1 - 2 * TANK_W) * Math.min(1, Math.max(fill, 0)); - // Top and bottom positions of the fluid inside the tank - float topHeight = fill; - float bottomHeight = TANK_W; - // Render gas from top to bottom - if (fluid.getFluid().getFluidType().isLighterThanAir()) { - topHeight = 1 - TANK_W; - bottomHeight = 1 - fill; - } + long[] uv = ModelHelper.bakeUvs(pos, sprite, direction); - var emitter = new QuadBuffer(); - for (Direction direction : Direction.values()) { - emitter.emit(); + var quad = new BakedQuad( + pos[0], pos[1], pos[2], pos[3], + uv[0], uv[1], uv[2], uv[3], + -1, direction, sprite, true, 0, + BakedNormals.of(BakedNormals.pack(direction.getUnitVec3f())), BakedColors.DEFAULT, true); - if (direction.getAxis().isVertical()) { - emitter.square(direction, TANK_W, TANK_W, 1 - TANK_W, 1 - TANK_W, direction == Direction.UP ? 1 - topHeight : bottomHeight); - } else { - emitter.square(direction, TANK_W, bottomHeight, 1 - TANK_W, topHeight, TANK_W); + vc.putBulkData(pose, quad, r, g, b, 1, FULL_LIGHT, OverlayTexture.NO_OVERLAY); } - - emitter.spriteBake(sprite, MutableQuadView.BAKE_LOCK_UV); - emitter.color(-1, -1, -1, -1); - vc.putBulkData(ms.last(), emitter.toBakedQuad(sprite), r, g, b, 1, FULL_LIGHT, OverlayTexture.NO_OVERLAY); - } + }); } - public static void drawFluidInGui(GuiGraphics guiGraphics, FluidVariant fluid, int i, int j) { - drawFluidInGui(guiGraphics, fluid, i, j, 16, 1); - RenderSystem.enableDepthTest(); + public static void drawFluidInGui(GuiGraphics guiGraphics, FluidResource fluid, int x0, int y0) { + drawFluidInGui(guiGraphics, fluid, x0, y0, 16, 1); } - public static void drawFluidInGui(GuiGraphics guiGraphics, FluidVariant fluid, float i, float j, int scale, float fractionUp) { - RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS); - TextureAtlasSprite sprite = FluidVariantRendering.getSprite(fluid); - int color = FluidVariantRendering.getColor(fluid); + public static void drawFluidInGui(GuiGraphics guiGraphics, FluidResource fluid, int x0, int y0, int scale, float fractionUp) { + TextureAtlasSprite sprite = getFluidSprite(fluid); + int color = getFluidColor(fluid); if (sprite == null) return; - float r = ((color >> 16) & 255) / 256f; - float g = ((color >> 8) & 255) / 256f; - float b = (color & 255) / 256f; - RenderSystem.disableDepthTest(); - - RenderSystem.setShader(GameRenderer::getPositionTexColorShader); - BufferBuilder bufferBuilder = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); - float x0 = i; - float y0 = j; - float x1 = x0 + scale; - float y1 = y0 + scale * fractionUp; - float z = 0.5f; + int x1 = x0 + scale; + int y1 = y0 + Math.round(scale * fractionUp); float u0 = sprite.getU0(); float v1 = sprite.getV1(); float v0 = v1 + (sprite.getV0() - v1) * fractionUp; float u1 = sprite.getU1(); - Matrix4f model = guiGraphics.pose().last().pose(); - bufferBuilder.addVertex(model, x0, y1, z).setUv(u0, v1).setColor(r, g, b, 1); - bufferBuilder.addVertex(model, x1, y1, z).setUv(u1, v1).setColor(r, g, b, 1); - bufferBuilder.addVertex(model, x1, y0, z).setUv(u1, v0).setColor(r, g, b, 1); - bufferBuilder.addVertex(model, x0, y0, z).setUv(u0, v0).setColor(r, g, b, 1); - BufferUploader.drawWithShader(bufferBuilder.buildOrThrow()); - - RenderSystem.enableDepthTest(); + guiGraphics.innerBlit(RenderPipelines.GUI_TEXTURED, TextureAtlas.LOCATION_BLOCKS, x0, x1, y0, y1, u0, u1, v0, v1, color | 0xFF000000); SodiumCompat.markSpriteActive(sprite); } @@ -194,66 +207,48 @@ public static void quadWithAlpha(VertexConsumer consumer, PoseStack.Pose matrixE consumer.putBulkData(matrixEntry, quad, red, green, blue, alpha, light, overlay); } - private static final ResourceLocation LOCKED_TEXTURE_LOCATION = MI.id("block/locked"); - - public static void drawLockedTexture(BlockEntity entity, PoseStack matrices, MultiBufferSource vertexConsumers, int colorRgb) { - VertexConsumer vc = vertexConsumers.getBuffer(Sheets.cutoutBlockSheet()); - var sprite = Minecraft.getInstance().getTextureAtlas(InventoryMenu.BLOCK_ATLAS).apply(LOCKED_TEXTURE_LOCATION); - // draw the sprite on each face - - var pos = entity.getBlockPos(); - var state = entity.getBlockState(); - float r = (colorRgb >> 16 & 255) / 255.0F; - float g = (colorRgb >> 8 & 255) / 255.0F; - float b = (colorRgb & 255) / 255.0F; - - var emitter = new QuadBuffer(); - for (Direction direction : Direction.values()) { - if (direction.getAxis().isVertical() || - // Note: level can be null from builtin item renderer - entity.getLevel() != null && !Block.shouldRenderFace(state, entity.getLevel(), pos, - direction.getOpposite(), pos.relative(direction.getOpposite()))) { - continue; - } + private static final Material LOCKED_TEXTURE_LOCATION = ClientHooks.getBlockMaterial(MI.id("block/locked")); - emitter.emit(); - emitter.square(direction, 1, 0, 0, 1, 1.015f); - emitter.spriteBake(sprite, MutableQuadView.BAKE_LOCK_UV); + public static void drawLockedTexture(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int colorRgb) { + submitNodeCollector.submitCustomGeometry(poseStack, Sheets.cutoutBlockSheet(), (pose, vc) -> { + var sprite = Minecraft.getInstance().getAtlasManager().get(LOCKED_TEXTURE_LOCATION); + // draw the sprite on each face - vc.putBulkData(matrices.last(), - emitter.toBakedQuad(sprite), - r, g, b, 1, RenderHelper.FULL_LIGHT, OverlayTexture.NO_OVERLAY); - } - } + float r = (colorRgb >> 16 & 255) / 255.0F; + float g = (colorRgb >> 8 & 255) / 255.0F; + float b = (colorRgb & 255) / 255.0F; - public static final BlockEntityWithoutLevelRenderer BLOCK_AND_ENTITY_RENDERER = new BlockEntityWithoutLevelRenderer(null, null) { - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext displayContext, PoseStack matrices, MultiBufferSource vertexConsumers, int light, - int overlay) { - if (!(stack.getItem() instanceof BlockItem blockItem)) { - throw new IllegalArgumentException("Stack must be a block item!"); - } - if (!(blockItem.getBlock() instanceof EntityBlock entityBlock)) { - throw new IllegalArgumentException("Block must be an entity block!"); - } + for (Direction direction : Direction.values()) { + if (direction.getAxis().isVertical()) { + // TODO 26.1: it would be nice to restore this? +// // Note: level can be null from builtin item renderer +// entity.getLevel() != null && !Block.shouldRenderFace(state, entity.getLevel(), pos, +// direction.getOpposite(), pos.relative(direction.getOpposite()))) { + continue; + } - var fakeBlockEntity = entityBlock.newBlockEntity(BlockPos.ZERO, blockItem.getBlock().defaultBlockState()); - Objects.requireNonNull(fakeBlockEntity); - fakeBlockEntity.applyComponentsFromItemStack(stack); + Vector3f[] pos = new Vector3f[] { new Vector3f(), new Vector3f(), new Vector3f(), new Vector3f() }; + ModelHelper.square(pos, direction, 1, 0, 0, 1, 1.015f); - // Render the base block first - Minecraft.getInstance().getBlockRenderer().renderSingleBlock(fakeBlockEntity.getBlockState(), matrices, vertexConsumers, light, overlay); - // Render additional data using the block entity renderer - var renderer = Minecraft.getInstance().getBlockEntityRenderDispatcher().getRenderer(fakeBlockEntity); - Objects.requireNonNull(renderer).render(fakeBlockEntity, 0.0f, matrices, vertexConsumers, light, - overlay); - } - }; + long[] uv = ModelHelper.bakeUvs(pos, sprite, direction); + + var quad = new BakedQuad( + pos[0], pos[1], pos[2], pos[3], + uv[0], uv[1], uv[2], uv[3], + -1, direction, sprite, true, 0, + BakedNormals.of(BakedNormals.pack(direction.getUnitVec3f())), BakedColors.DEFAULT, true); + + vc.putBulkData(pose, + quad, + r, g, b, 1, RenderHelper.FULL_LIGHT, OverlayTexture.NO_OVERLAY); + } + }); + } public static void renderVoxelShape(PoseStack poseStack, VertexConsumer consumer, VoxelShape shape, double x, double y, double z, float red, float green, float blue, float alpha) { for (AABB aabb : shape.toAabbs()) { - LevelRenderer.renderShape(poseStack, consumer, Shapes.create(aabb), x, y, z, red, green, blue, alpha); + ShapeRenderer.renderShape(poseStack, consumer, Shapes.create(aabb), x, y, z, ARGB.colorFromFloat(alpha, red, green, blue), Minecraft.getInstance().getWindow().getAppropriateLineWidth()); } } diff --git a/src/client/java/aztech/modern_industrialization/client/util/UseBlockEntityRenderer.java b/src/client/java/aztech/modern_industrialization/client/util/UseBlockEntityRenderer.java new file mode 100644 index 000000000..87357de81 --- /dev/null +++ b/src/client/java/aztech/modern_industrialization/client/util/UseBlockEntityRenderer.java @@ -0,0 +1,71 @@ +package aztech.modern_industrialization.client.util; + +import aztech.modern_industrialization.MI; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.serialization.MapCodec; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.special.SpecialModelRenderer; +import net.minecraft.client.renderer.state.CameraRenderState; +import net.minecraft.core.BlockPos; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.phys.Vec3; +import net.neoforged.neoforge.transfer.item.ItemResource; +import org.joml.Vector3fc; +import org.jspecify.annotations.Nullable; + +import java.util.Objects; +import java.util.function.Consumer; + +public record UseBlockEntityRenderer() implements SpecialModelRenderer { + @Override + public void submit(@Nullable ItemResource resource, ItemDisplayContext type, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int lightCoords, int overlayCoords, boolean hasFoil, int outlineColor) { + Objects.requireNonNull(resource, "UseBlockEntityRenderer resource must not be null"); + if (!(resource.getItem() instanceof BlockItem blockItem)) { + throw new IllegalArgumentException("Stack must be a block item!"); + } + if (!(blockItem.getBlock() instanceof EntityBlock entityBlock)) { + throw new IllegalArgumentException("Block must be an entity block!"); + } + + var fakeBlockEntity = entityBlock.newBlockEntity(BlockPos.ZERO, blockItem.getBlock().defaultBlockState()); + Objects.requireNonNull(fakeBlockEntity); + fakeBlockEntity.applyComponentsFromItemStack(resource.toStack()); + + // Render additional data using the block entity renderer + var renderer = Minecraft.getInstance().getBlockEntityRenderDispatcher().getRenderer(fakeBlockEntity); + var renderState = Objects.requireNonNull(renderer).createRenderState(); + renderer.extractRenderState(fakeBlockEntity, renderState, 0, Vec3.ZERO, null); + renderState.lightCoords = lightCoords; + renderer.submit(renderState, poseStack, submitNodeCollector, new CameraRenderState()); + } + + @Override + public void getExtents(Consumer output) {} + + @Override + public ItemResource extractArgument(ItemStack stack) { + return ItemResource.of(stack); + } + + public record Unbaked() implements SpecialModelRenderer.Unbaked { + public static final Identifier TYPE_ID = MI.id("use_block_entity_renderer"); + + public static final Unbaked INSTANCE = new Unbaked(); + public static final MapCodec CODEC = MapCodec.unit(INSTANCE); + + @Override + public SpecialModelRenderer bake(BakingContext context) { + return new UseBlockEntityRenderer(); + } + + @Override + public MapCodec type() { + return CODEC; + } + } +} diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ForgeHammerRecipeHandler.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ForgeHammerRecipeHandler.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ForgeHammerRecipeHandler.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ForgeHammerRecipeHandler.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MIDragDropHandler.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MIDragDropHandler.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MIDragDropHandler.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MIDragDropHandler.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineRecipeHandler.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineRecipeHandler.java similarity index 97% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineRecipeHandler.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineRecipeHandler.java index ecdd8a65a..f098e53d0 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineRecipeHandler.java +++ b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineRecipeHandler.java @@ -37,7 +37,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.crafting.RecipeHolder; import org.apache.commons.lang3.mutable.MutableBoolean; @@ -106,7 +106,7 @@ private boolean lockSlots(EmiRecipe recipe, AbstractContainerScreen category) { // Check if the block is in the worktables - it's a hack but it should work. :P - ResourceLocation blockId = handler.guiParams.blockId; + Identifier blockId = handler.guiParams.blockId; MutableBoolean hasWorkstation = new MutableBoolean(false); category.wrapped.buildWorkstations(items -> { diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineStackProvider.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineStackProvider.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineStackProvider.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/MachineStackProvider.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ManualPluginEmi.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ManualPluginEmi.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ManualPluginEmi.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ManualPluginEmi.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerCategoryEmi.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerCategoryEmi.java similarity index 97% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerCategoryEmi.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerCategoryEmi.java index 0fa31ea6f..0ec132c18 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerCategoryEmi.java +++ b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerCategoryEmi.java @@ -48,7 +48,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; @@ -62,7 +62,7 @@ public ViewerCategoryEmi(ViewerCategory category) { @Override public void render(GuiGraphics guiGraphics, int x, int y, float delta) { var texture = (ViewerCategory.Icon.Texture) category.icon; - guiGraphics.blit(texture.loc(), x - 1, y - 1, 0, texture.u(), texture.v(), 18, 18, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, texture.loc(), x - 1, y - 1, 0, texture.u(), texture.v(), 18, 18, 256, 256); } }); @@ -253,7 +253,7 @@ public ViewerCategoryEmi getCategory() { } @Override - public ResourceLocation getId() { + public Identifier getId() { return wrapped.getRecipeId(recipe); } @@ -308,7 +308,7 @@ public void arrow(int x, int y) { } @Override - public void texture(ResourceLocation loc, int x, int y, int u, int v, int width, int height) { + public void texture(Identifier loc, int x, int y, int u, int v, int width, int height) { widgets.addTexture(loc, x - 4, y - 4, width, height, u, v); } @@ -406,7 +406,7 @@ public boolean supportsRecipeTree() { private static void createFluidSlotBackground(WidgetHolder widgets, int x, int y) { widgets.addDrawable(0, 0, 0, 0, (guiGraphics, mouseX, mouseY, delta) -> { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, x - 1 - 4, y - 1 - 4, 18, 0, 18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, x - 1 - 4, y - 1 - 4, 18, 0, 18, 18); }); } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerPluginEmi.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerPluginEmi.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerPluginEmi.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/ViewerPluginEmi.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/package-info.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/package-info.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/package-info.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/emi/package-info.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MIDraggableStackVisitor.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MIDraggableStackVisitor.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MIDraggableStackVisitor.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MIDraggableStackVisitor.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineClickAreaHandler.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineClickAreaHandler.java similarity index 96% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineClickAreaHandler.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineClickAreaHandler.java index e5f419a3f..14267fe88 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineClickAreaHandler.java +++ b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineClickAreaHandler.java @@ -36,13 +36,13 @@ import me.shedaniel.rei.api.client.registry.screen.ClickArea; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; class MachineClickAreaHandler implements ClickArea { @Override public Result handle(ClickAreaContext context) { MachineMenuClient screenHandler = context.getScreen().getMenu(); - ResourceLocation blockId = screenHandler.guiParams.blockId; + Identifier blockId = screenHandler.guiParams.blockId; List categories = ReiMachineRecipes.machineToClickAreaCategory.getOrDefault(blockId, Collections.emptyList()); Rectangle rectangle = ReiMachineRecipes.machineToClickArea.get(blockId); diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineFocusedStackProvider.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineFocusedStackProvider.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineFocusedStackProvider.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineFocusedStackProvider.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineSlotLockingHandler.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineSlotLockingHandler.java similarity index 97% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineSlotLockingHandler.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineSlotLockingHandler.java index 32aa25a4c..0056be3ff 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineSlotLockingHandler.java +++ b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/MachineSlotLockingHandler.java @@ -35,7 +35,7 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeHolder; @@ -61,7 +61,7 @@ public Result handle(Context context) { private boolean canApply(MachineMenuClient handler, CategoryIdentifier category) { // Check if the block is in the worktables - it's a hack but it should work. :P - ResourceLocation blockId = handler.guiParams.blockId; + Identifier blockId = handler.guiParams.blockId; List workstations = CategoryRegistry.getInstance().get(category).getWorkstations(); for (EntryIngredient workstationEntries : workstations) { for (EntryStack entry : workstationEntries) { diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ManualPluginRei.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ManualPluginRei.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ManualPluginRei.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ManualPluginRei.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ReiSlotUtil.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ReiSlotUtil.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ReiSlotUtil.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ReiSlotUtil.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerCategoryRei.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerCategoryRei.java similarity index 96% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerCategoryRei.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerCategoryRei.java index 1375cc55c..4561a9d56 100644 --- a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerCategoryRei.java +++ b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerCategoryRei.java @@ -50,7 +50,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; @@ -68,7 +68,7 @@ public ViewerCategoryRei(ViewerCategory wrapped) { this.icon = wrapped.icon instanceof ViewerCategory.Icon.Stack stack ? EntryStacks.of(stack.stack()) : (guiGraphics, bounds, mouseX, mouseY, delta) -> { var texture = (ViewerCategory.Icon.Texture) wrapped.icon; - guiGraphics.blit(texture.loc(), bounds.x - 1, bounds.y - 1, texture.u(), texture.v(), 18, 18, 256, 256); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, texture.loc(), bounds.x - 1, bounds.y - 1, texture.u(), texture.v(), 18, 18, 256, 256); }; } @@ -281,7 +281,7 @@ public CategoryIdentifier getCategoryIdentifier() { } @Override - public Optional getDisplayLocation() { + public Optional getDisplayLocation() { return Optional.of(wrapped.getRecipeId(recipe)); } } @@ -320,7 +320,7 @@ public void arrow(int x, int y) { } @Override - public void texture(ResourceLocation loc, int x, int y, int u, int v, int width, int height) { + public void texture(Identifier loc, int x, int y, int u, int v, int width, int height) { widgets.add(Widgets.createTexturedWidget(loc, bounds.x + x, bounds.y + y, u, v, width, height)); } @@ -369,7 +369,7 @@ public void scrollableSlots(int cols, int rows, List stacks) {} private static Widget createFluidSlotBackground(Point point) { return Widgets.createDrawableWidget((guiGraphics, mouseX, mouseY, delta) -> { - guiGraphics.blit(MachineScreen.SLOT_ATLAS, point.x - 1, point.y - 1, 18, 0, 18, 18); + guiGraphics.blit(RenderPipelines.GUI_TEXTURED, MachineScreen.SLOT_ATLAS, point.x - 1, point.y - 1, 18, 0, 18, 18); }); } diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerPluginRei.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerPluginRei.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerPluginRei.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/ViewerPluginRei.java diff --git a/src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/package-info.java b/src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/package-info.java similarity index 100% rename from src/client/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/package-info.java rename to src/client_disabled/java/aztech/modern_industrialization/client/compat/viewer/impl/rei/package-info.java diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 253811f8d..5cbbd951f 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.21.1 2025-10-17T22:04:47.2719957 Registries +// 26.1-snapshot-4 2026-02-03T21:47:16.5900239 Registries bdb38be61385cfc427672c1d38064cd505ffad6d data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_antimony.json a70728b880e93d1f671b539a4f93009db26a6a7a data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_bauxite.json a29b6d14dda266bbf360e62c54fdcc1846c64db3 data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_lead.json @@ -19,6 +19,34 @@ ab40b69cad484e3d56a28c4644f5f2c752a77867 data/modern_industrialization/neoforge/ a0cc521cac5907ba72f5ba417913bbe0da506be0 data/modern_industrialization/neoforge/biome_modifier/ore_generator_tin.json 8621009208d2c3aa9a07754704fead50ed8c94fe data/modern_industrialization/neoforge/biome_modifier/ore_generator_tungsten.json 6ced7f0fa0d9fe2592b209a3c5b013033ffb2899 data/modern_industrialization/neoforge/biome_modifier/ore_generator_uranium.json +68b07267b138fecc673c097745784330198f9cf5 data/modern_industrialization/trade_set/industrialist/level_1.json +7d10b8425979077463f26b4ea07c31906e30b9ba data/modern_industrialization/trade_set/industrialist/level_2.json +41ea4ab3ff30969430bc94da6792db1f3c7a1af5 data/modern_industrialization/trade_set/industrialist/level_3.json +07f0bee17c3e15b6ce4d9884f3e2e61b626ca846 data/modern_industrialization/trade_set/industrialist/level_4.json +b1c4c6974b765514c3bd2033645ff9ca63691f86 data/modern_industrialization/trade_set/industrialist/level_5.json +21ba55f5c1e83021da35d2402e6e928da7c389f0 data/modern_industrialization/villager_trade/industrialist/1/emerald_copper.json +0b3e904dd27482926c1c5cf4cccb39cb26657c53 data/modern_industrialization/villager_trade/industrialist/1/emerald_fire_clay.json +b3dd9a0cd4395cb2c45745f5ae139b65ec546021 data/modern_industrialization/villager_trade/industrialist/1/emerald_steel_hammer.json +7b250d35006b247be3a564a977818dd909aa8c1e data/modern_industrialization/villager_trade/industrialist/1/emerald_tin.json +428d94ef1989bfb2400ba86c74d1833d2c18f8fa data/modern_industrialization/villager_trade/industrialist/1/lignite_emerald.json +f2f26d7b3757d5831fa614e26e5c62b3ffd4a73a data/modern_industrialization/villager_trade/industrialist/2/emerald_bronze_ingot.json +675af7a0bf9a93f17edfd3bdcca41b959354d6e9 data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_gear.json +d3f8ff1cae3addf33b381f5461fb5445d0efa9fc data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_rotor.json +7d08578d1ff35e59c357c006b7aadbf035281809 data/modern_industrialization/villager_trade/industrialist/2/emerald_rubber_sheet.json +347f2ebbbe86cafe83607d421ca588453177b914 data/modern_industrialization/villager_trade/industrialist/2/sulfur_dust_emerald.json +19e6099bca263fc293e9fb73b47e67fdd18c4c68 data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_gear.json +6679bc857045aded724e76a2fd8345c9ce9eac2e data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_rotor.json +bada5a221f03bdd64854de982e911d744b73c936 data/modern_industrialization/villager_trade/industrialist/3/emerald_steel_ingot.json +98d1dd6dc0b9735cf4e374916854c2e4e48d79e0 data/modern_industrialization/villager_trade/industrialist/3/fluid_pipe_emerald.json +8a711c6588c3fb0e1aa65f2c92cd40d41514d3d3 data/modern_industrialization/villager_trade/industrialist/3/item_pipe_emerald.json +d96b070744c0006eb9aa581c281b9301805b652e data/modern_industrialization/villager_trade/industrialist/4/copper_cable_emerald.json +865f130d03f88c6ecf37e7d0630f4d17b87e3822 data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_gear.json +58befd593a7f4b3be19dc70b1dbd1f7d3083647e data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_plate.json +8cf438379bbcd984973285ba259ba628fa28c4c3 data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_upgrade.json +e3684dc339e79ad5ec023e503f52baa6f7e9523b data/modern_industrialization/villager_trade/industrialist/4/tin_cable_emerald.json +fc52046484a7e92f3e9e42de9f7e92d62377f7b2 data/modern_industrialization/villager_trade/industrialist/5/emerald_analog_circuit.json +7d083cdf4f21b20e195198ac3972a08aae4da5b9 data/modern_industrialization/villager_trade/industrialist/5/emerald_bronze_drill.json +bb1ba8f83d94524c959eedfb5caf0163411fd4ea data/modern_industrialization/villager_trade/industrialist/5/emerald_motor.json 451b8c0a8c46e838b40d2c357bb94a9e7cc8f0c5 data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_antimony.json bcd43e2718b596521e1d7ce1ddda138b50c101db data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_bauxite.json 105137aad2aff00e4cfb430496e8acd5a7b60b6e data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_lead.json diff --git a/src/generated/resources/.cache/2b5975cd7b0491804d3bb733622016fe61277cc0 b/src/generated/resources/.cache/2b5975cd7b0491804d3bb733622016fe61277cc0 index 90a64de34..8cc8398e4 100644 --- a/src/generated/resources/.cache/2b5975cd7b0491804d3bb733622016fe61277cc0 +++ b/src/generated/resources/.cache/2b5975cd7b0491804d3bb733622016fe61277cc0 @@ -1,2 +1,2 @@ -// 1.21.1 2024-09-04T12:33:40.4239744 Tags for minecraft:point_of_interest_type mod id modern_industrialization +// 26.1-snapshot-4 2026-02-03T21:47:16.5890227 Tags for minecraft:point_of_interest_type mod id modern_industrialization 7a33082341f7cded036e055275f4d7dab31d745e data/minecraft/tags/point_of_interest_type/acquirable_job_site.json diff --git a/src/generated/resources/.cache/473a317756c5ccfb1f5319d3532b16d0b0d6dc3a b/src/generated/resources/.cache/473a317756c5ccfb1f5319d3532b16d0b0d6dc3a new file mode 100644 index 000000000..94156576b --- /dev/null +++ b/src/generated/resources/.cache/473a317756c5ccfb1f5319d3532b16d0b0d6dc3a @@ -0,0 +1,6 @@ +// 26.1-snapshot-4 2026-02-03T21:47:16.5920254 Tags for minecraft:villager_trade mod id modern_industrialization +fdd2633ea26700980b856737aa208a58cb99536a data/modern_industrialization/tags/villager_trade/industrialist/level_1.json +f77994a0a4f8191cf29483ac3f75e0480129ac94 data/modern_industrialization/tags/villager_trade/industrialist/level_2.json +87d360a222b1d4511b771fc58bc34a37f1cbfb6d data/modern_industrialization/tags/villager_trade/industrialist/level_3.json +7ed0596c9a3d1705436aaa08d7572cd8079cd13b data/modern_industrialization/tags/villager_trade/industrialist/level_4.json +400b71132b8e471d2d317f1790e8d18ee13def0b data/modern_industrialization/tags/villager_trade/industrialist/level_5.json diff --git a/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 b/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 index d114ba4ea..701e6b9e9 100644 --- a/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 +++ b/src/generated/resources/.cache/4ba8b200e0e2696e16b0a4f55609d68efa5ecb68 @@ -1,2449 +1,3082 @@ -// 1.21.1 2025-10-17T22:04:47.2462839 Server Data (aggregated) -3ed44658dfe9569ce8f176ca3f3c3c82fe6feeaa data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json -17019fa80e9403e189de444bc671ebd0e01cd445 data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json -4f16b34fe53d232383c92af163f2227351f88801 data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json -cffc554b27e2aab505dd6b2e7e8cf2acc6bf0e4f data/modern_industrialization/recipe/alloy/mixer/bronze/tiny_dust.json -0c60bf0cd9674c740762516b71000d3115f3e011 data/modern_industrialization/recipe/alloy/mixer/cupronickel/dust.json -85e798d418fe167e4b28a7fc0383a12cd33502f0 data/modern_industrialization/recipe/alloy/mixer/cupronickel/tiny_dust.json -44befaf8d2f1c16ea99ecfda9b314ee0c6969811 data/modern_industrialization/recipe/alloy/mixer/electrum/dust.json -bd01eeff09386746251825f4e8dc65133471d495 data/modern_industrialization/recipe/alloy/mixer/electrum/tiny_dust.json -76af44de3e36cc2c7a31830ad313ce1d50249962 data/modern_industrialization/recipe/alloy/mixer/he_mox/dust.json -fcb1d0b207a224c8c7882e40c134aa5252fefefb data/modern_industrialization/recipe/alloy/mixer/he_mox/tiny_dust.json -f35ad4bcb7b8c4934b72e3bb5bce9621643b2931 data/modern_industrialization/recipe/alloy/mixer/he_uranium/dust.json -7fc18e6fdc30429a9e4f4a1725add9b0f7166235 data/modern_industrialization/recipe/alloy/mixer/he_uranium/tiny_dust.json -43a013558de1f08b08b94397bde30e2bcc6bee8a data/modern_industrialization/recipe/alloy/mixer/invar/dust.json -966f30dee786fb86535f3d14debe6ffd6b0082f4 data/modern_industrialization/recipe/alloy/mixer/invar/tiny_dust.json -4b7a048a26b12b18cdd72a11b07428042237ae67 data/modern_industrialization/recipe/alloy/mixer/kanthal/dust.json -a99e34667d12bdc5e7ec99078afe451c9f3a1fae data/modern_industrialization/recipe/alloy/mixer/kanthal/tiny_dust.json -5a3830af502a1493b97d9848aaf9dc2331e888ee data/modern_industrialization/recipe/alloy/mixer/le_mox/dust.json -50495be3c26a23acce369e32234ba448c0154294 data/modern_industrialization/recipe/alloy/mixer/le_mox/tiny_dust.json -301e06f3294b24b84954aba9a597da3a82d118d0 data/modern_industrialization/recipe/alloy/mixer/le_uranium/dust.json -866ad91065597eaefef47ad4d1d3c8a0f30584af data/modern_industrialization/recipe/alloy/mixer/le_uranium/tiny_dust.json -8680f2faa22991205fbddfdc287a1da5333f15c4 data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/dust.json -befd61b404046a781f4168d4e7c4f4fd7e74927a data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/tiny_dust.json -1377009e59aaa2a5570eb324545593d38f872cf0 data/modern_industrialization/recipe/alloy/mixer/stainless_steel/dust.json -1931a11b3dc8a28d2e2e532c1ffb09eb69fca429 data/modern_industrialization/recipe/alloy/mixer/stainless_steel/tiny_dust.json -8d9e45a43125094d2572b5e3c434bc409bf4acd6 data/modern_industrialization/recipe/alloy/mixer/superconductor/dust.json -78a288547534f18a010494ffd9b50116b4a07965 data/modern_industrialization/recipe/alloy/mixer/superconductor/tiny_dust.json -16d54e1aa75d230b7853234fc3ae3f6015eadd40 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/cadmium_battery.json -b9734be3bdddfdcb37696cbe439122a693f680ff data/modern_industrialization/recipe/assembler_generated/electric_age/battery/lv_battery.json -240ce20cb682b1dad98883e982ff037efa30d8c5 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/plutonium_battery.json -df1111bce5ab44e699f1b568b297688bdc6cad30 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/portable_storage_unit.json -ba743907e1174b0c2e43c8213cb00074bdd580ac data/modern_industrialization/recipe/assembler_generated/electric_age/battery/silicon_battery.json -21810324f1e57e32278a9cf75f97e7c1fd6a4d41 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/sodium_battery.json -427fa72f2c924bcae9c62a4cab8c328a7af0d0b1 data/modern_industrialization/recipe/assembler_generated/electric_age/blocks/fusion_chamber.json -89edc8eecb669dd3943f420bfd1d4e6db4f5863e data/modern_industrialization/recipe/assembler_generated/electric_age/casing/advanced_machine_casing.json -a846939cb6e5b5dcac030ad9407b27fde9732a52 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/blastproof_casing.json -83a8d608791100ce2548ef975c2ab29f6c36a8c4 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/bronze_plated_bricks.json -56f7a972d51384ade46baa83e6aeb71c733d5bb6 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/clean_stainless_steel_machine_casing.json -2d5823c9c9a09588336f3ddb4c2ef7e409cb50de data/modern_industrialization/recipe/assembler_generated/electric_age/casing/frostproof_machine_casing.json -b74ed70cb9c68b2520f95c8477dfd12936d72b31 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/heatproof_machine_casing.json -5cebd94257903376d39b287717f5bcd69a49c601 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/highly_advanced_machine_casing.json -07b27b0104ead99d55e235358b71f1a390909eba data/modern_industrialization/recipe/assembler_generated/electric_age/casing/iridium_machine_casing_pipe.json -bd4de3bdd5de35713c82237769e11e5baf7f5cc7 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_casing.json -7df0a50c53328044f1f29aa56c5992cd97337745 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_fluid_hatch.json -280646924e22ffac88867810c0600af17f3a1e46 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_item_hatch.json -7b7ba549cb675c427443b8c26b2a7a5692188f2d data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_pipe_casing.json -f4b48b32a5ae70c97a9e997148ff6c3775909024 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/plasma_handling_iridium_machine_casing.json -74a63c96eab80f45eb4e1f83ddaa8f5a1c511047 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/quantum_machine_casing.json -2f55514723352b3b6d591980d78baae8fdc79b0b data/modern_industrialization/recipe/assembler_generated/electric_age/casing/solid_titanium_machine_casing.json -6ace4b7a434f536ad2683e4e38358a796bc7cd23 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/stainless_steel_casing_pipe.json -0042c7af79e17b339c375a20a94b0eea13a7f51e data/modern_industrialization/recipe/assembler_generated/electric_age/casing/titanium_casing_pipe.json -650e3b9ddfc95a1508fc0b7261d317b3de92176e data/modern_industrialization/recipe/assembler_generated/electric_age/casing/turbo_machine_casing.json -e121ca86c86dd395fdecde2e165d59e0b056f1f3 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/digital_circuit.json -6eca4c730aa53ba6dc5c80e2b4d2afdc05008a02 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit.json -bffdc6555830b7f65a37efa5d9a06f7a7571d77d data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit_board.json -8d07f5b19a971afd15519013652b3f7f6da88883 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit.json -ba797c47a868731d57b0e8dc71737e6d87f1567c data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit_board.json -5ff2bfd3ba1a92cf1aeeb4e3574976a3c26f5195 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/processing_unit.json -004bd90350dc62843aeb9b87d0b2d7b84629a214 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/quantum_circuit.json -9fc7b5212abf539dd9434442a7f4c71333f15922 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/advanced_motor.json -5a07c46721d31e80e073fd12819fd0377168160c data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/air_intake.json -1be995085a19a4f8281d71920b9786de4d24f74f data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/and_gate.json -11ae0adcc6b5fd2c0612f6ad15e4f7002c00cb26 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/arithmetic_logic_unit.json -c42f316cdddf966ce3892ee8a2e7ed7f1ba4b084 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/conveyor.json -53cead36895f11b6967eb5be9e0b5b0c491d3495 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode.json -dc0f501d6e5a178c3b841863d49e515be8263f87 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode_doped.json -7c4edbde7e562e7480b602230b021cb0e94db88a data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/invar_rotary_blade.json -900c26e7cff953b342cd8ce23cb78a2e9ab1f68c data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_motor.json -a7fdc7acfb3537f1643ef58b2f0b1641d01c8cbb data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_pump.json -aa74ebfe9a913598b56d727cd5cac638784bbf07 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_heat_exchanger.json -196d6527945ef967570544d3bfce5bd6d8dac382 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_motor.json -0bd55819b09c8a1d15393cf1ac0bd16599ba3c58 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_pump.json -45d50261553fc1ffbac604d279197e941d9d3455 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/memory_management_unit.json -edfb88f2d2f0033ec0b453a6bd65244d9bd91cc3 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/motor.json -42e9bb7c5ca0d8605840a27f9d027594a9405d18 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/not_gate.json -02ca213b3036b3c84ccf4d70323c4f3d3bc790f5 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/op_amp.json -bca59189d340b3e4e9b680c871688cf0abb7006b data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/or_gate.json -941c1854c87b2e466705ce507a83d66c9b4ecfa3 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/overdrive_module.json -a622a095b66eb49b79186dec53af1961490e521e data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/piston.json -a65fbcaa617e10046c5bbdf40c7919b1b92f5d5a data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/redstone_control_module.json -699636c415fc1a4d6b55d39c84f5ac1fc8cbd690 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/robot_arm.json -9371559b70b5d4c24f80fb719c810bf06aec1371 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/small_heat_exchanger.json -1da3bc6af5acbdd8c0395795433df5fcc86ffccb data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor.json -094cbe8df618fb01069296ff887ef09ebef8daaf data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor_doped.json -374b5b5b5ba8619f48e1154724be267ccf3c3ca4 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/ultradense_metal_ball.json -eddf2bd18b18fb6be49391db44278c61b48d54df data/modern_industrialization/recipe/assembler_generated/electric_age/hull/advanced_machine_hull.json -894aee70283d62610bc42246efa8ee14d618c270 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/highly_advanced_machine_hull.json -b36f2179e426350e7e05f6b5c8a7e34d7cdcd562 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/lv_machine_hull.json -08d15bb5863e51af732bd34217cfc03774c4c083 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/quantum_machine_hull.json -70e73d762b8e7cd80401375cd78e55caf2b9fdc6 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/turbo_machine_hull.json -8efcb1a747efe7a2bf63d0a65f1748ab8d585f99 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/advanced_large_steam_boiler.json -be5af33aed2a87518a8a5b81a3e4461c4cf223ab data/modern_industrialization/recipe/assembler_generated/electric_age/machine/assembler.json -6b88f69ecea625274367cb3d539406c1eae63d3b data/modern_industrialization/recipe/assembler_generated/electric_age/machine/centrifuge.json -2f48841f8123ccc8c300dbc8dd0c37e30158c469 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/chemical_reactor.json -0d27f02aaa5454ea9a8199f522994b24600c1672 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/compressor.json -a39e9f3d68223e6966c96aa3aed4a5525f4549b7 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_chest.json -ae2fcf08d4af1b8b636a0fef36234b93ea0a6869 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_tank.json -bacaad1dccefdef8a18cc6554038b04f1e33f1b1 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/cutting_machine.json -4ce7957f71f441e13deec94fb916d2aa8d7cb41d data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillation_tower.json -30d6ffa3d567e4d21c66ef4d1f95ec558ad674da data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillery.json -8fe7c628c5ee9cf86d88262c2efe6a6aefd5150d data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_blast_furnace.json -38f42ac1ff9b85a2ad29a2b4a62bddf99d9bfd48 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_quarry.json -76a793d239cf1e5864c3ab64384b1041300d0105 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electrolyzer.json -fbfc1d08b234d3bc8ae3635669a55e8bafbaf06c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/furnace.json -679e23ae612158dc282f4a0e2a064893ffa91fda data/modern_industrialization/recipe/assembler_generated/electric_age/machine/fusion_reactor.json -a020a0e9fc89721e0e677d7b140a2b5038fb2c8e data/modern_industrialization/recipe/assembler_generated/electric_age/machine/heat_exchanger.json -d3b221f6d816fe56e6da73b749596059ad0f3bb4 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_advanced_large_steam_boiler.json -97fe7bd245859905195cdeed13fa841190d6e49c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_large_steam_boiler.json -96fa7afe0a77dc32ebb36325fd1ae9fb9b8e6d2d data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json -317706a8875aaacb912e648ecbfa9ed110e27400 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json -312ea17d4038e83b9127ce98537d0e620ae3515c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json -a2391a11890dd94b6bc8ab14bba6afe08970e75e data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json -6061a5c9d59bb515163b4da8316f9104aa45d38c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json -09fbc58fe47aabc572679196e87c1cefc6da42c1 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json -995c6b0e673b7ba571b410715a93e5b45d85534f data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json -d68150754e49823b2de81e8df4f995e5fed1fdd0 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json -88c7953eded128f7b0963994194da138a908e61e data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json -348421cbbb9488a8f29f3c2773c89164f7e46269 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_steam_turbine.json -77b20a82d652f10e770dc64def3816e6c0ab3d69 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/macerator.json -8ecd4e59068cc45e4f20fdcf6e5941dc141a3263 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mixer.json -c0d9bd7c9ab810acb820a3469be2f1e11c16277c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_diesel_generator.json -867a534dc639d1a18707f3ce0f7e812916c30dca data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_steam_turbine.json -4262983b5774303a9b002c8f579337f151519d16 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/nuclear_reactor.json -436a28fb87f579ece5c04276d6117b7428bfa688 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/packer.json -c4334bd6b83af9b13fa6213adf982c6273e9f6af data/modern_industrialization/recipe/assembler_generated/electric_age/machine/plasma_turbine.json -b7a988bc2db82c1ba33805ea12a059128a22ffaf data/modern_industrialization/recipe/assembler_generated/electric_age/machine/polarizer.json -9811ed85b6a75d97866719985e905827f80398dd data/modern_industrialization/recipe/assembler_generated/electric_age/machine/pressurizer.json -0c1426b96bbc192cf55295665471c8c47c61ff65 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/unpacker.json -bd508b000f147d9275573e2ecc7dc40dce8a0ff4 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/vacuum_freezer.json -f624b8666a530ae1c7a6b1aa01354ca200f3d370 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/water_pump.json -6fce5c2e1c94eca891207f2cd13c112a70b20f9b data/modern_industrialization/recipe/assembler_generated/electric_age/machine/wiremill.json -5a25100593ecce735ee4575c83a4b23fc3e919d4 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/ev_storage_unit.json -0bc7be663adfff57c1f039b595e2163b187e6e74 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/hv_storage_unit.json -d8c3978aefbd92208205638aeb88e70e86d50794 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/lv_storage_unit.json -501053c5dcb5a89a836170a434254a3b823146d9 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/mv_storage_unit.json -37dcbcc12cbe284d86df6865f6222f22ae826447 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/superconductor_storage_unit.json -4d4730238b89a7fe920ce01b61bfb65f0d35d8ea data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/down.json -ee2c945a41b028d60724f4c6ce21c04e9581004e data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/up.json -c13915d628d0aace2a1b7cebd9fbc7b3606f0926 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/down.json -627efc42f482b9f675dd7ba8af54f189d74d5910 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/up.json -13a016b6035ba763681c650a9616ba735ed757ad data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/down.json -d981bbd27085a462554e296556b60465c9080a53 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/up.json -62d382f611bf8203dadddb397586daeed3f465fc data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/down.json -4cdb1b7cfc42e13299efd44b5b49d58d8cef8c45 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/up.json -f267bd728b0f8c2769f365e78f002c7353fa74e1 data/modern_industrialization/recipe/assembler_generated/oil/oil_drilling_rig.json -f8387a3333dfa7d0401d5654f50fad2a09bebd4b data/modern_industrialization/recipe/assembler_generated/quarry/drill/aluminum_drill.json -743dc1e8bf46cb6828e845c2fff755183dee0e30 data/modern_industrialization/recipe/assembler_generated/quarry/drill/bronze_drill.json -40a53e46a4f1e57cabc44e21b10a47873db7e601 data/modern_industrialization/recipe/assembler_generated/quarry/drill/copper_drill.json -fdc868dbc9e00e2a81711b61460d00fb34ca52f3 data/modern_industrialization/recipe/assembler_generated/quarry/drill/gold_drill.json -3aa21315d9da26a269cb26da212e9416a42fc76f data/modern_industrialization/recipe/assembler_generated/quarry/drill/stainless_steel_drill.json -153da3445ae098419bd086509cc6e73ebba1cc5b data/modern_industrialization/recipe/assembler_generated/quarry/drill/steel_drill.json -cb249009cc49580786d623bbd016ba3a78732b62 data/modern_industrialization/recipe/assembler_generated/quarry/drill/titanium_drill.json -d1307f39a96834309f0514c9e59777fa104f39e3 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/boiler.json -0255762c743f28cc7fa7053e255450503e8bebbf data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/casing_pipe.json -2fcc414a1eac8474534a61c50600c21abf4a0e99 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/compressor.json -0bcf8884a557006d4175ac6a102df142ed4ffdcf data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/cutting_machine.json -4535cf1bd2b3dcf28f4e1ae1e13f92ddd24985e2 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/furnace.json -ae120934eca04c1e04246a9cde7d5810ba31f200 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/macerator.json -973754dd8b7a183da41f4f9557bdbeafd294350f data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/machine_casing.json -916cb26411ddeb253ac81b5c4db9d5807e35114b data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/mixer.json -20259282fae1d416f03d59787f4b460cef4ad698 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/water_pump.json -8d1e6ebc84524a7f059b0db95bfdabac37d7799a data/modern_industrialization/recipe/assembler_generated/steam_age/fluid_pipe.json -748d43841a912b1a59f2d030a33521104f5f8421 data/modern_industrialization/recipe/assembler_generated/steam_age/item_pipe.json -31695218418e6210c60a9ee0006f4544b30edfed data/modern_industrialization/recipe/assembler_generated/steam_age/steel/boiler.json -73fec6f58c163341df9c271c1c2032c8e5334616 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/casing_pipe.json -969cbf67bafeb1de26822160baeecf2aa50638e6 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/furnace.json -4181055c152ee9467789b0d34d2274db2016fed2 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/machine_casing.json -f9e9d905791cac725b782f1d64eca4d1a2a5a1e0 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/packer.json -f9daf0a88394ac62f16e44e39e1830714f2a5341 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/quarry.json -fb0fae40271869e6bff30a6c1e5201424d95fbfc data/modern_industrialization/recipe/assembler_generated/steam_age/steel/steel_upgrade.json -44b38a752ff39a972896f4ae7c1fb379dc3b997a data/modern_industrialization/recipe/assembler_generated/steam_age/steel/unpacker.json -f9af1a61302a0d0c00465987402ba0e5fab24d5d data/modern_industrialization/recipe/assembler_generated/steam_age/steel/wiremill.json -1564de7eadf7ac1ccceef59b6a495027b634d9b8 data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/blast_furnace.json -cb9d0dec40563b52c46e27be8bd82435cc4ef672 data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_anvil.json -ebc284d26147a87bf1e96cfda434b1676630a4ec data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_forge_hammer.json -a6ccf3fd4d146f99b345de26111411a527d9e5c9 data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_hopper.json -ced046eea72e45eb797d4b8598659d5cd64bd96f data/modern_industrialization/recipe/compat/ae2/assembler/me_wire_direct.json -cc6ca8181632047f6d45ec47cc8ca24b246dcc10 data/modern_industrialization/recipe/compat/ae2/calculation_processor.json -8c01194e5eac73fa50deff97309e3a1eeeb8bd1f data/modern_industrialization/recipe/compat/ae2/craft/me_wire_direct.json -eebcb074081dd5012fd67d5fce3d8ed179a44395 data/modern_industrialization/recipe/compat/ae2/dyes/black/assembler/me_wire_direct.json -036a97776c16c8c69f2423075610d6a2bd92db86 data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_1.json -4e169eb8f5c4a572e8f8f53820f9ccf2e175eda0 data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_8.json -bf0fc16a1d83ebae944057f7cd19787cd3968558 data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_direct.json -a6dc93055830243bc86b9e70a7ff0542f0956fe6 data/modern_industrialization/recipe/compat/ae2/dyes/black/mixer/me_wire_8.json -a9bac7328cc12f9d8d05303eff427f7867e9a7d1 data/modern_industrialization/recipe/compat/ae2/dyes/blue/assembler/me_wire_direct.json -72a65491deb174609358118fa2d73d82965639ad data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_1.json -07ea0ee270a7baf1e5508053ca7cbb39fed073f4 data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_8.json -ca078af36645bd102bdf0df2eef46d10df8aa477 data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_direct.json -5d124b2a8eb6e8f5f47705eae2ff2094e97a3cf4 data/modern_industrialization/recipe/compat/ae2/dyes/blue/mixer/me_wire_8.json -776a437398204ff47b5536f0b47b7ecea3b986da data/modern_industrialization/recipe/compat/ae2/dyes/brown/assembler/me_wire_direct.json -5cdd830aa429759fff039fbf53c425b335782224 data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_1.json -150727fef209043eba226b7a378e064533e0cfe3 data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_8.json -83192073fdb1186dfadf13e924b36724c22a84e2 data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_direct.json -ebdcbf8e8c2fb5fa9087d281d35f0524a79a659d data/modern_industrialization/recipe/compat/ae2/dyes/brown/mixer/me_wire_8.json -5fba615714781e854dd675330c9d7515521d0815 data/modern_industrialization/recipe/compat/ae2/dyes/cyan/assembler/me_wire_direct.json -ad0a53b778d897ddac0359667274fbb8bfcd56e9 data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_1.json -ecd2246844e67511175bb5ebad3632d9a3914a7c data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_8.json -ad16b57f10ca1c0f4fe2a353fd074c47d3f18187 data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_direct.json -54ff34e295540616ed3d41250053e3bb96a551bb data/modern_industrialization/recipe/compat/ae2/dyes/cyan/mixer/me_wire_8.json -39c873f1b5d699ab7c3c5d521a86427d3eaf5ece data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_1.json -464ba8539f66384e099425f45fd5608a87684a36 data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_8.json -399d1bb4c39cee4fae7f194b26c1fad1a65d94d8 data/modern_industrialization/recipe/compat/ae2/dyes/decolor/mixer/me_wire.json -ac1533f7b6506a92f5db83cd8d4df880f6557964 data/modern_industrialization/recipe/compat/ae2/dyes/gray/assembler/me_wire_direct.json -80c79b19b5411953525237de26cd723ecdcaa1e9 data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_1.json -1c74cc14a6cd6f0e73570962a2724fb148aeed60 data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_8.json -2cbd8dc1436ea8801678c8917b24d52edf1ea159 data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_direct.json -5a718fdbd79dac198f002befa2f389be2cda1e9d data/modern_industrialization/recipe/compat/ae2/dyes/gray/mixer/me_wire_8.json -94413038f5e45097512b11dda234f31138072337 data/modern_industrialization/recipe/compat/ae2/dyes/green/assembler/me_wire_direct.json -49dd90e10a7792e7d079be78728202d26581cf76 data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_1.json -cbdd485b125cdb8c65486fdaa5cf5b53a8a8a2a9 data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_8.json -cd5ef572535b2015f0b2f818ff03104133abcd01 data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_direct.json -bb36a93c07b8d3681a77d2dca5df307fb6c6252a data/modern_industrialization/recipe/compat/ae2/dyes/green/mixer/me_wire_8.json -2f99a07423c837660505d1adef7f04801dc227dd data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/assembler/me_wire_direct.json -6d636056a67423c655aaf0df8c8656cf74c23820 data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_1.json -dca8f07077545c02bdd7abb720248768e107f5d5 data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_8.json -0c84a62b53925000c023f42a6510bb38d129d279 data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_direct.json -57233217debca0bff7da98d258f5568f118d2afe data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/mixer/me_wire_8.json -a6c9cb4a0c074389f174af25a0a8a1568426174a data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/assembler/me_wire_direct.json -0f9f4acf91da99e916758d392a1d006038f7b7a5 data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_1.json -cf24f13cb413416bdd3f8abd93ab4aba98a12285 data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_8.json -9f8a312fdbe828599d1dddaca081ad06b49282e8 data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_direct.json -c61d90ddd1909e5dc88a8c9443a7734740a5a79a data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/mixer/me_wire_8.json -cf08b8325d3957aa9bf1002bf285e2fa48fd4598 data/modern_industrialization/recipe/compat/ae2/dyes/lime/assembler/me_wire_direct.json -1828c1e6338c6ee0d4b031733be2833509b98a3e data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_1.json -7ca4a76d8dea79b9aa23b1cdcaa8add14e954d6b data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_8.json -0c043404d19d98be06cd8a39aeb286d690bd3fc1 data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_direct.json -6edbca142a91122b5f85bb90a05eb45f58116d60 data/modern_industrialization/recipe/compat/ae2/dyes/lime/mixer/me_wire_8.json -314a3c838af79b3b23458c36e52cd85f3f8dbb68 data/modern_industrialization/recipe/compat/ae2/dyes/magenta/assembler/me_wire_direct.json -f9c2f1ef5dfa9c216023338538c279f9cbce775c data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_1.json -a390e5dad9933ed3546eb6de496de2641926ba0b data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_8.json -91b209ade9dd11399846c8565002ed4630e25d66 data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_direct.json -6ad61c16a48511f5ff805e095e89d522f47bf370 data/modern_industrialization/recipe/compat/ae2/dyes/magenta/mixer/me_wire_8.json -f9e8d19069b8df58e2cf1e4dbf64084aa2c3bbc5 data/modern_industrialization/recipe/compat/ae2/dyes/orange/assembler/me_wire_direct.json -6168eeae2ff1f06d22a3df6664c55b2d5d194bfe data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_1.json -f2fcc8e936117e3114dce94e69a3560a42f01047 data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_8.json -8a3ef6c3f8deefcbc60dffc43fc89c74a0b29cb9 data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_direct.json -3096f24b8400bdf59d83e1ca6cc283bbcd9be86d data/modern_industrialization/recipe/compat/ae2/dyes/orange/mixer/me_wire_8.json -08d8a03af6f20e2b09140efff327f5de2e9b91ca data/modern_industrialization/recipe/compat/ae2/dyes/pink/assembler/me_wire_direct.json -8f017bc882a57d40d3ad71c1177ad7635e310541 data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_1.json -10718609d56cd0c538d0fe916c09f1c265020785 data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_8.json -bc9195fe0f71c0493f56da58705baf271e857970 data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_direct.json -792bb5cce59003be1f70c6ff0a6d87aec4471b1b data/modern_industrialization/recipe/compat/ae2/dyes/pink/mixer/me_wire_8.json -eff382c7c9c742f52dbebaeb93711f0c2303fc40 data/modern_industrialization/recipe/compat/ae2/dyes/purple/assembler/me_wire_direct.json -9f9e504659b7b36d2fc075dac3f9a196274c44a8 data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_1.json -cf64747a76d43fdd2f675de59a0da24c39459ab5 data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_8.json -2e7c17df942c3393d8e47754ed67475a41e55547 data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_direct.json -dafc2d042aaafae7ee31f18d9ee384322c8ff109 data/modern_industrialization/recipe/compat/ae2/dyes/purple/mixer/me_wire_8.json -d8bc248bc918f4e7a12540ff059f0fe245f907a8 data/modern_industrialization/recipe/compat/ae2/dyes/red/assembler/me_wire_direct.json -e79f7d205ea140ecbeb384659f424ab72d9e37da data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_1.json -4623462d533c58b7d1b5de485d03b85f462f1242 data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_8.json -53ec7e7388aeb353c89e02f254f8cecc01ad447e data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_direct.json -bbf3b11cc2d9a087f934a30a49fc60c82e9deccb data/modern_industrialization/recipe/compat/ae2/dyes/red/mixer/me_wire_8.json -277e5cfc85613fa2ce0a1c2c982b2cbf8a6cf893 data/modern_industrialization/recipe/compat/ae2/dyes/white/assembler/me_wire_direct.json -b89b67593766ba4ede811efb91607bb4f9c9c3d4 data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_1.json -3df5c832f41776150683648f51c67eb366ae14c9 data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_8.json -4b309905645babcbec07b66f8c1a2671ebb1f1c5 data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_direct.json -6321786a3114e48f853abdcf737e8ab3c4ad54d6 data/modern_industrialization/recipe/compat/ae2/dyes/white/mixer/me_wire_8.json -91fb18c1fa740c62662b256e2c896bb3fc196e48 data/modern_industrialization/recipe/compat/ae2/dyes/yellow/assembler/me_wire_direct.json -6b441944e8c84c2e502765a97766c63f8103d230 data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_1.json -606d14693e97329f7e35c3efe72cf8c955233040 data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_8.json -d453208e7707d693328829110c9ec642f514f55b data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_direct.json -c930b0bcd5591e7b2750a0c8ab4ff72ab907f880 data/modern_industrialization/recipe/compat/ae2/dyes/yellow/mixer/me_wire_8.json -79d6c5ec93c1fe2fa445dc3d8bbf69ee08f5cbf7 data/modern_industrialization/recipe/compat/ae2/electrolyzer/ae2_certus_quartz_crystal_to_ae2_charged_certus_quartz_crystal.json -46a45848d9bdf6ea60fcf62022a562708665bbd5 data/modern_industrialization/recipe/compat/ae2/engineering_processor.json -40e89252a241ba1a8288fb420a5dca8c176bce24 data/modern_industrialization/recipe/compat/ae2/logic_processor.json -91f10388ef054ecc3468ec6902fdde0e3d280fc1 data/modern_industrialization/recipe/compat/ae2/macerator/ae2_fluix_crystal_to_ae2_fluix_dust.json -82078617c7b24bd779f87711c1f8a6edeec5e913 data/modern_industrialization/recipe/compat/ae2/macerator/ae2_sky_stone_block_to_ae2_sky_dust.json -0fac4b99c3b308919d8b5e9f08589c7b0a5e4001 data/modern_industrialization/recipe/compat/ae2/macerator/minecraft_ender_pearl_to_ae2_ender_dust.json -aa2e177f5a1748b48dea2843d46a966cfc3d37a6 data/modern_industrialization/recipe/compat/ae2/macerator/_c_gems_certus_quartz_to_ae2_certus_quartz_dust.json -b122e9e9cd48131a3f2937e6a2754c0ced951b88 data/modern_industrialization/recipe/compat/ae2/mixer/fluix.json -140146e63399c1d43ceb887890a7e0d08ecdf20b data/modern_industrialization/recipe/compat/ae2/printed_calculation_processor.json -49d9e6327a492f6bb62907d1d4c2842963a67101 data/modern_industrialization/recipe/compat/ae2/printed_engineering_processor.json -411e98bd44ffc0ba9d791801d09de7d491c89ab4 data/modern_industrialization/recipe/compat/ae2/printed_logic_processor.json -b204ec95983c596b5afbcb57eec44cce91887e25 data/modern_industrialization/recipe/compat/ae2/printed_silicon.json -c9b7688cbc4cd073f2cc8e08433818fedc042544 data/modern_industrialization/recipe/compat/ae2/printed_silicon_from_ingot.json -79e821ddf233d54d449e9083102436bc8d254fb2 data/modern_industrialization/recipe/cutting_machine/planks/acacia.json -91c111bd8fe685404164cba0bd8330267006ba70 data/modern_industrialization/recipe/cutting_machine/planks/birch.json -6aa5aca11a8ba98c6e7232ecba95b2b35ae87653 data/modern_industrialization/recipe/cutting_machine/planks/cherry.json -e4174e80a7de7f9a7f0d8129dc1b685381953313 data/modern_industrialization/recipe/cutting_machine/planks/crimson.json -97bfb56face09708f00543162e6588ad15871734 data/modern_industrialization/recipe/cutting_machine/planks/dark_oak.json -91a0cdbe79afa3339235c4e342c4231b92023bd9 data/modern_industrialization/recipe/cutting_machine/planks/jungle.json -a6f625f788591329bf3ccc59efd0f6feae106855 data/modern_industrialization/recipe/cutting_machine/planks/mangrove.json -545c88c88592c1e6e96ef881fe45b1602d5c23b9 data/modern_industrialization/recipe/cutting_machine/planks/oak.json -99aaffae43e597f3fae94fad4dc35fa8a57d7c13 data/modern_industrialization/recipe/cutting_machine/planks/spruce.json -faaa3e5b0c4b635892e0728e35c47f86f4342594 data/modern_industrialization/recipe/cutting_machine/planks/warped.json -f51770dca7f039bef9ab1860860603c88ec55969 data/modern_industrialization/recipe/cutting_machine/slabs/acacia.json -c73a4ce81665847b101a82e62c746a00e24dabf6 data/modern_industrialization/recipe/cutting_machine/slabs/birch.json -7be77408d7abd541350daef42727225cccb38a38 data/modern_industrialization/recipe/cutting_machine/slabs/cherry.json -123d285cf3d523902ff5e4b3eb8eea3feb8e73e4 data/modern_industrialization/recipe/cutting_machine/slabs/crimson.json -2cdf1e3fca37c59d3fc1f61d3709fb8add543f49 data/modern_industrialization/recipe/cutting_machine/slabs/dark_oak.json -f37899ad3bf61aeabcd0aac091be6612ac2371bf data/modern_industrialization/recipe/cutting_machine/slabs/jungle.json -1730ba8c4f13229149a395ef1f3f27222a7ca5e6 data/modern_industrialization/recipe/cutting_machine/slabs/mangrove.json -79ab5c9ee3617ad76270ba57e53aa53e294c05e0 data/modern_industrialization/recipe/cutting_machine/slabs/oak.json -9cb1d20cacd71ca2b2e8a9b92e57162fb864725d data/modern_industrialization/recipe/cutting_machine/slabs/spruce.json -531bba505b041a0b93f28f00ef8c55cd0e855044 data/modern_industrialization/recipe/cutting_machine/slabs/warped.json -162cfab0755aecfba03aa43b1fc3b2a56c131ffd data/modern_industrialization/recipe/cutting_machine/stripped/acacia.json -5112849ff788a198305aafb5e94c4fb91b833845 data/modern_industrialization/recipe/cutting_machine/stripped/birch.json -5b52ec436dc33502a7405ea77eacb0d86e1ee696 data/modern_industrialization/recipe/cutting_machine/stripped/cherry.json -01be3f16f99d2ebf7127aa10b53f09e385bbbc33 data/modern_industrialization/recipe/cutting_machine/stripped/crimson.json -926f74e48e682601a184a65307a105e37301a418 data/modern_industrialization/recipe/cutting_machine/stripped/dark_oak.json -28c6210c2c5b36507ac38eb067e7b825dc36c3e5 data/modern_industrialization/recipe/cutting_machine/stripped/jungle.json -a108f1528bea76a1476ba61458f7fe97d4c9933e data/modern_industrialization/recipe/cutting_machine/stripped/mangrove.json -096b442f681525c21cceb0a7ce1831c36885acfe data/modern_industrialization/recipe/cutting_machine/stripped/oak.json -cf3e0fb70d9cac858d5333d91d86c487b7ee1c87 data/modern_industrialization/recipe/cutting_machine/stripped/spruce.json -9a38db712687e25a612f8428435bb038ee4874e3 data/modern_industrialization/recipe/cutting_machine/stripped/warped.json -2df15c62cfc19b21d9fc10a0826cbfb664d7999d data/modern_industrialization/recipe/cutting_machine/stripped_wood/acacia.json -3dd4700f0626de71c5e002b3231ee8605c6481e3 data/modern_industrialization/recipe/cutting_machine/stripped_wood/birch.json -437dfe221eb11b188705281546aa023681bb2a31 data/modern_industrialization/recipe/cutting_machine/stripped_wood/cherry.json -7e4c6ae78d625aab4ca352965fd29d0fc5038da9 data/modern_industrialization/recipe/cutting_machine/stripped_wood/crimson.json -ba0dfc47acd7ffe3f1e9d9861df36ef6cadd420e data/modern_industrialization/recipe/cutting_machine/stripped_wood/dark_oak.json -829d645b0ddffe5d251a2d57be2be79d5a6a1e23 data/modern_industrialization/recipe/cutting_machine/stripped_wood/jungle.json -37ccc10150412affc08221b4ebc33c992b0498a2 data/modern_industrialization/recipe/cutting_machine/stripped_wood/mangrove.json -0c744841a9671ccd6ebb971b520cd1dcf25321be data/modern_industrialization/recipe/cutting_machine/stripped_wood/oak.json -6df0d2e8c6366682149b3f419a518cf8dac521f2 data/modern_industrialization/recipe/cutting_machine/stripped_wood/spruce.json -28cee010e23c196f6aa95c026348273032452dbd data/modern_industrialization/recipe/cutting_machine/stripped_wood/warped.json -5659a627fab698211271786c5d5dd0a84c769b97 data/modern_industrialization/recipe/dyes/black/assembler/fluid_pipe_stained_glass.json -f7560ff34215d086efc1eab4efc9c1a5dbffe7a0 data/modern_industrialization/recipe/dyes/black/assembler/item_pipe_direct.json -de1449cfdfe46b760f052ec67cea7635b1f1fecc data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_1.json -e35163aa90c257887cb471b8888490a301c889f6 data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_8.json -438d9bdaee508ba606c0d737202494c9e4292dda data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_stained_glass.json -a99c809f8d2535eb341998f1af87d81bb3907547 data/modern_industrialization/recipe/dyes/black/craft/item_pipe_1.json -45e4baafdbce9e94bd530d0aa6c0c72186c6408a data/modern_industrialization/recipe/dyes/black/craft/item_pipe_8.json -97796b3257ac51e7dd5e9c49d803f3af5ae16f12 data/modern_industrialization/recipe/dyes/black/craft/item_pipe_direct.json -920ebbba25c589a59860ab7daee71ad86d1fba27 data/modern_industrialization/recipe/dyes/black/cutting_machine/carpet.json -fdbb2fdde0d26884f1297cd4c73572f723648ded data/modern_industrialization/recipe/dyes/black/cutting_machine/glass_pane.json -f654541eb0d36b2f28ab42436a63d39332796e40 data/modern_industrialization/recipe/dyes/black/mixer/bed.json -f7c94dc6cad15c27aca523f74d74ff65f8674061 data/modern_industrialization/recipe/dyes/black/mixer/benzene.json -7e8a978f57b35c774df5d381c70fd53ec0f5a6f2 data/modern_industrialization/recipe/dyes/black/mixer/candle.json -27e2ec7cfa175daf5096f29c5947324801dee258 data/modern_industrialization/recipe/dyes/black/mixer/carpet.json -b0947943ea683d257295f7c85a86e892baa5e548 data/modern_industrialization/recipe/dyes/black/mixer/fluid_pipe_8.json -ac53dc6503d66166b1d4ce6532559f0268370208 data/modern_industrialization/recipe/dyes/black/mixer/glass.json -687fecdadcaa699deef56f37b0a7f1c6a03da542 data/modern_industrialization/recipe/dyes/black/mixer/glass_pane.json -e3d2de88e66274cbc4eb92d43f321e02f0925f81 data/modern_industrialization/recipe/dyes/black/mixer/item_pipe_8.json -e23e3dd20654e5425dc026c543b7ef73e898980e data/modern_industrialization/recipe/dyes/black/mixer/shulker_box.json -43f7bb07bb781c726f966b0700c8072965c7981f data/modern_industrialization/recipe/dyes/black/mixer/synthetic_oil.json -6f09b6271e07a8cb36e78b52b58a47276eac5377 data/modern_industrialization/recipe/dyes/black/mixer/terracotta.json -caa307dfd4fc128cf1e7b7d53689c5898c4e39c4 data/modern_industrialization/recipe/dyes/black/mixer/wool.json -65c0e295e153f7affb4698c7582f731edb526e53 data/modern_industrialization/recipe/dyes/blue/assembler/fluid_pipe_stained_glass.json -a15e1746d0eb27c00faadeae94c4ccfe242dff4f data/modern_industrialization/recipe/dyes/blue/assembler/item_pipe_direct.json -28e17b3bb2dc0c3bedba2ae736215e008fd9ce18 data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_1.json -a44c60ecd4f549d86728d84c312c15d3b3094ff2 data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_8.json -f8ba5d1f9cacca4958816ca543089f95f11790f1 data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_stained_glass.json -1015b85e30462e055afd5e3ea3abc400bf0aece0 data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_1.json -34b96947b603a499347d387c1e2dc69b7834caa2 data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_8.json -536956638b26b5236571a856518dc9b17a46498d data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_direct.json -20837a707bca5a3c8af7f5dc2e95e4621235630a data/modern_industrialization/recipe/dyes/blue/cutting_machine/carpet.json -291389ae357e3bc1099b78902d7dedbdc293e62a data/modern_industrialization/recipe/dyes/blue/cutting_machine/glass_pane.json -83cc5f8e9cff9079d144bd0e0058d951d58f8373 data/modern_industrialization/recipe/dyes/blue/mixer/bed.json -076a5dcbe663d20db33b9965a014de0cb508e482 data/modern_industrialization/recipe/dyes/blue/mixer/benzene.json -f82fb9af6a9129a91d92ad0de43f13f56b222b85 data/modern_industrialization/recipe/dyes/blue/mixer/candle.json -b7022362177221b92ecee4cb248e8899c293a5d0 data/modern_industrialization/recipe/dyes/blue/mixer/carpet.json -65f0b40c28448a580f112bfad5d24a230bc93782 data/modern_industrialization/recipe/dyes/blue/mixer/fluid_pipe_8.json -3c559c64978864d7c621d4fe734e73a03d66e915 data/modern_industrialization/recipe/dyes/blue/mixer/glass.json -f73186f7f2a695927ced989907a5f6f060f3cb76 data/modern_industrialization/recipe/dyes/blue/mixer/glass_pane.json -bf4cb75453f2b380ea685c274333d5772b64a733 data/modern_industrialization/recipe/dyes/blue/mixer/item_pipe_8.json -da5751475c6c0ebffcd0b58e823a7ed6291845b6 data/modern_industrialization/recipe/dyes/blue/mixer/shulker_box.json -e6df5ad1be18f978a9be726372b70b4a8f5d02ec data/modern_industrialization/recipe/dyes/blue/mixer/synthetic_oil.json -3f55cf726ff6db284e3ea25d817dcd92c596ffcb data/modern_industrialization/recipe/dyes/blue/mixer/terracotta.json -5ab24ff015085009fa3bc7ed5abddacd2d8504fc data/modern_industrialization/recipe/dyes/blue/mixer/wool.json -7fe29c7bd59ef31beb129391dd722f2c17d969c3 data/modern_industrialization/recipe/dyes/brown/assembler/fluid_pipe_stained_glass.json -03e9e2af737acbba46a470bb1570d76fefd428df data/modern_industrialization/recipe/dyes/brown/assembler/item_pipe_direct.json -2e1732d9cf25a5a54ff2355b53b2b5986c2768ea data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_1.json -9f17aefe902086c28228ab92578b99d258465fc8 data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_8.json -c3018a92d3089061c4e5ab5a2d658d1bbb5457df data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_stained_glass.json -d80e41d11b17d1c99e10c47877e8e91caca62e88 data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_1.json -76ca81686659d2e987b7d6aaa97efbbd30c1c189 data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_8.json -1b1905bb2ba75b9d6e4e72a778ed9522475b6a0d data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_direct.json -fa6affff12c3ded6165f7f1fcad6daa86647179c data/modern_industrialization/recipe/dyes/brown/cutting_machine/carpet.json -ec51c13716cb542d660c9bb8a28ccdc7052981f1 data/modern_industrialization/recipe/dyes/brown/cutting_machine/glass_pane.json -1d7cb1564fc6ef8060831e8010684046a0f79ea9 data/modern_industrialization/recipe/dyes/brown/mixer/bed.json -8d0284c6260e6134206099d4639733479e5693c6 data/modern_industrialization/recipe/dyes/brown/mixer/benzene.json -88c4154366666955ac626b00a288d564e1438ccd data/modern_industrialization/recipe/dyes/brown/mixer/candle.json -e3b581d43050b7ca0a26f9bf05b1441af62655c5 data/modern_industrialization/recipe/dyes/brown/mixer/carpet.json -8cef8e64abdd9edeeb1823b53dcadee63df1084b data/modern_industrialization/recipe/dyes/brown/mixer/fluid_pipe_8.json -d9b43755852ba09ba89bfb7449457a3e30dc3d93 data/modern_industrialization/recipe/dyes/brown/mixer/glass.json -f08777548e988a2ce72b0a95fc0e407701b85317 data/modern_industrialization/recipe/dyes/brown/mixer/glass_pane.json -f177d406a17e957c5b0b5c67319d199d114f62b2 data/modern_industrialization/recipe/dyes/brown/mixer/item_pipe_8.json -ea47f03a8618967a26dbed619d8be28cd2943d69 data/modern_industrialization/recipe/dyes/brown/mixer/shulker_box.json -33f627f2c712e79954181a909e79b58858d0f00a data/modern_industrialization/recipe/dyes/brown/mixer/synthetic_oil.json -cd83ce0d6e292a493e6d2710bde120c632856824 data/modern_industrialization/recipe/dyes/brown/mixer/terracotta.json -b0bfaed035388de3c6cfac11345c8b7bd716cc44 data/modern_industrialization/recipe/dyes/brown/mixer/wool.json -2bf08927ee18d12b53f5296a49f5d65935443947 data/modern_industrialization/recipe/dyes/cyan/assembler/fluid_pipe_stained_glass.json -854f4cb4b2f1dd69bfbc85df770a2576d742d4ca data/modern_industrialization/recipe/dyes/cyan/assembler/item_pipe_direct.json -1d096912c96384ab1f50e81a19354018e5e2b8ac data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_1.json -d1cc56a96a55dd4ff701d091b5be2775ac7927b7 data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_8.json -3be3a3d7ef9449ba39e3fb122841374d733c9c8d data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_stained_glass.json -63723e91be62c2ce667fc53de8e955f95d9d56c9 data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_1.json -9c89055ecf89b4a8d6e5c2527622bb55fd59c058 data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_8.json -de64acea004b136b3a6fe960e05aa5214a8518af data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_direct.json -539dbe0b7b06bd6fc12470b2abbda42d53eb5493 data/modern_industrialization/recipe/dyes/cyan/cutting_machine/carpet.json -d031fda44ef7a5aa0827ea763d5793e9b1ced2dc data/modern_industrialization/recipe/dyes/cyan/cutting_machine/glass_pane.json -d6d40cd00964c2c2446094037136ef635a9f17e4 data/modern_industrialization/recipe/dyes/cyan/mixer/bed.json -465b8fffbb29a527621910ea8336610207bef178 data/modern_industrialization/recipe/dyes/cyan/mixer/benzene.json -eee00bd7634714a57101bf1bc81b66f32508b7c4 data/modern_industrialization/recipe/dyes/cyan/mixer/candle.json -f70f6e3d9a1a5b2495f1125614e8f5298f3d1bb0 data/modern_industrialization/recipe/dyes/cyan/mixer/carpet.json -f165e6beef85afd2e520d786f38560c079464215 data/modern_industrialization/recipe/dyes/cyan/mixer/fluid_pipe_8.json -3cd5e074aed3908999ccc67b6310ac4f281ff29f data/modern_industrialization/recipe/dyes/cyan/mixer/glass.json -2cb0ace27993bc7d44e24d4160355560fcb32493 data/modern_industrialization/recipe/dyes/cyan/mixer/glass_pane.json -adce45beec013be3354ec1b3606cb8f9ef19706e data/modern_industrialization/recipe/dyes/cyan/mixer/item_pipe_8.json -2356bf08259da683c5750baec24a37c2a755c650 data/modern_industrialization/recipe/dyes/cyan/mixer/shulker_box.json -f3ec33ea8294f5208a546a52ca1eaddb4725c8b2 data/modern_industrialization/recipe/dyes/cyan/mixer/synthetic_oil.json -2b44b625fa262d40460be4395bb45b8b4467e93f data/modern_industrialization/recipe/dyes/cyan/mixer/terracotta.json -a622f65eaf8a97fa6f1be834cb44758492cb018c data/modern_industrialization/recipe/dyes/cyan/mixer/wool.json -88978680c9ec65adff8479faa9d386b60a46505a data/modern_industrialization/recipe/dyes/gray/assembler/fluid_pipe_stained_glass.json -43901cb0fefbfd150f6eaa5091c4aebd43a9a907 data/modern_industrialization/recipe/dyes/gray/assembler/item_pipe_direct.json -a8af6cebfc35d4db3042346fb97ecc8d65fb87ed data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_1.json -7414ff7c04c883495fcffd1e5dfb277340f720b9 data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_8.json -2a6d56eae9025f1bdda5917bd86f3b5decec8e76 data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_stained_glass.json -bbb000513f8cdba932c83a7ba3c8708e45c203dd data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_1.json -ad126f94dfb58fdc4611adf3218e8e5d7fdb1da9 data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_8.json -e4edd8e44a894690d9557de174cf54d90be9a6cd data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_direct.json -4dbabfabde343629f8a2c588f3a3947d318cf8f8 data/modern_industrialization/recipe/dyes/gray/cutting_machine/carpet.json -a8f03ce66666c966b67325487c1892448790b288 data/modern_industrialization/recipe/dyes/gray/cutting_machine/glass_pane.json -dc8180444459f6205bcc3cd72c26fbfd2b24aaa4 data/modern_industrialization/recipe/dyes/gray/mixer/bed.json -d1118eaf1dee72723940e721047e4bdfdb6b0a35 data/modern_industrialization/recipe/dyes/gray/mixer/benzene.json -325f11d00443361dab7bdf0aeff0a646de3ca8d3 data/modern_industrialization/recipe/dyes/gray/mixer/candle.json -b230660017c71e85b5b487d2a8e784b25fde8668 data/modern_industrialization/recipe/dyes/gray/mixer/carpet.json -738e16f9221e1a2c6f4954b8e5e805648e123775 data/modern_industrialization/recipe/dyes/gray/mixer/fluid_pipe_8.json -939fc60e59d9a49a45b430a5010c9b1ac2119452 data/modern_industrialization/recipe/dyes/gray/mixer/glass.json -dc357e98e394dac521c532c52f7e93b65c85dc81 data/modern_industrialization/recipe/dyes/gray/mixer/glass_pane.json -65da1523b18b093b728fa10654b689053e565e59 data/modern_industrialization/recipe/dyes/gray/mixer/item_pipe_8.json -ab529afeec6ad1c06ad25e0fb151a21de2aad83f data/modern_industrialization/recipe/dyes/gray/mixer/shulker_box.json -f7f52afbf081cd7b54413fb9e0cef77bb7f89b65 data/modern_industrialization/recipe/dyes/gray/mixer/synthetic_oil.json -763009ae0c1e2d1bdf5c982188f5c3ca0c73fa48 data/modern_industrialization/recipe/dyes/gray/mixer/terracotta.json -5c832819ab1a11fa27ce5e38423e353147c0df60 data/modern_industrialization/recipe/dyes/gray/mixer/wool.json -5c3cf27b28bbacf0a391d63c45f59e377e46cf49 data/modern_industrialization/recipe/dyes/green/assembler/fluid_pipe_stained_glass.json -5529b02a3c371c2e03fdf2fbeb9e70626b75e64b data/modern_industrialization/recipe/dyes/green/assembler/item_pipe_direct.json -c07800c593b301f2850655fa9cdef9711f3ce44a data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_1.json -3b3018ec57ee1fc3b9bdb78d09b067119c0a885a data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_8.json -96a3142be0414e6886b86ac6291e21f89bfe4fd5 data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_stained_glass.json -4581e74741befe198f5f5ef2c71b92a6189b45b4 data/modern_industrialization/recipe/dyes/green/craft/item_pipe_1.json -12e26765fec3556833dc3f1b5f2252ed26197325 data/modern_industrialization/recipe/dyes/green/craft/item_pipe_8.json -ed821d2239a6f898ad27b385a5672661ef4c9cba data/modern_industrialization/recipe/dyes/green/craft/item_pipe_direct.json -da9bd87f56eaca5b13210491ca9792118703e6bc data/modern_industrialization/recipe/dyes/green/cutting_machine/carpet.json -ee60906b8841a2d93aa15fd4d22cfec66965bb81 data/modern_industrialization/recipe/dyes/green/cutting_machine/glass_pane.json -2372f7600db4525024db3a5b8aacafc4dcfc376e data/modern_industrialization/recipe/dyes/green/mixer/bed.json -ddd486fcec54cbf7394adacb6e4229da3d8a5805 data/modern_industrialization/recipe/dyes/green/mixer/benzene.json -adc495138d4077d25a0b28145d48c316aef2d954 data/modern_industrialization/recipe/dyes/green/mixer/candle.json -f8951652f66a4747924e69bfa04ac79f8b9662bd data/modern_industrialization/recipe/dyes/green/mixer/carpet.json -a298bed3e331db738bce3e81f65372976d513376 data/modern_industrialization/recipe/dyes/green/mixer/fluid_pipe_8.json -8104d9614ad13a327eead187d32f6aa7ea2ff94f data/modern_industrialization/recipe/dyes/green/mixer/glass.json -efbb73c51a6bb5958d382f5ba742c6ebd5e249b1 data/modern_industrialization/recipe/dyes/green/mixer/glass_pane.json -5f22ec9229dec539c575924b06ca71b88b3eb3fe data/modern_industrialization/recipe/dyes/green/mixer/item_pipe_8.json -73530cd6cbec0de711a4c3e3ece14109b50c9ba1 data/modern_industrialization/recipe/dyes/green/mixer/shulker_box.json -2e7aa99313975f52ad054b5e0b42670915a7dad9 data/modern_industrialization/recipe/dyes/green/mixer/synthetic_oil.json -814aca1fe77be0946d110c6dd9ea18499baf2c98 data/modern_industrialization/recipe/dyes/green/mixer/terracotta.json -7ef4ca966fe362673f81bef7e1e5c4b2ae314971 data/modern_industrialization/recipe/dyes/green/mixer/wool.json -ea5a0ee9974ee8d5e5f57f7bc3972da926fcf72b data/modern_industrialization/recipe/dyes/light_blue/assembler/fluid_pipe_stained_glass.json -045d6efa43b1f3864779c36096d4317dc8d96fbb data/modern_industrialization/recipe/dyes/light_blue/assembler/item_pipe_direct.json -8de15b4bccbd3936f1bea53341d20b6f63fbb95e data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_1.json -f586b171276efe2de48b6adbf7563bb15439429a data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_8.json -468924af6d07458b7981e5b6a059728ae612b3f1 data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_stained_glass.json -c7878a2aee50fae650dc1bf79ccdf07805760440 data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_1.json -ca463f9947f248f4762b47e4bdcf6a1e431bcee7 data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_8.json -32fe8080e544d93335ba080030a119a849c4cf77 data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_direct.json -be7c94a9c5222c83a1f86ab9a905976885dc1970 data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/carpet.json -ebe75b53bf9d1ad78b502be9fc0b587c3160e854 data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/glass_pane.json -1f703fa967b7249dc7293943290940e477dcb400 data/modern_industrialization/recipe/dyes/light_blue/mixer/bed.json -0183918312c9c29b3ba4b922de4f972ced88ff18 data/modern_industrialization/recipe/dyes/light_blue/mixer/benzene.json -0d056d7eb87b05cbf28841eff1d29aa872d69908 data/modern_industrialization/recipe/dyes/light_blue/mixer/candle.json -5685d08c13d1d2bd54508e0835e5c47589330880 data/modern_industrialization/recipe/dyes/light_blue/mixer/carpet.json -20906172ff6e783b2b044c7f5097bd9131883fe9 data/modern_industrialization/recipe/dyes/light_blue/mixer/fluid_pipe_8.json -1f92511fd4514111339d781166228fbfdfeaa21e data/modern_industrialization/recipe/dyes/light_blue/mixer/glass.json -fbffb9777066903adf77fc5298c49fd9503f4b17 data/modern_industrialization/recipe/dyes/light_blue/mixer/glass_pane.json -29d26d2a543217cc6e4e8da834f4433c15c715be data/modern_industrialization/recipe/dyes/light_blue/mixer/item_pipe_8.json -9b5eb59afb4b557706dc48d5a7ed2bae09dcab1d data/modern_industrialization/recipe/dyes/light_blue/mixer/shulker_box.json -f918d1647bbde628ff9fee93435b703cad3c572d data/modern_industrialization/recipe/dyes/light_blue/mixer/synthetic_oil.json -289b872418f25e44b3b1227349bb7f59ce8a53e8 data/modern_industrialization/recipe/dyes/light_blue/mixer/terracotta.json -61ffa6f2ebff68ebd73ed1ab6e9073420c8c1937 data/modern_industrialization/recipe/dyes/light_blue/mixer/wool.json -aa8cd13a839716a7073aaaac7e2b21c02a6c1f42 data/modern_industrialization/recipe/dyes/light_gray/assembler/fluid_pipe_stained_glass.json -79aca386d11e47a2c05a5015cda45168b8496091 data/modern_industrialization/recipe/dyes/light_gray/assembler/item_pipe_direct.json -2825340155613d0df84c649de6f1688aa3cb350d data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_1.json -e03e58df0236d99fd2d995c360b2f6774e5e754a data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_8.json -bdd9f5129dc7b7ed617d71bd021e6e4300ce2e91 data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_stained_glass.json -bbad48592f0f95f57188317e04e6f01348fb07ed data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_1.json -a43d035771a8bafb0c640eb62b25552e091ec5a6 data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_8.json -87043e6c9652d03be527a391c2b85a05e73ad423 data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_direct.json -0cde4e30a94c103c801223d45c8c7146fe840868 data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/carpet.json -39c302b48e6beafb825f244116c3d0156b413cca data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/glass_pane.json -2f705b983bfb223257de172e954ebf639a633186 data/modern_industrialization/recipe/dyes/light_gray/mixer/bed.json -34b77cde5931db04dd2858d71ec17576023cf4d3 data/modern_industrialization/recipe/dyes/light_gray/mixer/benzene.json -53ccdfce9499a61b52fd1fc752b2ffbe1454d0d4 data/modern_industrialization/recipe/dyes/light_gray/mixer/candle.json -9958b7aeb23cf0d0a9231e4c393edab4888c29d5 data/modern_industrialization/recipe/dyes/light_gray/mixer/carpet.json -636d9e1bf404038c4b1c2a1c93ab8af6fb840f0e data/modern_industrialization/recipe/dyes/light_gray/mixer/fluid_pipe_8.json -b1e669bbe17f82e32bd32c23eac9c1b245dd81f0 data/modern_industrialization/recipe/dyes/light_gray/mixer/glass.json -8965753d60a911c6801d1eb006902c83f1836270 data/modern_industrialization/recipe/dyes/light_gray/mixer/glass_pane.json -08daee81b4e02dbb7cb4434473b63a65c71285d2 data/modern_industrialization/recipe/dyes/light_gray/mixer/item_pipe_8.json -d088209ec339d3f29622e128e6982339a4ecde81 data/modern_industrialization/recipe/dyes/light_gray/mixer/shulker_box.json -dd17ae94270bc8f5a2e5e8670fac822ca9024d2d data/modern_industrialization/recipe/dyes/light_gray/mixer/synthetic_oil.json -bd5cf6569f66c1bef58b7e10e7191a1d6c5cc716 data/modern_industrialization/recipe/dyes/light_gray/mixer/terracotta.json -ec2ffa12cd99182ce6435d42e111ecd48aa54de3 data/modern_industrialization/recipe/dyes/light_gray/mixer/wool.json -fb15581432ebaad3968b0a0205e7b27f28523a5f data/modern_industrialization/recipe/dyes/lime/assembler/fluid_pipe_stained_glass.json -e60a35f6b82893d60c760b78137341282309cca5 data/modern_industrialization/recipe/dyes/lime/assembler/item_pipe_direct.json -6d785a51f1422b665d18118a2d323e4a81b1c908 data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_1.json -8d1fe2319ab1a25934be855eb44654508f869773 data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_8.json -bf47e6b019422f9b7bdbeae53e39cca013603dd6 data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_stained_glass.json -d98eed1785e6d3d478763778d22dd527c9da3daa data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_1.json -6998cb5c6c6f0a269121155abbe91aef7afd109f data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_8.json -f352d7c42b60905b040bdd4c08c00b96762996c5 data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_direct.json -04262f78f17a722fff1c9f8eeb8fd6faf673ba7d data/modern_industrialization/recipe/dyes/lime/cutting_machine/carpet.json -30a5a1d0d2f967e9c5c54670c03902a028b8f0bb data/modern_industrialization/recipe/dyes/lime/cutting_machine/glass_pane.json -ad78801ff7564aa563f2a3351de8e18ebf4f7205 data/modern_industrialization/recipe/dyes/lime/mixer/bed.json -e3c2ecc0300b6210b9187a90952f78467f05eede data/modern_industrialization/recipe/dyes/lime/mixer/benzene.json -3a205da0d9e7fdeec9411737ad1f163220a9152c data/modern_industrialization/recipe/dyes/lime/mixer/candle.json -38d0cc543e36b828a443193a67a328e1c202dbe3 data/modern_industrialization/recipe/dyes/lime/mixer/carpet.json -f3dbe30ee41b40f34d8b48c778e6a569c41a90cf data/modern_industrialization/recipe/dyes/lime/mixer/fluid_pipe_8.json -4a61168f91bf42d2fe086d07a39639cc6b9f9443 data/modern_industrialization/recipe/dyes/lime/mixer/glass.json -c99c2ad49980e133012913d776cbf95d8ec1fce3 data/modern_industrialization/recipe/dyes/lime/mixer/glass_pane.json -30bb38ff2a30a2ee182a3b565914a777e35039b4 data/modern_industrialization/recipe/dyes/lime/mixer/item_pipe_8.json -686ff740cb516f13ab1feed6de44dce1d67387f6 data/modern_industrialization/recipe/dyes/lime/mixer/shulker_box.json -c4a796992c4db49b581c95c84eddb3c142455f75 data/modern_industrialization/recipe/dyes/lime/mixer/synthetic_oil.json -c59a27b4986417350188c1ac63777363ad511343 data/modern_industrialization/recipe/dyes/lime/mixer/terracotta.json -c177d01aa919c944ba2a691a9b99ec1899f8cf73 data/modern_industrialization/recipe/dyes/lime/mixer/wool.json -116a1bf55f02e6f2fcdd84378d4e940e71c214fb data/modern_industrialization/recipe/dyes/magenta/assembler/fluid_pipe_stained_glass.json -f2540aacf789f615fc2d961669318408dda4668d data/modern_industrialization/recipe/dyes/magenta/assembler/item_pipe_direct.json -ca8cbb063b49c2ce63ef6d7d242f41830a221a1d data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_1.json -4b8730070176f44995880ec6021c959512659591 data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_8.json -9c10210cf242fcfb2846711ff50676a6c573eab6 data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_stained_glass.json -7323c0d55abf9d04ae7af518c51097dfff8030db data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_1.json -a6fa127cb2663cd6e28bf32773eecea56d3b9008 data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_8.json -cdd76654301f0a630c73ce7887f15501defc486d data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_direct.json -3504277ae6b5c413746d32c4a9dcf08e9fbd407a data/modern_industrialization/recipe/dyes/magenta/cutting_machine/carpet.json -168b3309093e9f1a8918a1481f8278c7288a7386 data/modern_industrialization/recipe/dyes/magenta/cutting_machine/glass_pane.json -12a15e64b69ea8dda7f82737f6fe285d30bf1ac7 data/modern_industrialization/recipe/dyes/magenta/mixer/bed.json -d8dcdba16df4b4e4d6c3ffd25202cc76557590bc data/modern_industrialization/recipe/dyes/magenta/mixer/benzene.json -744eef4d8829af390fc7db504aafdc8536bb24e6 data/modern_industrialization/recipe/dyes/magenta/mixer/candle.json -78a3110ebafdf873102ce59e664c2e4d81a053ce data/modern_industrialization/recipe/dyes/magenta/mixer/carpet.json -5b8f3c3f6ac466c7b71a9edd61e787d7c6b7fa37 data/modern_industrialization/recipe/dyes/magenta/mixer/fluid_pipe_8.json -22a284e264c694f51581af8c9b6fa58513c9e4fd data/modern_industrialization/recipe/dyes/magenta/mixer/glass.json -a597e3e8dbef6eb34ce3fb23f3b8644a4d125a48 data/modern_industrialization/recipe/dyes/magenta/mixer/glass_pane.json -1670625c445ee0a9af1c30cc94e1a24f19aae6ea data/modern_industrialization/recipe/dyes/magenta/mixer/item_pipe_8.json -9ac463d6ff79a06d7c54706498f9da8dfdc30031 data/modern_industrialization/recipe/dyes/magenta/mixer/shulker_box.json -e0cde689154186d0063c6bb6bb3f5a7547da03aa data/modern_industrialization/recipe/dyes/magenta/mixer/synthetic_oil.json -5eb82e219313015c6087b464d9cbfc599448eb8b data/modern_industrialization/recipe/dyes/magenta/mixer/terracotta.json -96a92fb69e46daddadbe77427fbc6ff038d495b3 data/modern_industrialization/recipe/dyes/magenta/mixer/wool.json -9ce859ca6f3add8227b8124c54251e86a1e396a8 data/modern_industrialization/recipe/dyes/orange/assembler/fluid_pipe_stained_glass.json -3086675b0275a3a1e2f6b3c03f764a07169f881c data/modern_industrialization/recipe/dyes/orange/assembler/item_pipe_direct.json -a189f10597677c3d89e48293d977e83d507f8fa1 data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_1.json -a16b6237dca4190d7d6afa7123a903684eeb80ba data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_8.json -d6ad8bd322589ad10d950acf84d1ef95e3f57c59 data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_stained_glass.json -bce707ac11eb516907fb69a00c36a97dec0410e9 data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_1.json -a58983ace43c1b364696b2d01979c8ea0592778f data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_8.json -27129db4946f825360a52c1b2da7c199f38386c6 data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_direct.json -70909ce590bef7bbf8ab5709a75327b2c0d7c4a3 data/modern_industrialization/recipe/dyes/orange/cutting_machine/carpet.json -80249b10164985d1c89b81f8f46cb7f57436e217 data/modern_industrialization/recipe/dyes/orange/cutting_machine/glass_pane.json -f80d0622168614ba6feb83db5979d0eef6b535a2 data/modern_industrialization/recipe/dyes/orange/mixer/bed.json -de2dbf7d311899c5eea55aacc301a6b7acb67eb3 data/modern_industrialization/recipe/dyes/orange/mixer/benzene.json -07c1d9d88dbfc30431560efc5eb9738847bb7891 data/modern_industrialization/recipe/dyes/orange/mixer/candle.json -63811b279291b71823217e640ab42c92e45970cd data/modern_industrialization/recipe/dyes/orange/mixer/carpet.json -bbb31305474c67b82f331e280edcc6ff12c348b4 data/modern_industrialization/recipe/dyes/orange/mixer/fluid_pipe_8.json -1feae2c51d73beed6014c144211f2b921bc38492 data/modern_industrialization/recipe/dyes/orange/mixer/glass.json -00ab4b2dfc3d073c1e432d9715639fde36a774a1 data/modern_industrialization/recipe/dyes/orange/mixer/glass_pane.json -efd1f2181c4bb31eeab1139e5660c2fb9e2681ef data/modern_industrialization/recipe/dyes/orange/mixer/item_pipe_8.json -0a8481c5b352f363c5d3a88d4097f2ceb3cf1edb data/modern_industrialization/recipe/dyes/orange/mixer/shulker_box.json -3e5bf64ab136ef835a7410b30ae2f80916d2e74a data/modern_industrialization/recipe/dyes/orange/mixer/synthetic_oil.json -a368bc443a277a88d080f17ed229b021403539fb data/modern_industrialization/recipe/dyes/orange/mixer/terracotta.json -eefb5433eed1741d528e7231fdf8caa1b7c2b769 data/modern_industrialization/recipe/dyes/orange/mixer/wool.json -74d0413e45aff86e3884b45ad0808b13b7c6cd2f data/modern_industrialization/recipe/dyes/pink/assembler/fluid_pipe_stained_glass.json -501d4e7c1c59882651705823552165cb6ae09716 data/modern_industrialization/recipe/dyes/pink/assembler/item_pipe_direct.json -4312ad124690c5d18dc469cf388879a8c01dd7cd data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_1.json -f75d8ae0e2d6951bd19358cfc7303eaf98503273 data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_8.json -73d5c2ced2e1801082879adadc9a72750981e126 data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_stained_glass.json -04093ee64879742ad9c6ca5d1e46a2a2c1b982bb data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_1.json -8b077cd7257ba62d627d1c1757f213260020c577 data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_8.json -1b48aeb930bb248139f2ff2fb25aa1561a53e35d data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_direct.json -14305b93a9185fed96a2217d6fa29e8b0ac42c13 data/modern_industrialization/recipe/dyes/pink/cutting_machine/carpet.json -ada96fd4a3791db3928cfb793fbe607055a0a76a data/modern_industrialization/recipe/dyes/pink/cutting_machine/glass_pane.json -fe82e7bcf986385e4354998fefd353470b2c322d data/modern_industrialization/recipe/dyes/pink/mixer/bed.json -9100baa09814b436e03dc46d05a6846b5e6e8e54 data/modern_industrialization/recipe/dyes/pink/mixer/benzene.json -b43ee9e2eeb9c78fb2c074aa6cea7e5e4ecda2ad data/modern_industrialization/recipe/dyes/pink/mixer/candle.json -a04f1e8a47abe6ba08194cfbabb71fd875f435da data/modern_industrialization/recipe/dyes/pink/mixer/carpet.json -37302facadecbe55db6d0858a3d3a1540a71bb8c data/modern_industrialization/recipe/dyes/pink/mixer/fluid_pipe_8.json -23f8c5c0ec3aff876f313601de47fcd23dd49235 data/modern_industrialization/recipe/dyes/pink/mixer/glass.json -0acee7dbb4ac43e5a35ad4164977f589762d82c8 data/modern_industrialization/recipe/dyes/pink/mixer/glass_pane.json -1af7d7bc893bbce7ab1cd714d32c39611466b43c data/modern_industrialization/recipe/dyes/pink/mixer/item_pipe_8.json -7059b3c0bab07b81b3a99b2e0e660b15f12c401f data/modern_industrialization/recipe/dyes/pink/mixer/shulker_box.json -8723fd90c099061a8cfbb116b8dcfc941d5516e7 data/modern_industrialization/recipe/dyes/pink/mixer/synthetic_oil.json -943bd059a2928400ca615481f2d2256935acd4b1 data/modern_industrialization/recipe/dyes/pink/mixer/terracotta.json -f542d2c88affb5b73d6168836456d447eaea29b5 data/modern_industrialization/recipe/dyes/pink/mixer/wool.json -03ca3249ce23191406e44f8ec5555ee3ed5a471f data/modern_industrialization/recipe/dyes/purple/assembler/fluid_pipe_stained_glass.json -fc89207d4f7ad4f6035a59914ce4e2197d751dfe data/modern_industrialization/recipe/dyes/purple/assembler/item_pipe_direct.json -79733dd0b5b7ecf0006555a0dd6c174106b79eaa data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_1.json -32e04f86de24da7e0b3fb6a173a8a1abd79b3ae8 data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_8.json -ed0d6b1cdb4982e3569ce4a3b3ef64acc03ccd70 data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_stained_glass.json -3210afa8b2feacebcfa9390b79c6c51fe105354d data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_1.json -9a1386e5b9584aa2c4d1d160681996f115319bf4 data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_8.json -a80083216988b2ed43288943c2e2f3a5dc8f71e8 data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_direct.json -71b459cba33269b8da224ad6fa0f7a54499a84cb data/modern_industrialization/recipe/dyes/purple/cutting_machine/carpet.json -4bef1ce60a7c71c61fbc75a30737a831e187a46e data/modern_industrialization/recipe/dyes/purple/cutting_machine/glass_pane.json -51bfd7c65f6e113204272afd81430fc36cf584cf data/modern_industrialization/recipe/dyes/purple/mixer/bed.json -f87092f6c673c9edabc465375b3376eef7e94ae7 data/modern_industrialization/recipe/dyes/purple/mixer/benzene.json -69cb24964a09e860fd085df923b5b8178e5d6fc0 data/modern_industrialization/recipe/dyes/purple/mixer/candle.json -25afd3f515f60bf4b4632bc9f998f0b9f0a093c2 data/modern_industrialization/recipe/dyes/purple/mixer/carpet.json -128a256d74ac5e156cdda9e1f399cf630a734ffa data/modern_industrialization/recipe/dyes/purple/mixer/fluid_pipe_8.json -bc087fb2a7a478c8086bedf9f8df3d029a2a7899 data/modern_industrialization/recipe/dyes/purple/mixer/glass.json -1b6c31c09d6f4eb2bcf30a585c732582d4a55a7e data/modern_industrialization/recipe/dyes/purple/mixer/glass_pane.json -db2181583c8c884d832738b8f2463b88b69ec94e data/modern_industrialization/recipe/dyes/purple/mixer/item_pipe_8.json -04f74f0554e4fb7e0765990beb6a9b4347d128d8 data/modern_industrialization/recipe/dyes/purple/mixer/shulker_box.json -f52b1eca1706833b6ccb9d32ae74973f4d0dad93 data/modern_industrialization/recipe/dyes/purple/mixer/synthetic_oil.json -249114aaca4a2c92cf9fa14854f4e3a82ca6201f data/modern_industrialization/recipe/dyes/purple/mixer/terracotta.json -796ef5e9da48544ee907d6b9c8e745c623b9b89e data/modern_industrialization/recipe/dyes/purple/mixer/wool.json -c3d311860525206d04d22bbdb074aece12805a05 data/modern_industrialization/recipe/dyes/red/assembler/fluid_pipe_stained_glass.json -f84b313e0e242739aa34045cea3fed99fb1d07ea data/modern_industrialization/recipe/dyes/red/assembler/item_pipe_direct.json -0e160fac6faab8558fd9c797d8c04f02b5472547 data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_1.json -796f8e583f4b98a5759df3421643d5855bb9f2d8 data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_8.json -689603e3add931aa7bcedb9a43a9d1b35a1b6f93 data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_stained_glass.json -6d656bb3dd1d6d0807910c6ade82d65d1978554c data/modern_industrialization/recipe/dyes/red/craft/item_pipe_1.json -f8df8c12ece6080f5fb4402acf1bd374ab70f7f3 data/modern_industrialization/recipe/dyes/red/craft/item_pipe_8.json -9f709e05f74e9050d947c226c5b92f4c7b6ad967 data/modern_industrialization/recipe/dyes/red/craft/item_pipe_direct.json -8f30702ac62aad5db6968f0a80638b621dc3df72 data/modern_industrialization/recipe/dyes/red/cutting_machine/carpet.json -3914382d8d93f06c1e5428a6d50bd01fc42adc38 data/modern_industrialization/recipe/dyes/red/cutting_machine/glass_pane.json -dacaa5dc8831e996c478d11762f4cc2b6e3913ee data/modern_industrialization/recipe/dyes/red/mixer/bed.json -f51fd1310a40e859e8fcf0600394ac0e40acafaa data/modern_industrialization/recipe/dyes/red/mixer/benzene.json -8f9480e875e34a73e6137b035c8a811671b90459 data/modern_industrialization/recipe/dyes/red/mixer/candle.json -4fc84b3fb771a154d11af26100b762e0e45c4483 data/modern_industrialization/recipe/dyes/red/mixer/carpet.json -866a2268fa48fd3ed034ab34a22074596668211c data/modern_industrialization/recipe/dyes/red/mixer/fluid_pipe_8.json -a11d325fcf9330af9f2c30842b2dd4baaeb32ddf data/modern_industrialization/recipe/dyes/red/mixer/glass.json -fac9eee00f2929d8808305e25e4ceafca3e66d09 data/modern_industrialization/recipe/dyes/red/mixer/glass_pane.json -bc3f1b84c227d2131a6fbbaefa365d0dfb29d8cb data/modern_industrialization/recipe/dyes/red/mixer/item_pipe_8.json -360b6d27f2b8f91ee10a86ae4d704f5a6e8d8e33 data/modern_industrialization/recipe/dyes/red/mixer/shulker_box.json -9624380012a4282995c5c76c39636e5fc1e08727 data/modern_industrialization/recipe/dyes/red/mixer/synthetic_oil.json -bf0789aae27e1adbc63a93a0115a5e408b60b378 data/modern_industrialization/recipe/dyes/red/mixer/terracotta.json -3b51c7ca0fbcac79a72919e0db22fb2a66ac97c7 data/modern_industrialization/recipe/dyes/red/mixer/wool.json -4a4916946dde7b121fafc12b48faf9fd5ec097a5 data/modern_industrialization/recipe/dyes/white/assembler/fluid_pipe_stained_glass.json -b57ae40e0309130e6a933d71adfd41436f017334 data/modern_industrialization/recipe/dyes/white/assembler/item_pipe_direct.json -b5e0cb3546b6681c7c1c404b8a790da8487c2a72 data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_1.json -41eaeee08349d4141f519196924b8e4444f3f5e4 data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_8.json -f3939fe100da539635c729e0885e7ed0c2f48aba data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_stained_glass.json -53632209f1c5059a9665389ae00cd8a1faa2dad3 data/modern_industrialization/recipe/dyes/white/craft/item_pipe_1.json -26248764c4d9b376d47383004713e529e902b947 data/modern_industrialization/recipe/dyes/white/craft/item_pipe_8.json -91ed1163a4da0f72b8050cb485f0570b03eec1ec data/modern_industrialization/recipe/dyes/white/craft/item_pipe_direct.json -14b433dd67f2f4fcfd02792e1a1c671c97e5c007 data/modern_industrialization/recipe/dyes/white/cutting_machine/carpet.json -8e546b0e04a67e5f55baea4b741bc970560ecb47 data/modern_industrialization/recipe/dyes/white/cutting_machine/glass_pane.json -efdb0d1523e0006c5f7798816c988b7b42e96015 data/modern_industrialization/recipe/dyes/white/mixer/bed.json -4a2a12287697d12388809051534932aaacaa2246 data/modern_industrialization/recipe/dyes/white/mixer/benzene.json -73c32a5e057e5e42173a17f8be196d836ed83042 data/modern_industrialization/recipe/dyes/white/mixer/candle.json -a394a1049eb3c6e51930da97ef84a467dffe9ac9 data/modern_industrialization/recipe/dyes/white/mixer/carpet.json -3608ed5af3cb543dc88a0c1f0702ab1a19fd57a0 data/modern_industrialization/recipe/dyes/white/mixer/fluid_pipe_8.json -01a8b5c53b350b720c2e6d3bf8c87b052f7356d8 data/modern_industrialization/recipe/dyes/white/mixer/glass.json -9637ad6691aa62bda7af4ce6a6f81efcc977a31b data/modern_industrialization/recipe/dyes/white/mixer/glass_pane.json -b594fa78cb250a887bceddfef62aa6d5400dfc2f data/modern_industrialization/recipe/dyes/white/mixer/item_pipe_8.json -68a35c36edcbb3a82efb010be3b5649942463d48 data/modern_industrialization/recipe/dyes/white/mixer/shulker_box.json -f2ba473a994550aa98c5764dc05aa52929c33e70 data/modern_industrialization/recipe/dyes/white/mixer/synthetic_oil.json -84f06136ef26b87307005d1d291ab29a595ed2a3 data/modern_industrialization/recipe/dyes/white/mixer/terracotta.json -c0a17301a0847474f7832fbb5c366bf7d96a8a7d data/modern_industrialization/recipe/dyes/white/mixer/wool.json -bbe033333b4f10b3def2151376b9fe61b142630d data/modern_industrialization/recipe/dyes/yellow/assembler/fluid_pipe_stained_glass.json -feeb5255f4d20ca453404edb0a4f9ecbc7e00183 data/modern_industrialization/recipe/dyes/yellow/assembler/item_pipe_direct.json -2197da44bbc242cad8ef47a6c034e40db0af610c data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_1.json -52bd299cab97506708e33f1f90267001ffc040d3 data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_8.json -068ec941a8dc260b29e49693567d81230febebf3 data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_stained_glass.json -4a4c5cb440a9fe069cbdda2eb864a99fa43cf56d data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_1.json -a4fed9519791be6183ce6d83dd6a3e4bd710b63f data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_8.json -c506f993bf8162fc9789dae0c532ffb2faaa1822 data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_direct.json -6021960dd22985c709df25c86809d5af75477f06 data/modern_industrialization/recipe/dyes/yellow/cutting_machine/carpet.json -a32eee43c802550b50606f0d7c4acb46c11ee125 data/modern_industrialization/recipe/dyes/yellow/cutting_machine/glass_pane.json -10e3742405cbea37c99f4c44b3bbe1757cf4f596 data/modern_industrialization/recipe/dyes/yellow/mixer/bed.json -d8146315972014b9a56edeece6a2370bf2408b0a data/modern_industrialization/recipe/dyes/yellow/mixer/benzene.json -64baea5b0ee4c793f24ac1061140b0de1060c108 data/modern_industrialization/recipe/dyes/yellow/mixer/candle.json -b1ecae797a5b1a73a2fd39b56126c61fe5fb5934 data/modern_industrialization/recipe/dyes/yellow/mixer/carpet.json -69df76836f05eb28020e6d982ccc63e657223476 data/modern_industrialization/recipe/dyes/yellow/mixer/fluid_pipe_8.json -b0f9f17314d3895a1dfbc2f59e8fef09e4bb0dbe data/modern_industrialization/recipe/dyes/yellow/mixer/glass.json -8abf777f55d311d53be39f769a96249f87d262a9 data/modern_industrialization/recipe/dyes/yellow/mixer/glass_pane.json -23b3f2dd675797c93cf9381e7673a271ca8eb601 data/modern_industrialization/recipe/dyes/yellow/mixer/item_pipe_8.json -18ae32e0c6817c6d004c9ea639d3227d9f0b47d3 data/modern_industrialization/recipe/dyes/yellow/mixer/shulker_box.json -2ae6d08c16388a88d2f87208fc0c2a9d167b6d86 data/modern_industrialization/recipe/dyes/yellow/mixer/synthetic_oil.json -d7390149845e330c6afafc9ad2b55aa1b8bba423 data/modern_industrialization/recipe/dyes/yellow/mixer/terracotta.json -babff11e4276869fd7605e608c1356eb572391de data/modern_industrialization/recipe/dyes/yellow/mixer/wool.json -2eef6a4e10cf48256c5a7c80ce29b106c3417e49 data/modern_industrialization/recipe/hatches/advanced/assembler/energy_input_hatch.json -776d0e245645653a1ec9d000d49c66d87f2b8456 data/modern_industrialization/recipe/hatches/advanced/assembler/energy_output_hatch.json -97da2af809821e71ebdeca503c9a85ebc7f1f839 data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_input_hatch.json -a1e010bc7b6c1c7cceb8bc7787d79858b78a5df7 data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_output_hatch.json -22aea3fc46f3173f4655be1f85f4d5acf5506348 data/modern_industrialization/recipe/hatches/advanced/assembler/item_input_hatch.json -efad651fa6f7591498e1bc5c3155b75c3aa51e1c data/modern_industrialization/recipe/hatches/advanced/assembler/item_output_hatch.json -714d0e433f71993ede8d0c2a23fdaa16e20280db data/modern_industrialization/recipe/hatches/advanced/energy_input_from_output.json -e864bba1d23de6c963df6d001e9ab6c800e70bdb data/modern_industrialization/recipe/hatches/advanced/energy_input_hatch.json -02fceb3994e6de4ce2012eefaf86791aea94895d data/modern_industrialization/recipe/hatches/advanced/energy_output_from_input.json -5100ed01e7aeb51e9b23d395cbb48b57c89701d6 data/modern_industrialization/recipe/hatches/advanced/energy_output_hatch.json -61a784862ed755b3ec095827e3c496d2e75cb3e1 data/modern_industrialization/recipe/hatches/advanced/fluid_input_from_output.json -1ee481dc1dadc47fc514027e4ee0e64ba9b3c907 data/modern_industrialization/recipe/hatches/advanced/fluid_input_hatch.json -7b9202f6585d0688d5ef15cf6aab46412c5865f2 data/modern_industrialization/recipe/hatches/advanced/fluid_output_from_input.json -3088696d88431e54ab3e67f46cc20114085d339d data/modern_industrialization/recipe/hatches/advanced/fluid_output_hatch.json -440b890a722fcff37fef03f7eaaf68ea1e861634 data/modern_industrialization/recipe/hatches/advanced/item_input_from_output.json -788f9084457ea16cb3b51cfcd3ad68ad40bd46f5 data/modern_industrialization/recipe/hatches/advanced/item_input_hatch.json -bdd681fd7e4187bd0a1663c443546cc83c4d7499 data/modern_industrialization/recipe/hatches/advanced/item_output_from_input.json -2641e69bcd1db1762090186be926fe4f0e953d29 data/modern_industrialization/recipe/hatches/advanced/item_output_hatch.json -362884a42da84c20b30f17a376a57e6ce6c5de84 data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_input_hatch.json -f71a61e49d31cb97596eae38985fa2a05a3c924d data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_output_hatch.json -76c14f536d52387c47c12cc942451e4efc66e35e data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_input_hatch.json -adaf525c7f18ec5a467f50e8d1b7b7e94666c31a data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_output_hatch.json -3b2839da6651772be0e3a9dde8a0b9e9570e37e2 data/modern_industrialization/recipe/hatches/advanced/unpacker/item_input_hatch.json -048e2145467e2ab53e64bad3ef42667dbbd09739 data/modern_industrialization/recipe/hatches/advanced/unpacker/item_output_hatch.json -559e9e894706b9b3785fbe2aecf6c714ed1b6752 data/modern_industrialization/recipe/hatches/basic/assembler/energy_input_hatch.json -9fb03ff56ca54800fa6d40604d294476173e12a5 data/modern_industrialization/recipe/hatches/basic/assembler/energy_output_hatch.json -b1b39c11be90006394f39743fa7de5176f61a4d9 data/modern_industrialization/recipe/hatches/basic/energy_input_from_output.json -f645137505ed6dffdb88845c3f836f547d2b9b86 data/modern_industrialization/recipe/hatches/basic/energy_input_hatch.json -388592faf9012a3d4b67fb24054e6a502932f666 data/modern_industrialization/recipe/hatches/basic/energy_output_from_input.json -9cc8cf44448e475e710681878dd2ab23c32a1ba3 data/modern_industrialization/recipe/hatches/basic/energy_output_hatch.json -e93efa3dde3cdf81581a6bafe47aac282093bfdf data/modern_industrialization/recipe/hatches/basic/unpacker/energy_input_hatch.json -01f60a82ac2c972c198e91144a558a6ce60f6475 data/modern_industrialization/recipe/hatches/basic/unpacker/energy_output_hatch.json -a3ad2a9d22e12b44f29addc20a76871d7cde88ad data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_input_hatch.json -33c88410249e018d17b1e9e89b0901424134b446 data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_output_hatch.json -91eaa9811175644451b0c8e15734e60cce55f552 data/modern_industrialization/recipe/hatches/bronze/assembler/item_input_hatch.json -805940adb90e34a071841c0faef3cd3416c53eb9 data/modern_industrialization/recipe/hatches/bronze/assembler/item_output_hatch.json -9abb2dd6ec978632e3c78ba551decef8a679e51f data/modern_industrialization/recipe/hatches/bronze/fluid_input_from_output.json -dfa9819b53ebdec635c9f1b391fa439a236adf02 data/modern_industrialization/recipe/hatches/bronze/fluid_input_hatch.json -79a664c971eb71fe7a83227b80cec8be14ef541f data/modern_industrialization/recipe/hatches/bronze/fluid_output_from_input.json -2d47e040798e2f20f6e98ef75d7fc302d66c36c2 data/modern_industrialization/recipe/hatches/bronze/fluid_output_hatch.json -20cb79e316c6e0dbf0c58ea95a582e6cacba1b9e data/modern_industrialization/recipe/hatches/bronze/item_input_from_output.json -bf1f2a43dba10e13552a1cb50685a24caa45aea3 data/modern_industrialization/recipe/hatches/bronze/item_input_hatch.json -26ee88c77583ab7c87661e3bd954510459ed4dbc data/modern_industrialization/recipe/hatches/bronze/item_output_from_input.json -efa2cb1f3371db602d2f930ecf7d258473c7cec4 data/modern_industrialization/recipe/hatches/bronze/item_output_hatch.json -0547190a669fd4970c583d1eead3fa3d9d04dfe2 data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_input_hatch.json -bbb23124e39280305838c517870081d145248542 data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_output_hatch.json -01ed5b62439c765dcc14789aae41f0a99d4ac59d data/modern_industrialization/recipe/hatches/bronze/unpacker/item_input_hatch.json -3ad6927521f3c4fe983e0b960ce1dc1a7812b825 data/modern_industrialization/recipe/hatches/bronze/unpacker/item_output_hatch.json -7c458b83e8a98ae2863f7a6884908c82824f6e43 data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_input_hatch.json -70e1fde096c128e5f7fa2270029eb3782f326083 data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_output_hatch.json -9bf40868525ab7165d94a87e773e881e73da094b data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_input_hatch.json -685fe2312a19ff10af8c1e0212ea6a0c019a739a data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_output_hatch.json -6fcecc38133be1333fac1e6ea39fcc5c4e4b67c4 data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_input_hatch.json -3ec2b21714e53fb17bc060655e9f527cec371ce6 data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_output_hatch.json -802fbf7b746fd603fb9f03dda7123f177fce18b7 data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_from_output.json -1f6bb3b950c5504580c3c2321e91780b2cb8f872 data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_hatch.json -56e09617967e1948d8950cd87bf54fd2b9addce8 data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_from_input.json -f46a5034eb21430a0435288979106b53b82e7060 data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_hatch.json -8c080e7100579d89e8b5e25796280aa32fc95d1d data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_from_output.json -eaf9d5123d8cf5fcc196b23386cc88c54feebcb3 data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_hatch.json -dd4f860022544e9781a067f7a441088550f9642c data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_from_input.json -42f232ddb324f112b528d4a3fe81d777747f1a0a data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_hatch.json -5981b3dc5ea7da6b6ac215410b3e1a020ef4ebe7 data/modern_industrialization/recipe/hatches/highly_advanced/item_input_from_output.json -bc9ff6480dead91513fd2911a84f13f807032a10 data/modern_industrialization/recipe/hatches/highly_advanced/item_input_hatch.json -7666a588fa4baa3677aa087359d136b8d8770279 data/modern_industrialization/recipe/hatches/highly_advanced/item_output_from_input.json -fdd3af8de861993883501a6f131aa0d99ea3a436 data/modern_industrialization/recipe/hatches/highly_advanced/item_output_hatch.json -a150c402cca84cb5925a9952cd0b4c2e4f2e5a99 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_input_hatch.json -15d8a05e9beaa7f608dcb80bf586f734b9ce9b91 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_output_hatch.json -23206d85b93d723ac069bab2d60d48d013b07118 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_input_hatch.json -c7d5b8f4aaf9e85a8219f4874a07cb7cd634a01f data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_output_hatch.json -025be94f25196d4a10de8050f813738ad5c75d2d data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_input_hatch.json -63d0b575782e039e3189ea61dca427995a19306f data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_output_hatch.json -6b7ce4809d72a8d359c7f15de9718227b8d4e114 data/modern_industrialization/recipe/hatches/quantum/assembler/energy_input_hatch.json -f7b1c8bc2d7ba736fd5756094d4feed32b14e971 data/modern_industrialization/recipe/hatches/quantum/assembler/energy_output_hatch.json -e66c8bf7a6c992b0af2e25a056c0947b407efbee data/modern_industrialization/recipe/hatches/quantum/energy_input_from_output.json -dce1f80a1a0e6181968b172f595509e447f0ff91 data/modern_industrialization/recipe/hatches/quantum/energy_input_hatch.json -60f9be298a7ccc0665c338c694123554d73038b5 data/modern_industrialization/recipe/hatches/quantum/energy_output_from_input.json -d3ef4883b8f1f936eca58df8d948a26e9b688475 data/modern_industrialization/recipe/hatches/quantum/energy_output_hatch.json -de15b33c930fe21f5bece872963fc67f5aa11681 data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_input_hatch.json -e4c59fa3b47b671e84f309ad0d41c9d2dd1c6261 data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_output_hatch.json -57841f39dc0be02921c1932d9f7790bc383239d4 data/modern_industrialization/recipe/hatches/steel/assembler/fluid_input_hatch.json -38feb03ccff79dd4a68bdb5a29385608aee24387 data/modern_industrialization/recipe/hatches/steel/assembler/fluid_output_hatch.json -fb465760c0e0dbd8d09002f0ba1b80d2fd1fe1c4 data/modern_industrialization/recipe/hatches/steel/assembler/item_input_hatch.json -3f9845b5ef22195e2b436dc56944bb6d397cb707 data/modern_industrialization/recipe/hatches/steel/assembler/item_output_hatch.json -465a1810c17dd88605e2d305815699a7a0e1043e data/modern_industrialization/recipe/hatches/steel/fluid_input_from_output.json -11b4dda5b3c30c1c99f0624ef9eb25f090f67620 data/modern_industrialization/recipe/hatches/steel/fluid_input_hatch.json -fe33681206a8897f98457f111ae3acaa1bc8bcf7 data/modern_industrialization/recipe/hatches/steel/fluid_output_from_input.json -458cad4166bb5a9e34dcdc7c122bee930fc9fb9b data/modern_industrialization/recipe/hatches/steel/fluid_output_hatch.json -8caa8185c068ff1f6dc9b764aa37880e1e58bd19 data/modern_industrialization/recipe/hatches/steel/item_input_from_output.json -525a973de2aca8dc15868b123693ddbe83d570c2 data/modern_industrialization/recipe/hatches/steel/item_input_hatch.json -a1416446df14ad12bc15ab446582857af6037d57 data/modern_industrialization/recipe/hatches/steel/item_output_from_input.json -f567853d41537b2fe5593c0cacd6c9b3e5de9b7c data/modern_industrialization/recipe/hatches/steel/item_output_hatch.json -3e7374954329e6a3dbadb9e17a768e066298f2c7 data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_input_hatch.json -c9fdb3df715df247535ba41d15e8115140053faf data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_output_hatch.json -a03593014581df37bc72406fd7c1fa844bd7b6f9 data/modern_industrialization/recipe/hatches/steel/unpacker/item_input_hatch.json -d6165a0574cd19e1ae016d48702a9e7d80ca6cbe data/modern_industrialization/recipe/hatches/steel/unpacker/item_output_hatch.json -446f9bd1f67638c71d3a1b4e1167bebacd5d8596 data/modern_industrialization/recipe/hatches/turbo/assembler/energy_input_hatch.json -2dca5565d48e2ad11dc22cf8d53cd82137ce1714 data/modern_industrialization/recipe/hatches/turbo/assembler/energy_output_hatch.json -6e9c3aa007a974f1c56fe3028369c713c084c1eb data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_input_hatch.json -3f0ddbbc7d19d76825f208214e394bdb1cedc519 data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_output_hatch.json -3c1c39c0e3655607b683447d531675fdc2067c6d data/modern_industrialization/recipe/hatches/turbo/assembler/item_input_hatch.json -71f1f7cac46666d59587bf49cf9914a9de4762c2 data/modern_industrialization/recipe/hatches/turbo/assembler/item_output_hatch.json -3acef4c252f77084e2541139ce0f8eab5812412c data/modern_industrialization/recipe/hatches/turbo/energy_input_from_output.json -85b9e709dea9bf0949684504f4dd5ec48b06a50e data/modern_industrialization/recipe/hatches/turbo/energy_input_hatch.json -0d9246f2eac88204a1a85d3096e41e927bf58d14 data/modern_industrialization/recipe/hatches/turbo/energy_output_from_input.json -850509e6b5fbaf7e9f14bc460baa132d0f65c40f data/modern_industrialization/recipe/hatches/turbo/energy_output_hatch.json -0dce16281be5adee1d78d2c8de3e864f2e4ef993 data/modern_industrialization/recipe/hatches/turbo/fluid_input_from_output.json -a37e06b858b2b4dbd158b6887e1246177834acd1 data/modern_industrialization/recipe/hatches/turbo/fluid_input_hatch.json -390c98531f6096611a9daee26b6808fdc5fa157e data/modern_industrialization/recipe/hatches/turbo/fluid_output_from_input.json -692b39d2b2c7e2eed4865f8dd5af814fc2a679f0 data/modern_industrialization/recipe/hatches/turbo/fluid_output_hatch.json -465cbb2551ddae3cba93b783ec4e2736bc3e68d8 data/modern_industrialization/recipe/hatches/turbo/item_input_from_output.json -347964d01e938ca488aaa85f20f63f9e59e99979 data/modern_industrialization/recipe/hatches/turbo/item_input_hatch.json -454381f10a751851c535970575b0b24807dc00ee data/modern_industrialization/recipe/hatches/turbo/item_output_from_input.json -b07b92a97a3675c63b995051e8ad560be80f0246 data/modern_industrialization/recipe/hatches/turbo/item_output_hatch.json -1e9feaff06f71657e5e285a88c5ec1bfd929474f data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_input_hatch.json -ba32c8aaea2eba84ec74c70f549f05be1d5d8ced data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_output_hatch.json -4007b72573339a87fcea20bbb0d4979c3a9fe271 data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_input_hatch.json -a736d66793a50b78794c94da6670c438003664d8 data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_output_hatch.json -7a6a69205edaff04f08ae7566e69bb6bf416f485 data/modern_industrialization/recipe/hatches/turbo/unpacker/item_input_hatch.json -7282391d690f2bde413686d34a23dcc237ebc1d5 data/modern_industrialization/recipe/hatches/turbo/unpacker/item_output_hatch.json -c0df6dc5846a78203ca79507e2049c6c67190740 data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_heavy_water.json -f84a5970785d08efbed04710dbf9c925d01990c1 data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_water.json -bacd8cf60fcfe83b34b6b45d2fd4ace616bee2fd data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_water.json -f7684e673f5b729d34c4dbb3693b3667340159cf data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_heavy_water.json -258f11245ff008e4bed03147cbaceeaba2e62ea1 data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_high_pressure_water.json -425698ccd41d2c9a194dcaf9817705e6bb9e85ed data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_water.json -a1efeb27b630d01cfa13602f00fed443f48b9f27 data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_heavy_water.json -85f5fa64023daa410812a2b59bb232ddf8fa7a1d data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_high_pressure_heavy_water.json -ccf81a2b2065bbc3f572c3f39c081e0c06c1fdf2 data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_water.json -b1312db0563a2ef83c366ed8c6a6917694c08402 data/modern_industrialization/recipe/heat_exchanger/steam_with_heavy_water.json -e518157e03306fd8fbc436c8d307b3a546b26544 data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_heavy_water.json -cb2dd09937981774d340aafdd0794c6caa6b4e2f data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_water.json -759d6a8212004d5a98546280f7751296689c98a4 data/modern_industrialization/recipe/materials/aluminum/assembler/barrel.json -660649f1f44e41e671c348e17b6aec82b4e9e338 data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json -88fb74d8eb73526f9e39ac15ae7d8f3a21371dc5 data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json -3c61d393ac83decad4361d8b5a6e770a11a7e214 data/modern_industrialization/recipe/materials/aluminum/assembler/drill_head.json -4a2b3ac148473ad39e513141f6d42a94b4f3d3b1 data/modern_industrialization/recipe/materials/aluminum/assembler/gear.json -06c3e57fac7a5021fbddde75f4e20a44fec37fe8 data/modern_industrialization/recipe/materials/aluminum/assembler/rotor.json -f1458eb396648b648af4b99f9eca4c9a82e3a00b data/modern_industrialization/recipe/materials/aluminum/assembler/tank.json -e2e135e25f3aa0dd358c1ec48a06672e6df4f012 data/modern_industrialization/recipe/materials/aluminum/blast_furnace/dust.json -cd6610a8408fff20c292a4dc9bfe7532a250e2ab data/modern_industrialization/recipe/materials/aluminum/blast_furnace/tiny_dust.json -57236350677a685c318fae468b5ab274d00cef42 data/modern_industrialization/recipe/materials/aluminum/compressor/double_ingot.json -135d8c4e86da7f8740344ea17e1ac66ade804ae9 data/modern_industrialization/recipe/materials/aluminum/compressor/main.json -78f1c4d7de102cdfaf26b88c977e93145c846bf3 data/modern_industrialization/recipe/materials/aluminum/compressor/plate.json -76bd618e7392e44191552e7448d0cfd787b21d7e data/modern_industrialization/recipe/materials/aluminum/compressor/ring.json -40a7d15e40d1338768cff4d195ec40994c3b0c21 data/modern_industrialization/recipe/materials/aluminum/craft/barrel.json -6a4da7987a84bc258ce8d03d5e2d68004af4f057 data/modern_industrialization/recipe/materials/aluminum/craft/blade.json -0b418a003a25648789c09a8b263dc390aeb848e6 data/modern_industrialization/recipe/materials/aluminum/craft/block_from_ingot.json -fe5cb567485e2900832242659ae91c14b37d6d91 data/modern_industrialization/recipe/materials/aluminum/craft/cable.json -dbd3e0ba7803b361998d80e1ab6c605123dfcd00 data/modern_industrialization/recipe/materials/aluminum/craft/drill_head.json -bca5f6154c211eb6e2ff7f5f5df4a8073dcbdc28 data/modern_industrialization/recipe/materials/aluminum/craft/dust_from_tiny_dust.json -c552996f3efb8bb1dd36f7048bd08196ec071a3f data/modern_industrialization/recipe/materials/aluminum/craft/gear.json -ba968ddbf69426e6409c7c16feb5aed184290b0d data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_block.json -ccabde7fd97631f81d4f0ae74e68022cf1a762f1 data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_nugget.json -c3bcd238a57fe177f13478176852109086db4289 data/modern_industrialization/recipe/materials/aluminum/craft/large_plate.json -00e88d8b28b0741c8bb87c98587036d63120ee3c data/modern_industrialization/recipe/materials/aluminum/craft/nugget_from_ingot.json -f1f590a6333f688709cc336dd1a5c648feb8d22a data/modern_industrialization/recipe/materials/aluminum/craft/ring.json -55689669067d38adcf7c9d32d92befcf50ed9ec4 data/modern_industrialization/recipe/materials/aluminum/craft/rotor.json -112ec788fd3fe8781a1a55db36def8494e2560c5 data/modern_industrialization/recipe/materials/aluminum/craft/tank.json -c8bbaba7350476a555d536dd8b9ba87b6805ce00 data/modern_industrialization/recipe/materials/aluminum/craft/tiny_dust_from_dust.json -ff14e73a8381010f9f2f3b78cfdc887d40e159ef data/modern_industrialization/recipe/materials/aluminum/cutting_machine/double_ingot.json -4ce7dae7aa2d1db60d30d6ad6b49a18ecbc96b2f data/modern_industrialization/recipe/materials/aluminum/cutting_machine/main.json -4db28969013a94a7f74eb1bccd87fa18f25d5eb8 data/modern_industrialization/recipe/materials/aluminum/cutting_machine/rod.json -5e728d3c7fd9724d223755d235bd79b03458c698 data/modern_industrialization/recipe/materials/aluminum/macerator/blade.json -b43f63c2a2afb1b2630bfe9ab2718eaded02725b data/modern_industrialization/recipe/materials/aluminum/macerator/bolt.json -ffe1f25e2fb270300d62a28fd4c7420e8e15919f data/modern_industrialization/recipe/materials/aluminum/macerator/curved_plate.json -e942dcbbab504f39d9a8deec3003ff2efd798b17 data/modern_industrialization/recipe/materials/aluminum/macerator/double_ingot.json -ef8d227d1e13245e20f9cfde54df154e2c0d75b1 data/modern_industrialization/recipe/materials/aluminum/macerator/drill_head.json -760d9c24c33cf809c6e042af5e89bf0d9f5c8aca data/modern_industrialization/recipe/materials/aluminum/macerator/gear.json -c654bd9bd826f1c8ed9344d4aa27ce5c82098a74 data/modern_industrialization/recipe/materials/aluminum/macerator/ingot.json -82ecf6910e11451847ea36d0d385a5b188225df4 data/modern_industrialization/recipe/materials/aluminum/macerator/large_plate.json -9ee2cf128450a0c9e0751a2ae596f0a371a720e5 data/modern_industrialization/recipe/materials/aluminum/macerator/nugget.json -b5e387ca87179d91f3d443a3de9445c03e66e1cd data/modern_industrialization/recipe/materials/aluminum/macerator/plate.json -f6b04053de05c25ddfb9ed15b77a14f16c9ad914 data/modern_industrialization/recipe/materials/aluminum/macerator/ring.json -6b1356a39fa087b8088edf83ffa2f7df300cfb8b data/modern_industrialization/recipe/materials/aluminum/macerator/rod.json -64936d402b866ac37e14d9b5a600f7c83fdebbe7 data/modern_industrialization/recipe/materials/aluminum/macerator/rotor.json -710540cace830fd86e8ed5f6293f46593c7998f9 data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json -28fb51b593ebe74501e98c8ffa176e158d886f64 data/modern_industrialization/recipe/materials/aluminum/packer/blade.json -7cc936605739ece2b67fd3941b9421bc39bbbc5e data/modern_industrialization/recipe/materials/aluminum/packer/block.json -105601204af2e1dc88466caf745315c55a559a2f data/modern_industrialization/recipe/materials/aluminum/packer/cable.json -7cced3bdef395b20054c89c2495f27b8784306bb data/modern_industrialization/recipe/materials/aluminum/packer/double_ingot.json -1ed05e6e07a99af8c31b2715cbc43ff86590c05e data/modern_industrialization/recipe/materials/aluminum/packer/dust.json -1e6239cfc626fac77f78235db1522809f308a30e data/modern_industrialization/recipe/materials/aluminum/packer/ingot.json -325c531c3916c4d267984f263969e99736ceb6e3 data/modern_industrialization/recipe/materials/aluminum/packer/large_plate.json -fab3ed0c889cab53ad0b440f5f8462630f550669 data/modern_industrialization/recipe/materials/aluminum/unpacker/ingot.json -575e5f44edc855b08fc25c06f4de39b76d9f3646 data/modern_industrialization/recipe/materials/aluminum/unpacker/nugget.json -97a28d0f8aa76b13aa0d3842d432bd44261fcb90 data/modern_industrialization/recipe/materials/aluminum/unpacker/tiny_dust.json -d4a3b8b8120ffb43d88f9b3142e7d2c6de981c33 data/modern_industrialization/recipe/materials/aluminum/wiremill/wire.json -482a7125a7e77d2db305b6ad5ed0752b6a6a6561 data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json -422f953eca4c6c486beca650963a6a24f579ea45 data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json -c7bb208dd1fd6422ce075606f9366ebe9ca0297e data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/dust.json -3e8c9c8b52cfe0c3e8bb21a2d50ec0e0d1179920 data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/tiny_dust.json -4d78658fbc2e21452ab0221bfc18cf444bbf4f5c data/modern_industrialization/recipe/materials/annealed_copper/compressor/double_ingot.json -327896350cea50ec2e503d554eedf806aca5d2f3 data/modern_industrialization/recipe/materials/annealed_copper/compressor/main.json -8664bbbd36eb238a3f51b2a96933fc04b2b5b80f data/modern_industrialization/recipe/materials/annealed_copper/craft/block_from_ingot.json -786152ac61c36732325d5f24a67c03f424cc4d7e data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json -c6b5a66009499155e5a01f1341ac1bf03c3d151f data/modern_industrialization/recipe/materials/annealed_copper/craft/dust_from_tiny_dust.json -5a5809fe8568d5445ad72273ed58d1ad7aa37a07 data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_block.json -e1675085df05d9b949ac35f48d909f04467b3b1e data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_nugget.json -0b247fb73e36aee9b0255f1815e6f75dd4759559 data/modern_industrialization/recipe/materials/annealed_copper/craft/nugget_from_ingot.json -845aeee474690d5cfa0f4057fee26b02371244f3 data/modern_industrialization/recipe/materials/annealed_copper/craft/tiny_dust_from_dust.json -7307dd168baf32e2ca6c1ab560af8f6483185530 data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json -3aa5d61777c7eeffb3425a35632a8763fa35e1ba data/modern_industrialization/recipe/materials/annealed_copper/macerator/double_ingot.json -7da2019970cee36708c8f3acec65b46983f83562 data/modern_industrialization/recipe/materials/annealed_copper/macerator/ingot.json -e189f817ebfece607afa2de94ca14ece88e524d4 data/modern_industrialization/recipe/materials/annealed_copper/macerator/nugget.json -b4456406b1def736655b86f9d742729c842f9048 data/modern_industrialization/recipe/materials/annealed_copper/macerator/plate.json -7400485c6e28dd58f44aa42948effe7c34e1f59d data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json -e94b4bf7313ded53f0e749dce1929cf0fbec9701 data/modern_industrialization/recipe/materials/annealed_copper/packer/block.json -23d8aa727612d5909bf1a719d0e284fdd49f19e7 data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json -3fd9a924ac1e8fd922481d705309036bedf4a4ab data/modern_industrialization/recipe/materials/annealed_copper/packer/double_ingot.json -b2776b4259085e16c9641d9db99008b539ad3f28 data/modern_industrialization/recipe/materials/annealed_copper/packer/dust.json -ec2d323f1d4f0f4e3ff76096e924422f82b46dba data/modern_industrialization/recipe/materials/annealed_copper/packer/ingot.json -0e44c882267f7cf8a0a62b69f7b585823714f692 data/modern_industrialization/recipe/materials/annealed_copper/unpacker/ingot.json -854136b47c98bba68fde0bf56c4c3009d5905f47 data/modern_industrialization/recipe/materials/annealed_copper/unpacker/nugget.json -f94b45972cde8eea59d124389808c8af1736f4ad data/modern_industrialization/recipe/materials/annealed_copper/unpacker/tiny_dust.json -06f71adb06414ab0fb4e238afefcd0f20571a4f5 data/modern_industrialization/recipe/materials/annealed_copper/vacuum_freezer/hot_ingot.json -0f19a093336d8e4fcd27696c80afec19f8ea3606 data/modern_industrialization/recipe/materials/annealed_copper/wiremill/wire.json -1da3398a8698ab07acaa7480a4494b904639c934 data/modern_industrialization/recipe/materials/antimony/craft/block_from_ingot.json -cd134a0f45ba51dd55f8fe1cd827b41e05c3848b data/modern_industrialization/recipe/materials/antimony/craft/deepslate_to_ore.json -bf2bd1a015758693932b0713da672f75c608a8c4 data/modern_industrialization/recipe/materials/antimony/craft/dust_from_tiny_dust.json -d9022541524263d64c68b24dbdb697bac3e78fbc data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_block.json -893db26a23ff55dd6f14b3fcb8e3a16b3895b2fd data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_nugget.json -b9048ea39ee7585a527309c6f925ee47fcd0b23b data/modern_industrialization/recipe/materials/antimony/craft/nugget_from_ingot.json -e9c085a049406a924d52a4c91466fc2f47d3df8d data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_block_from_raw_metal.json -58866128169ddfa17b93027c1afc98646e5405fb data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_from_raw_metal_block.json -d734e64a2c7b5021c4638eb775bf31e90a85024f data/modern_industrialization/recipe/materials/antimony/craft/tiny_dust_from_dust.json -67343c1d9cf88b771e8ca4494d4a706adc166769 data/modern_industrialization/recipe/materials/antimony/macerator/ingot.json -129ae89114d523e0b5a89f423fcddbe9a0002d35 data/modern_industrialization/recipe/materials/antimony/macerator/nugget.json -80ca31817cad4c25edde83d6583dba6e53dfa02d data/modern_industrialization/recipe/materials/antimony/macerator/ore_to_raw.json -a80eb18bdb5a03b94d5d085b95dc2f3978592694 data/modern_industrialization/recipe/materials/antimony/macerator/raw_metal.json -3b8f81bac26237f954d4967189bc8d4b85b54345 data/modern_industrialization/recipe/materials/antimony/packer/block.json -a035d61e3d8c17e18e33e0284bb0230496479024 data/modern_industrialization/recipe/materials/antimony/packer/dust.json -436de96b95ee47bc6d1378e37238109477ed53d5 data/modern_industrialization/recipe/materials/antimony/packer/ingot.json -7458168c93c2dd8bea542bbd9c70e365c9b974ef data/modern_industrialization/recipe/materials/antimony/packer/raw_metal_block.json -8d1d1187f1ef85599ff43ed9efa3d2599db2fd82 data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_blasting.json -8b87bff1305847c58478112465f8d04f1b67b120 data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_smelting.json -3cd8c3076afb710873c12b9eaf16e28e3726a546 data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_blasting.json -4c2291249c92237666c9e5cec80675b2db7d7d04 data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_smelting.json -80236d4b6b2b28b495353fc0e92ca4a62065afa5 data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_blasting.json -e63aabc2953a3e8ee21efe19268e57d8aed5be6c data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_smelting.json -b453554f0cc2fd1655ff2c9e10472422dc4179e4 data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_blasting.json -d8a3c9bacbd392ab7b6ef34807e173d3df38448c data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_smelting.json -6ba03a7066c75dc8c77b82e5561ec28021bbd921 data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_blasting.json -557477fac4c65059ce481c352b6ef9f01d2b4aee data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_smelting.json -1684331d426edfcbf0f0b4b286bb2fe22ad48be0 data/modern_industrialization/recipe/materials/antimony/unpacker/ingot.json -9042bdaa90af873eda618c742d16e0fa9dae9875 data/modern_industrialization/recipe/materials/antimony/unpacker/nugget.json -1f0b4d4cba0da74ce7fb77003e9f231ffc6f471c data/modern_industrialization/recipe/materials/antimony/unpacker/raw_metal.json -bd3e08b18a7f057e49d7261510ed9c506658a69d data/modern_industrialization/recipe/materials/antimony/unpacker/tiny_dust.json -f5927c4a68488b267ed39585baad2280e9a6150c data/modern_industrialization/recipe/materials/battery_alloy/compressor/double_ingot.json -0da93f740fe63fd9cf459c903107f9f465e96580 data/modern_industrialization/recipe/materials/battery_alloy/compressor/main.json -38443eec16ba91d7ae1562ae78ba570871eb94b5 data/modern_industrialization/recipe/materials/battery_alloy/compressor/plate.json -ea36dcafedc7573966388c5ecafc06f26f624171 data/modern_industrialization/recipe/materials/battery_alloy/craft/block_from_ingot.json -c9da2167e327be933240a02cc2df6a393e0f08e1 data/modern_industrialization/recipe/materials/battery_alloy/craft/dust_from_tiny_dust.json -7eb6df97b10f1851e3e55dd7dce2ff72a7f5fea2 data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_block.json -57f2cbaa4d6cb082e79dce670a6381292788b386 data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_nugget.json -83efd7da0abcd7ea4b2c3d01c35e460f47ff0f6b data/modern_industrialization/recipe/materials/battery_alloy/craft/nugget_from_ingot.json -0a516da4330318e5d9e923f2102b8ed584c6a9d6 data/modern_industrialization/recipe/materials/battery_alloy/craft/tiny_dust_from_dust.json -cd4e727dc89b5f625fde374760ce976487dcaf78 data/modern_industrialization/recipe/materials/battery_alloy/macerator/curved_plate.json -c69a03a924b795fbe188766e04146f4e634a742d data/modern_industrialization/recipe/materials/battery_alloy/macerator/double_ingot.json -c3657f1b1b8f5bf40ac0c1f650d1303d569d4196 data/modern_industrialization/recipe/materials/battery_alloy/macerator/ingot.json -835b0aaa3a5ab64dafe3b231617ac449822c54a8 data/modern_industrialization/recipe/materials/battery_alloy/macerator/nugget.json -c67169fbbd0edf8900294c17c99b76499af80e3d data/modern_industrialization/recipe/materials/battery_alloy/macerator/plate.json -8005617dc6cdf238f37fbd54c66810c588e9dce8 data/modern_industrialization/recipe/materials/battery_alloy/packer/block.json -8340217a77e228ebdd5c68765fcb1bb383297053 data/modern_industrialization/recipe/materials/battery_alloy/packer/double_ingot.json -688fd3de42156e7000f47d50e25235223db3b576 data/modern_industrialization/recipe/materials/battery_alloy/packer/dust.json -b14ecc245626526834d8d200f076fb7a83aa6864 data/modern_industrialization/recipe/materials/battery_alloy/packer/ingot.json -1500506f73a329624862cbb28d13ca814dd8807e data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_blasting.json -4f591b4c491bb27b50025f20e8e34e1d0006e36d data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_smelting.json -35b3445a29f21decef66087e53f35ee3cebba59c data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_blasting.json -170bf252c42e5329cfe2d4f71d51a6e3d953f945 data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_smelting.json -1beb3527725b4e4e73cd0a0581ef5dba6b40d10e data/modern_industrialization/recipe/materials/battery_alloy/unpacker/ingot.json -84f09c7e082caa0df3f81bbcde3c5a7efd007178 data/modern_industrialization/recipe/materials/battery_alloy/unpacker/nugget.json -e58496a73f68efd52f6b6740aafa03df9a6da7a9 data/modern_industrialization/recipe/materials/battery_alloy/unpacker/tiny_dust.json -4a764b2f8cbd3b573d68f83dc415d0fbf2673c96 data/modern_industrialization/recipe/materials/bauxite/craft/block_from_dust.json -26b8f06588bb5b747e1965fb071b924f20ed5d24 data/modern_industrialization/recipe/materials/bauxite/craft/deepslate_to_ore.json -ad7dd5c3eeecc20051d72a4892f2b064b9123715 data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_block.json -6291f93e2c86cc125b8b6220415a0010ceef16f4 data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_tiny_dust.json -5ad7cf7ef796ed4eebf79b54fade46106af3ecd6 data/modern_industrialization/recipe/materials/bauxite/craft/tiny_dust_from_dust.json -9f96e7ba44b7d4a0815b94a2bfe67e53a646daed data/modern_industrialization/recipe/materials/bauxite/macerator/crushed_dust.json -0eb2120073dc1b945a9e2cd818c88c7fc5a8f2e8 data/modern_industrialization/recipe/materials/bauxite/macerator/ore_to_crushed.json -2cb9836c1492e78f053b3486bf8dfb89fd855ea3 data/modern_industrialization/recipe/materials/bauxite/packer/block.json -9469b2278468a3ad275ceabc75a5d0604c14da6f data/modern_industrialization/recipe/materials/bauxite/packer/dust.json -acd934bdc01a16178dcb44af961f5320e70785e1 data/modern_industrialization/recipe/materials/bauxite/unpacker/dust.json -9513ec7eae82fe329a465240453a016b7bbcb6e7 data/modern_industrialization/recipe/materials/bauxite/unpacker/tiny_dust.json -22225b05bccab9b99f8999e1598e39358e20eb34 data/modern_industrialization/recipe/materials/beryllium/compressor/double_ingot.json -344668e9e3026ee756acaa9efc40c50df7908995 data/modern_industrialization/recipe/materials/beryllium/compressor/main.json -44b6cd8c690bfffba3d4bb6bf696b22231cff2a6 data/modern_industrialization/recipe/materials/beryllium/craft/block_from_ingot.json -6af702df83847f55eb5f8b80b2b388439162a37b data/modern_industrialization/recipe/materials/beryllium/craft/dust_from_tiny_dust.json -1bfd7e13d8e216faea5a0cd1b79a3ccf8fe1083f data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_block.json -08beca264319eaedb46821a13e379764f5a3b5bf data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_nugget.json -c3b047bdc3aa8d5bcff337ab5e2da5f2f966d632 data/modern_industrialization/recipe/materials/beryllium/craft/nugget_from_ingot.json -c0abbf4ec57b31f30d6068ae35dfad3d71aa628a data/modern_industrialization/recipe/materials/beryllium/craft/tiny_dust_from_dust.json -8ccb67bffcdd5426388e6cc682fd96d6f714c154 data/modern_industrialization/recipe/materials/beryllium/macerator/double_ingot.json -2e75ed7f1b7ed3e7a99d0027cae0f5560933c3fc data/modern_industrialization/recipe/materials/beryllium/macerator/ingot.json -6932555c39e7db193405efddc2e50ff6304e7680 data/modern_industrialization/recipe/materials/beryllium/macerator/nugget.json -26d54c4abd2213de6442b7278714e3bface54e1f data/modern_industrialization/recipe/materials/beryllium/macerator/plate.json -71b5acb650c5dee91d7e9f1fbbbd7453fe4a2257 data/modern_industrialization/recipe/materials/beryllium/packer/block.json -5d55671ab41095b982ea611e00fddd88717530ca data/modern_industrialization/recipe/materials/beryllium/packer/double_ingot.json -8920012978051aa992d5235b0c84835a64bacc62 data/modern_industrialization/recipe/materials/beryllium/packer/dust.json -749bd828ad32a64da3c5ac31ea842458a5b377cf data/modern_industrialization/recipe/materials/beryllium/packer/ingot.json -89965e35d91c1387d2b8732aa7764d77a0af4d6c data/modern_industrialization/recipe/materials/beryllium/unpacker/ingot.json -03bf2e4a2fb501a9525ddc314369b9ca19f80b45 data/modern_industrialization/recipe/materials/beryllium/unpacker/nugget.json -13f087588ca2f7798eef88df88a0e444e7b128e4 data/modern_industrialization/recipe/materials/beryllium/unpacker/tiny_dust.json -e4339dfd2b5344686078105db2fc125dc1a8f207 data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/main.json -7edbb54bb342e1f9d83320d107919baf28d8a2df data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/plate.json -2e914a557bb7db453fc382b36b674be5d7b77954 data/modern_industrialization/recipe/materials/blastproof_alloy/craft/large_plate.json -3a8f3be4bbffcaf07715027fe15e9a07481d9506 data/modern_industrialization/recipe/materials/blastproof_alloy/packer/large_plate.json -c42cafe71efdc3803e36b86b56a35c3624067abc data/modern_industrialization/recipe/materials/brick/craft/dust_from_tiny_dust.json -c22e4eff5f1b9fde66a10cf336160e257d32f4db data/modern_industrialization/recipe/materials/brick/craft/tiny_dust_from_dust.json -6dcf56dc71c37a54f416ea8f5d9bfde33d6356ab data/modern_industrialization/recipe/materials/brick/macerator/ingot.json -1301b53559a695cabac167a5c5e8b59d43faaa8f data/modern_industrialization/recipe/materials/brick/packer/dust.json -f06fb222a631164c31dc092e29524966f312777c data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_blasting.json -537388b49ca0c70db31fce6310b217c65d90dab7 data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_smelting.json -d5398c38b8a4207b47ce7188d4a86a4c2428e418 data/modern_industrialization/recipe/materials/brick/unpacker/tiny_dust.json -ba7aa46df8e92b56a12c94e830e1b4fd0edefcec data/modern_industrialization/recipe/materials/bronze/assembler/barrel.json -86d9c4407ed2f85f279c1eae744c1dc2a2acb4af data/modern_industrialization/recipe/materials/bronze/assembler/drill_head.json -61aaf295615c7974c3c052cae96594d52e7e1694 data/modern_industrialization/recipe/materials/bronze/assembler/gear.json -0a4e4c8ce5b8fc6283003af3b0b6a25c86617df9 data/modern_industrialization/recipe/materials/bronze/assembler/rotor.json -ee74a4314d2820884941252ca972c447ec1e265e data/modern_industrialization/recipe/materials/bronze/assembler/tank.json -bd552683d6a7afd8884d3269b23250f80181dac5 data/modern_industrialization/recipe/materials/bronze/compressor/double_ingot.json -77578d791c009611b2a816a0b6cd064de227ea70 data/modern_industrialization/recipe/materials/bronze/compressor/main.json -212fdc8e3d756a572697267bbb4f26d8a2252d75 data/modern_industrialization/recipe/materials/bronze/compressor/plate.json -be8b1f2f3449eb0e055300b884e11324fdf33c19 data/modern_industrialization/recipe/materials/bronze/compressor/ring.json -1f476b1dc00527d8df2b6cb432f58f08208c9b21 data/modern_industrialization/recipe/materials/bronze/craft/barrel.json -f0482dc15b3397a9436f309b16023f482e8855f9 data/modern_industrialization/recipe/materials/bronze/craft/blade.json -d7a6d9629ca3c37e33dadbbc3fa9e1092eaf68dc data/modern_industrialization/recipe/materials/bronze/craft/block_from_ingot.json -2cd89b4f1a38f7eb29716c063a49be5f06aff3ab data/modern_industrialization/recipe/materials/bronze/craft/drill_head.json -4391f4f2763fd35b1a92ef87258c906f1d5cf136 data/modern_industrialization/recipe/materials/bronze/craft/dust_from_tiny_dust.json -5783b245e494508a3140a65ef923b4eeeb5b7ae0 data/modern_industrialization/recipe/materials/bronze/craft/gear.json -7ca5bf48cb5ac52cf809b3f569fc4d7e444741e6 data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_block.json -2562b725c48f467a4ec6ad597505c462d2aaa690 data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_nugget.json -e0ba942357ddc204d0d0a9e475a4ebfffb7cc38f data/modern_industrialization/recipe/materials/bronze/craft/nugget_from_ingot.json -200d66846909d4966c832b7071e99a401d821fee data/modern_industrialization/recipe/materials/bronze/craft/ring.json -210a0009f0412e3f5b6ecd8c739b9d0f78dd4735 data/modern_industrialization/recipe/materials/bronze/craft/rotor.json -c82618540a7e7a2724ec06a1f9ba45419e785748 data/modern_industrialization/recipe/materials/bronze/craft/tank.json -e7f034b6cb03ec5cf7bad56c52cd6d9b2aa3ae80 data/modern_industrialization/recipe/materials/bronze/craft/tiny_dust_from_dust.json -87ccf983ad4948ae4515a0631541f72cd265704f data/modern_industrialization/recipe/materials/bronze/cutting_machine/double_ingot.json -29cff70cc2813437e11a88aa3d7423379904e742 data/modern_industrialization/recipe/materials/bronze/cutting_machine/main.json -97d90882fe6bd4f0f7b0e1911fea3dcd49e7ae52 data/modern_industrialization/recipe/materials/bronze/cutting_machine/rod.json -a408f3b03e21608000b57aba0853a8365a1bb925 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt.json -114bc9500249260d5cd7a5b302cbdabc7ab4cd8d data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt_with_tool.json -1dd5fd1f807c1cd9a1529ee40e28d53751b70610 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate.json -7bd198f3a75a373857aa2b2f22908c44a8f52eab data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate_with_tool.json -da30faacbb88787b4400e4488aab72731665e914 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate.json -4ca26d5e334705e46c5b026a6bb8baf201032213 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate_with_tool.json -680350c87aa6847ec0dd721f86c273a1a4ceb9cc data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring.json -fa5a22892375f0b8ec2260231d59a25530308ffb data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring_with_tool.json -f37b2f4b9954f5f363fa1fbaae8ebe6d31260daf data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod.json -7bb977d3f44c45a6beebbb5d49d88727604c93ab data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod_with_tool.json -cec607d77bf89155d9978ac6b2ddcd5a6486f7f1 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt.json -3dd2d0cecac7e1c458023c1e7976602861fa1d35 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt_with_tool.json -e3a0f0fe5d866a63651f7903f0b072ebb0ed23f3 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate.json -8c8989e0be48f5aa4378be3429e1cd53da5f567d data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate_with_tool.json -03b904b4361191459c1a5ae05111dcea8bb5b7ea data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_double_ingot.json -5d03d487b3c5aea9307d5d2604687879da909dbf data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_dust.json -0c29858a1a33d6d9ec7da7808ad42c8d8492e771 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate.json -93b4c8f62952658b220c3d30155f96a630be7e73 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate_with_tool.json -2b3f81a678f187871c78b06c7f2339c2f26c2b01 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring.json -36a73cf3e6b4a2f96c9847ad4b2c20cfa85f98d9 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring_with_tool.json -2d3e14a3e3b474388bafa1aedc7dc8101d69f462 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod.json -c23b157cb3ee529bbadcf250a06a425fab9be8c0 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod_with_tool.json -1af98a059eef02e17771eee3bdcefe7468e41f8b data/modern_industrialization/recipe/materials/bronze/forge_hammer/nugget_to_tiny_dust.json -a650f2f21ce04eff08e5ed2fc04a4df5ec1f1576 data/modern_industrialization/recipe/materials/bronze/forge_hammer/plate_to_curved_plate_with_tool.json -d519ec8d081e1890d1a7cea58508edd3fa5b16bf data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_bolt_with_tool.json -bad6c06faa2758390c3db8f903be5d9f2ef5e3b1 data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_ring_with_tool.json -5f24801299fb1204c71283703528f76af03313bd data/modern_industrialization/recipe/materials/bronze/macerator/blade.json -1bae665c782f473ce54cc2dc2e24bea1345c6ea8 data/modern_industrialization/recipe/materials/bronze/macerator/bolt.json -b3439224479e14db58f17299dae80531298e41c2 data/modern_industrialization/recipe/materials/bronze/macerator/curved_plate.json -f36092aae5b69ce28bdc3bd7698d0aad2ebfc8db data/modern_industrialization/recipe/materials/bronze/macerator/double_ingot.json -d25652f4b8c989f4a0413d3a345ac9e9d99e7eea data/modern_industrialization/recipe/materials/bronze/macerator/drill_head.json -53ffd1970f14307965767b6cdb6fc2bbab1cea1e data/modern_industrialization/recipe/materials/bronze/macerator/gear.json -d62f201937faa6f335e8a146e55a466b247c8b4a data/modern_industrialization/recipe/materials/bronze/macerator/ingot.json -f1db650ae141893b523521da6e4ed7ef707a396f data/modern_industrialization/recipe/materials/bronze/macerator/nugget.json -3a3784c4b26e4d46c98f1326c195db39a25a427b data/modern_industrialization/recipe/materials/bronze/macerator/plate.json -4052f5b709791aa08a9c5f8b5c83277bd5e720e9 data/modern_industrialization/recipe/materials/bronze/macerator/ring.json -d8fc88f4690d752020c23ea0303d7179c8eef541 data/modern_industrialization/recipe/materials/bronze/macerator/rod.json -fc06b00398929cef1c427841d6c70db890d5a7e4 data/modern_industrialization/recipe/materials/bronze/macerator/rotor.json -e30a37662922191a2101e93815967b86fbcb4752 data/modern_industrialization/recipe/materials/bronze/packer/blade.json -ca66b1282851311b27ae2cf4c9304a8d301fb38e data/modern_industrialization/recipe/materials/bronze/packer/block.json -f6d7712d6c4e119f32ee5cf057b64f28cae215bb data/modern_industrialization/recipe/materials/bronze/packer/double_ingot.json -6b74e2e8628666e30df864f357a700d5ea15fc14 data/modern_industrialization/recipe/materials/bronze/packer/dust.json -1245d70f781212affa9dca501c2bf1c6125686db data/modern_industrialization/recipe/materials/bronze/packer/ingot.json -10b77e25d4e3909ad478dd23035528d225bb5dae data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_blasting.json -655e93d6dc07f8bd7994c6685b546ea1dfb1d0f5 data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_smelting.json -527ad70addc55307b2a7fbf2fe37d3e12faf099d data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_blasting.json -07d4ca74894e595776720d391f121f3c0fddf220 data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_smelting.json -7acb220816573ad6dcb7a5c76a956db5581e9bf8 data/modern_industrialization/recipe/materials/bronze/unpacker/ingot.json -1c633b1c0dbc6444c5b9c3ae35035e39bde32c8d data/modern_industrialization/recipe/materials/bronze/unpacker/nugget.json -940ac78b9aaaba3a0c3c7f2bf660ab209d9ba8c5 data/modern_industrialization/recipe/materials/bronze/unpacker/tiny_dust.json -a2fe40f03b5c812b136d95ac1e9ed86885961b43 data/modern_industrialization/recipe/materials/cadmium/assembler/fuel_rod.json -107157ef56ad3e593f5c20b04a760afef379b0a3 data/modern_industrialization/recipe/materials/cadmium/compressor/double_ingot.json -7d1f98d324f3fb3d79460c4d1680e6303aa8bec9 data/modern_industrialization/recipe/materials/cadmium/compressor/main.json -f6f87fb0f479071e59ceacdab1308c529083ebac data/modern_industrialization/recipe/materials/cadmium/craft/dust_from_tiny_dust.json -2e6673e8734a6f38a76d597d967133831f984b48 data/modern_industrialization/recipe/materials/cadmium/craft/tiny_dust_from_dust.json -f5153b70d7d3589169e00b5a9521955e204ec988 data/modern_industrialization/recipe/materials/cadmium/cutting_machine/double_ingot.json -93a5e95268aa8fdd388c913f6261ec4892929dfe data/modern_industrialization/recipe/materials/cadmium/cutting_machine/main.json -ed819031c248b40df0093ebb56db1fae83315357 data/modern_industrialization/recipe/materials/cadmium/macerator/double_ingot.json -d3d7a49b6c82169e644d57222c2f91524576be34 data/modern_industrialization/recipe/materials/cadmium/macerator/ingot.json -85fd0cd5f72dd2e6d393faed2a3188d607b8b4ef data/modern_industrialization/recipe/materials/cadmium/macerator/plate.json -dc72e07b301d0b30da88c123cc8e5836c654ad3b data/modern_industrialization/recipe/materials/cadmium/macerator/rod.json -f657327df3983d3f78830e3c784c9909d5fdd459 data/modern_industrialization/recipe/materials/cadmium/packer/double_ingot.json -466dc2a6cf68100770743e43562532bbbdd700fb data/modern_industrialization/recipe/materials/cadmium/packer/dust.json -c745410b79ea182df1ea1efd9f87af61a13c491d data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_blasting.json -2b1843ac226885557c6f260a29cc96ee104ee4cc data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_smelting.json -d8097cd8a33385dbd1d3b9f1435632103c8a5b0d data/modern_industrialization/recipe/materials/cadmium/unpacker/tiny_dust.json -1f607260d7bde356b17fe2b17cedf2b7c7cb7b0c data/modern_industrialization/recipe/materials/carbon/compressor/dust.json -9119b623191465a925a9dea043dca161944fb5d2 data/modern_industrialization/recipe/materials/carbon/craft/dust_from_tiny_dust.json -fdf9cd9e46d4d92158d3de24330585f325234902 data/modern_industrialization/recipe/materials/carbon/craft/large_plate.json -df5bcc992b11cd3516a65dc3bb62c2c4830852ae data/modern_industrialization/recipe/materials/carbon/craft/tiny_dust_from_dust.json -5c5cdc0a1242951f21ea16c72bef7a38af7f7f9b data/modern_industrialization/recipe/materials/carbon/macerator/large_plate.json -af622ccca317d3af4c60e5f139e0b759a8efd450 data/modern_industrialization/recipe/materials/carbon/macerator/plate.json -9d4e9ad9dea76a29428c0deea787fd8ca1a011e7 data/modern_industrialization/recipe/materials/carbon/packer/dust.json -409962e273849236c89b7623ac1cd31065d885f1 data/modern_industrialization/recipe/materials/carbon/packer/large_plate.json -6f745164c5e447f3e44e9fd8a6a177c79c62b19a data/modern_industrialization/recipe/materials/carbon/unpacker/tiny_dust.json -3ea91a3b7430ee345e38f1d7473d0dc881c64664 data/modern_industrialization/recipe/materials/chromium/blast_furnace/dust.json -e269e886af24fa3cc3ff74ed37749e3d7d787da5 data/modern_industrialization/recipe/materials/chromium/compressor/double_ingot.json -4a67c625a4a6d79daeb2cd242abd76aeaf59d3b4 data/modern_industrialization/recipe/materials/chromium/compressor/main.json -ed2dfe938c96da9b6c4d0a161f6343c0677be690 data/modern_industrialization/recipe/materials/chromium/craft/block_from_ingot.json -cc800d4f243a79b92d84495ca41ef7c8f4cc13c9 data/modern_industrialization/recipe/materials/chromium/craft/dust_from_tiny_dust.json -7d46f4380b001eda5aaf3fc013357a1ad8191872 data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_block.json -a822a31b6c53392a970f1d0441bfd174bc6c31a4 data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_nugget.json -aa0e868b9f6ebeae33d89e2638cf287a7843c16b data/modern_industrialization/recipe/materials/chromium/craft/nugget_from_ingot.json -ca2f0f174e518b9de5672bf1c3f461ada0aa756a data/modern_industrialization/recipe/materials/chromium/craft/tiny_dust_from_dust.json -cec840913289444c12f70898613d8827668012e3 data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json -614b9e58aa6fd005db03d9654f87f4e04bd4034c data/modern_industrialization/recipe/materials/chromium/macerator/double_ingot.json -aac0ec1a76bec3c873f7d3664df2941c65e2ae1b data/modern_industrialization/recipe/materials/chromium/macerator/ingot.json -a9342d11eeaa3be6374094a59e112a3e956e1ae1 data/modern_industrialization/recipe/materials/chromium/macerator/nugget.json -74345c3759708ac08ccd52e56004aee55e7dbda2 data/modern_industrialization/recipe/materials/chromium/macerator/plate.json -3a7bf88c58da8c89d44a58fff8a725d175dede8c data/modern_industrialization/recipe/materials/chromium/packer/block.json -7faf12504113c7a12db931b0ab7742b6330b5720 data/modern_industrialization/recipe/materials/chromium/packer/double_ingot.json -642b270df15d4f96b08b4ae0aa0be33d1a4ed74f data/modern_industrialization/recipe/materials/chromium/packer/dust.json -d7613fd5d048de96beec96c8a713ce74aa80dc78 data/modern_industrialization/recipe/materials/chromium/packer/ingot.json -47b5b379cc6688a492a41aca241b747da9c3f634 data/modern_industrialization/recipe/materials/chromium/unpacker/ingot.json -31617ca7a2ce2a1361b5485356b251ddfdbd2d1a data/modern_industrialization/recipe/materials/chromium/unpacker/nugget.json -4dc024598cbe9ddd86a5b4dd6182470f8fd88063 data/modern_industrialization/recipe/materials/chromium/unpacker/tiny_dust.json -68d47246c152fc142cf4a5f4964512a9be447b7c data/modern_industrialization/recipe/materials/chromium/vacuum_freezer/hot_ingot.json -2156988c3a60be98c8412491f3204d19b8bd137b data/modern_industrialization/recipe/materials/coal/compressor/coal.json -2d32c97f9c7b7a53754be306803b60676145612f data/modern_industrialization/recipe/materials/coal/craft/deepslate_to_ore.json -dc637d70e78f822cabb094af3c797f01ec23d6c2 data/modern_industrialization/recipe/materials/coal/craft/dust_from_tiny_dust.json -8cc54ca93517aff8759c8a112fd873d038ffdb37 data/modern_industrialization/recipe/materials/coal/craft/tiny_dust_from_dust.json -3a92d64a19bfa24ff79eb13a459e3de1299caff7 data/modern_industrialization/recipe/materials/coal/forge_hammer/crushed_dust_to_dust_with_tool.json -ecd6858fd719c2968c96434540519927c63a42a4 data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust.json -58d46e8ced4426249f27c67ce38daa9b0178f899 data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust_with_tool.json -9c320123ccd4e2f56413c2afa1f40c04abe31a91 data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_dust_with_tool.json -1c2ee3d1c6fc2c7ac84c11b99a75669a6e1df246 data/modern_industrialization/recipe/materials/coal/macerator/crushed_dust.json -60474cd978fe930d28195d72eaca7834ad6d96bf data/modern_industrialization/recipe/materials/coal/macerator/gem.json -53c02adab92f514a76a663e8f38a0c1418a4403b data/modern_industrialization/recipe/materials/coal/macerator/ore_to_crushed.json -450d510e7236bbd6ce2a8ab0974f6cef7db14674 data/modern_industrialization/recipe/materials/coal/packer/block.json -fff077961ca0e71edff367a3812bfa85f71f5c85 data/modern_industrialization/recipe/materials/coal/packer/dust.json -839869179a4f27ea01fc134b6152090f943fcdb1 data/modern_industrialization/recipe/materials/coal/unpacker/gem.json -6867f5443df438f76951b869af410064bc8680fc data/modern_industrialization/recipe/materials/coal/unpacker/tiny_dust.json -4cf858d4974a593db8c06649828af2aeadfa0b3e data/modern_industrialization/recipe/materials/coke/compressor/dust.json -0090ff4b4e46db471b7bcba1dc473909f1042fa3 data/modern_industrialization/recipe/materials/coke/craft/block_from_gem.json -3a02bae18802c98e89de3d82aef12cb79a863b26 data/modern_industrialization/recipe/materials/coke/craft/gem_from_block.json -188c7764ddb39d074b4d97891296172d60be281a data/modern_industrialization/recipe/materials/coke/macerator/gem.json -cb2d4d2bf91c2236160d54ccf21811b7efe5660c data/modern_industrialization/recipe/materials/coke/packer/block.json -af2b3c2e97e567a62942aa5cde3c72ab64bc79be data/modern_industrialization/recipe/materials/coke/unpacker/gem.json -c7ed88aa474e6811de18779d9aafd31441b86e38 data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json -7cd9a20649e017aba76de5a13b97bc9a87ba9710 data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json -3dfbdbd0f95339bcdbd0f6581bcd8e93486cb5ce data/modern_industrialization/recipe/materials/copper/assembler/drill_head.json -5a506a20b8ceed43d2133b05237d62075f8063a5 data/modern_industrialization/recipe/materials/copper/assembler/gear.json -be26f69bb6eafa73dcc2d6d44ecbf83ada732960 data/modern_industrialization/recipe/materials/copper/assembler/rotor.json -822db1a5ed1639660808658f558fc064285e52ff data/modern_industrialization/recipe/materials/copper/compressor/double_ingot.json -3e75f6ebb33bfa9594cc75636bf1ae33093a5f49 data/modern_industrialization/recipe/materials/copper/compressor/main.json -d1f713d51edc7f30612452ae2e9a6350eb291bc9 data/modern_industrialization/recipe/materials/copper/compressor/plate.json -91552c1829ebf4ae15e35a63776db7195ffdcd48 data/modern_industrialization/recipe/materials/copper/compressor/ring.json -9a36afa3945286957f8648a7e55d2dfb77054714 data/modern_industrialization/recipe/materials/copper/craft/blade.json -e62ddd58fd4ed7b213402c56c2e52288885cafa1 data/modern_industrialization/recipe/materials/copper/craft/cable.json -d6867e740f4828348c611172d3a5127e60d4bbd6 data/modern_industrialization/recipe/materials/copper/craft/deepslate_to_ore.json -42e213a216e43db6d073b1e7f75b9839d1179994 data/modern_industrialization/recipe/materials/copper/craft/drill_head.json -061f232d245bdc3f6327db0d078d2b9b5cb22ea4 data/modern_industrialization/recipe/materials/copper/craft/dust_from_tiny_dust.json -c1bae78945e7fc34aadf951848119a33d84b0b36 data/modern_industrialization/recipe/materials/copper/craft/gear.json -697f48b8b07696cb1256276074356d98e370a953 data/modern_industrialization/recipe/materials/copper/craft/ingot_from_nugget.json -ee2156fa119fa4094db273a4fa9d53eb7193c592 data/modern_industrialization/recipe/materials/copper/craft/nugget_from_ingot.json -b8b8051d0f79bcb273391a360c78b8686d3891a8 data/modern_industrialization/recipe/materials/copper/craft/ring.json -bd8356a0a9ed90687d50eee86016801a81766829 data/modern_industrialization/recipe/materials/copper/craft/rotor.json -491785832b6ab9089bfd363941b9ecf8ea839674 data/modern_industrialization/recipe/materials/copper/craft/tiny_dust_from_dust.json -0e1bda8c910e911cbc3b1ff17a2dcaf67460108e data/modern_industrialization/recipe/materials/copper/cutting_machine/double_ingot.json -030c15f717ca291e5e9ee25e1345e419f8a23767 data/modern_industrialization/recipe/materials/copper/cutting_machine/main.json -604ccb75f92083b105c36417dffb220fe2cef527 data/modern_industrialization/recipe/materials/copper/cutting_machine/rod.json -ba439e5452c6d93612acb4022fc1692ac05a51a4 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt.json -2d3eb00544a5ea08b577cc608cf68d5c4ab67ea2 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt_with_tool.json -2d30e219149071eb39ec9f797e419e30bfce4f2a data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate.json -d3286fc95a904801e6ab5e74667c995fbb556d2a data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate_with_tool.json -126be2a8f23fcc49619b0e725f0b8d9b6f366de5 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate.json -c402167120596e124aa8453ded66d4ada9c2ee54 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate_with_tool.json -02bc150bcf71c491edea1ebe0ea04c6553855f76 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring.json -09ee40b6646184f229791a826f394b782a745837 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring_with_tool.json -6356b01b1d72020e520ec2ca14b3131de6d6c3c8 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod.json -c042d89668f4bbb342e099b2562a7600c3aaae85 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod_with_tool.json -ed5844044dc0d000984b7a4b0f7d18f0e1e385af data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt.json -5fc230f691070f09fd31d3850b7a348701f3989b data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt_with_tool.json -7b656d6a977f5cf73bc907e4f9aa2a7411616128 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate.json -2d030957f6585083aae5934ed54bfc68bdf2466c data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate_with_tool.json -ec8350ab6e8cf261b46096abbf9b330e15ea7cfa data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_double_ingot.json -153b4668a1b9186d0aee5cbd731f724c9839ab55 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_dust.json -874fb2b8e31dde1a1799303438bc07df37ad60b1 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate.json -252e146d75e84ce4ab4890884a31bcb6f67d78fe data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate_with_tool.json -c094182c259058ac5ed0468d1dbef80855c94f07 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring.json -1efbf7b869b69a6fa8b24eca47d6ff5bba9f2a32 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring_with_tool.json -9341b2e1bc1a171dfa34ccd89c17220251d6483a data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod.json -8a2d2562d8c335ab6c8453aa20f3ab256a6940b6 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod_with_tool.json -943bb04a219439d2cfba1632297c495d1123ebcc data/modern_industrialization/recipe/materials/copper/forge_hammer/nugget_to_tiny_dust.json -d26c1f9c42d33cfa728bcbddd0079b85b13a1884 data/modern_industrialization/recipe/materials/copper/forge_hammer/plate_to_curved_plate_with_tool.json -2d8e7d77a53c0efbaab7a727af9df2786f948a56 data/modern_industrialization/recipe/materials/copper/forge_hammer/raw_metal_to_dust_with_tool.json -d8cd1be4fad74f10ce346fd34640d0c1b746ebdd data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_bolt_with_tool.json -75f4efb28c1a1ec4a63e4c6a7f2ad5d2239b40a9 data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_ring_with_tool.json -51a7c0e38893c24ec3c6d2709d1e2ef65e12acd5 data/modern_industrialization/recipe/materials/copper/macerator/blade.json -e027dd9720fabc2ce1892b6a7efde1163d4fc7c8 data/modern_industrialization/recipe/materials/copper/macerator/bolt.json -75e330350c713c19aa4c654d8127db75d9a66efa data/modern_industrialization/recipe/materials/copper/macerator/curved_plate.json -7d9c60eb7a9a1c369a703dab1ad4ffca5674d376 data/modern_industrialization/recipe/materials/copper/macerator/double_ingot.json -6eb52687dfcc3fc6de36ce271532eede9cc7c825 data/modern_industrialization/recipe/materials/copper/macerator/drill_head.json -efa6b634769a72d09c83f6bfd5e6a8bfda897dcb data/modern_industrialization/recipe/materials/copper/macerator/gear.json -dbca9f540f4bb0be5184c73c7bcdf5dfa2ad54f5 data/modern_industrialization/recipe/materials/copper/macerator/ingot.json -e096b7da925b5662bbb5b9e665efcd7f869ec3c4 data/modern_industrialization/recipe/materials/copper/macerator/nugget.json -bbd2155dca7de684283d5fbbea50c72848d3e562 data/modern_industrialization/recipe/materials/copper/macerator/plate.json -fb084f7bd460d432990296bdbaba2f7cb8b7b089 data/modern_industrialization/recipe/materials/copper/macerator/raw_metal.json -f47dc0e9971a8ee35261028d46b5ff3f0a6923b3 data/modern_industrialization/recipe/materials/copper/macerator/ring.json -bc72300a2d97c04d91f6a6673c9f651c943a0d5e data/modern_industrialization/recipe/materials/copper/macerator/rod.json -5ced114f7ea1e4f9cab455d60e0d61b57e7753bb data/modern_industrialization/recipe/materials/copper/macerator/rotor.json -8000abb1ed7462bc7c0983d9a631899f066bb3aa data/modern_industrialization/recipe/materials/copper/macerator/wire.json -b028ce04393be02999c19ea2de1e279a2edb811c data/modern_industrialization/recipe/materials/copper/packer/blade.json -a812a508b6a1bcc179c40111270889b32883bf36 data/modern_industrialization/recipe/materials/copper/packer/block.json -7aa8c2be6705dd18a74283b50c4143a8a1445b1d data/modern_industrialization/recipe/materials/copper/packer/cable.json -c1d592db56f575cf6b22470e1575149d56cedbd2 data/modern_industrialization/recipe/materials/copper/packer/double_ingot.json -254ffc6d8c208724d8892e07584b347d31caf858 data/modern_industrialization/recipe/materials/copper/packer/dust.json -105f3006ad1ba92223e550bb8c02711e29503bab data/modern_industrialization/recipe/materials/copper/packer/ingot.json -54e6a2404fa8ee437b604b7664299d9539da6589 data/modern_industrialization/recipe/materials/copper/packer/raw_metal_block.json -590c88a2aeadba0772e0bc1868288f6fb7d9763a data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_blasting.json -287c7c76438a67a179957adfd284b548ef41019e data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_smelting.json -57235206b2b1142833f8117aaa54b733e8433004 data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_blasting.json -31ac90b09020d605efd928f130589839fd7a2050 data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_smelting.json -aca5d0c950f916030410505de5d269ecb5c58f85 data/modern_industrialization/recipe/materials/copper/unpacker/ingot.json -27af939f84472a27828f62dc80d8acb611786d44 data/modern_industrialization/recipe/materials/copper/unpacker/nugget.json -b128651df09b89ae4d9cde71cd515f3b87c890e2 data/modern_industrialization/recipe/materials/copper/unpacker/raw_metal.json -2d82f126f88a55ecc44fe61e421215470eecfd26 data/modern_industrialization/recipe/materials/copper/unpacker/tiny_dust.json -40737c53be5814e98b3f97e95ab63fffa0ed7227 data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json -0486f2330374e5cfb33be5728b8efe6b74c6f695 data/modern_industrialization/recipe/materials/copper/wiremill/wire.json -cc353c33c8a2c0696cd061deb281e1d0dee34d1f data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json -6e7dac61bafe06ce11420ea1e7ed0c50c5f1e0bd data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json -48aea65e5aad22d26fbe458c2428f582024b095a data/modern_industrialization/recipe/materials/cupronickel/assembler/coil.json -34f9f17762d0c26cdf429048a7612fdc8fabb04e data/modern_industrialization/recipe/materials/cupronickel/compressor/double_ingot.json -d32202897b79e9519336397e1b9eaf885ed23a11 data/modern_industrialization/recipe/materials/cupronickel/compressor/main.json -f0497063c85f82976c587bd99025521bc9ff2237 data/modern_industrialization/recipe/materials/cupronickel/craft/block_from_ingot.json -bb73ef348f55b0897dccaa0d1be76e4095074368 data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json -82e752d4de98b7a9f1f1b539cdf99ed90951661e data/modern_industrialization/recipe/materials/cupronickel/craft/coil.json -59a9ebfc9a9a9f8181006dc77c9967ba2d1c1cd9 data/modern_industrialization/recipe/materials/cupronickel/craft/dust_from_tiny_dust.json -1064fe26fc89808419b891dbadae40185aae71b2 data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_block.json -4536a884227b361607a4229c68fe8ec9d0c0be4e data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_nugget.json -fc0397c1bcc17cbc21835adc07f0610e021709bc data/modern_industrialization/recipe/materials/cupronickel/craft/nugget_from_ingot.json -26325d77cac1c53008d57fc12e189b65a3ba2b9b data/modern_industrialization/recipe/materials/cupronickel/craft/tiny_dust_from_dust.json -2786b37f358f3efa2fbac97620ab7d18e22a2262 data/modern_industrialization/recipe/materials/cupronickel/macerator/double_ingot.json -dba320990346fc7242edb439397923e1810b9701 data/modern_industrialization/recipe/materials/cupronickel/macerator/ingot.json -3ddc87f0aa6d050de22675969d2b85577c7474d5 data/modern_industrialization/recipe/materials/cupronickel/macerator/nugget.json -d87541a35366d8845457fcca67f4645c23711d0b data/modern_industrialization/recipe/materials/cupronickel/macerator/plate.json -320108cc8c41e1fa0fe85535a67cc4fffd6e8414 data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json -a9d06a602d20c941f46cf98b83df53372c7a2786 data/modern_industrialization/recipe/materials/cupronickel/packer/block.json -83f1ed8c4b8c9d3b66544c72a8e7bd7efcd7ab42 data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json -9a758f764ffec7927e4b457f1fd09b24687418f9 data/modern_industrialization/recipe/materials/cupronickel/packer/double_ingot.json -edb6e110a24a0ce015f71b3c71c87d429cdb20ae data/modern_industrialization/recipe/materials/cupronickel/packer/dust.json -a720dd3993aa4d2222ad14021abac830b2d95dde data/modern_industrialization/recipe/materials/cupronickel/packer/ingot.json -89dea3904e040752d31884c621b623c108694478 data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json -cdd0c10176f51cf0e6d117c31e0016b0391e98f7 data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_blasting.json -8f0efcd2e1bcbff4a66f84d19f2d307c0c06cc27 data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_smelting.json -cb5006bdb8d2c1e7346779bd8caca1afc0b817c5 data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_blasting.json -af67eec2c60fd0cd2361573f2360a868cddc8697 data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_smelting.json -910aa67160721dcf427902a9d655afc9473ef23f data/modern_industrialization/recipe/materials/cupronickel/smelting/wire_magnetic_to_wire_smelting.json -c667e53215f1ef3710874d1d0ab255b543753745 data/modern_industrialization/recipe/materials/cupronickel/unpacker/coil.json -1119914e3c1f577a381496c5022b045aaeb0a83c data/modern_industrialization/recipe/materials/cupronickel/unpacker/ingot.json -d6903458b361ea929ff0cbcbbc80e482db5ed30f data/modern_industrialization/recipe/materials/cupronickel/unpacker/nugget.json -a7de5321a703599af8cfd99750d11bdcc5f823da data/modern_industrialization/recipe/materials/cupronickel/unpacker/tiny_dust.json -82cab1bac6736ba90c7b82b4fedb23be3ea328a2 data/modern_industrialization/recipe/materials/cupronickel/wiremill/wire.json -35446c88202967a6f0b103b725e6d0ad1f549611 data/modern_industrialization/recipe/materials/diamond/compressor/main.json -a9e2dc692d89b8ff79111e32ff7e95c56e4ce620 data/modern_industrialization/recipe/materials/diamond/craft/deepslate_to_ore.json -d53180432b5eab98e634e88c9e9cb0499b1ecf47 data/modern_industrialization/recipe/materials/diamond/craft/dust_from_tiny_dust.json -1f76efb517bf355ac84eb4339eca5da43d78e400 data/modern_industrialization/recipe/materials/diamond/craft/hammer.json -f6d5b1a37f9889b262d33df21583879a8202e995 data/modern_industrialization/recipe/materials/diamond/craft/large_plate.json -88bc45424a43fa7f280711dc986e4e7a57db1631 data/modern_industrialization/recipe/materials/diamond/craft/tiny_dust_from_dust.json -4c4427f5cf774f7b3b3b9433c12875077d4688a8 data/modern_industrialization/recipe/materials/diamond/macerator/crushed_dust.json -d8e1bd1ef5abfaf2dbc9f82fea23423213cc6eb8 data/modern_industrialization/recipe/materials/diamond/macerator/gem.json -81ecae63724edf028f16e1ab33f987eddfbebd31 data/modern_industrialization/recipe/materials/diamond/macerator/large_plate.json -69f9129d35cea5140ce7e6669a7ffb23e4e16408 data/modern_industrialization/recipe/materials/diamond/macerator/ore_to_crushed.json -67a5aac2630cdf99e458637ce9fadd656096bb8f data/modern_industrialization/recipe/materials/diamond/macerator/plate.json -a03c75e2ae933bfcb9b71826ef4b0d0dd9f1d36f data/modern_industrialization/recipe/materials/diamond/packer/block.json -b6a5cf1a4753569cf2a17ab3dc06ba5ab994bffa data/modern_industrialization/recipe/materials/diamond/packer/dust.json -884c52fdb285ec38301d40ee5d0763fc2e9b7223 data/modern_industrialization/recipe/materials/diamond/packer/large_plate.json -2e4cf6ce467db766027e7c6ddcac32ecbf4d62e3 data/modern_industrialization/recipe/materials/diamond/unpacker/gem.json -1cd1e162eb777461eb95ad53d2d235d61ecc9b5f data/modern_industrialization/recipe/materials/diamond/unpacker/tiny_dust.json -2ccf326123990d637364b54a220c419d90cbc956 data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json -6ffcba665e4b3d85cd9c2d14d83c1c2f66299642 data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json -2865e06ab4c12407889d8a62b2c5b6428c0fe516 data/modern_industrialization/recipe/materials/electrum/compressor/double_ingot.json -064e0aab73131bc785baa090652d4c3c0430774b data/modern_industrialization/recipe/materials/electrum/compressor/main.json -52b16b33224555e113d42d7501a33c0c1abd090e data/modern_industrialization/recipe/materials/electrum/craft/block_from_ingot.json -75b06dfd03693165d243b1021384cef650eea988 data/modern_industrialization/recipe/materials/electrum/craft/cable.json -ee10e77a9a980025a5db675ebebc0f306f2a1f64 data/modern_industrialization/recipe/materials/electrum/craft/dust_from_tiny_dust.json -d512c5d020d4ef0bde60c93402ed2fc2833df95a data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_block.json -0fa3f27ea22f821317961f00e5f2f63a47e2ba56 data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_nugget.json -55575a46d7cedbb2db88394152af977bc0cea2a9 data/modern_industrialization/recipe/materials/electrum/craft/nugget_from_ingot.json -7ead98249de3813f2415e0a7f52f4544c29a7e32 data/modern_industrialization/recipe/materials/electrum/craft/tiny_dust_from_dust.json -859d69b04122474b70c387b995d06fae61203810 data/modern_industrialization/recipe/materials/electrum/macerator/double_ingot.json -a68ba8a742b8b61a42bae5b13d19f4a84ce51ff6 data/modern_industrialization/recipe/materials/electrum/macerator/ingot.json -890af5b5a16f04ec06f91756b3aee6ad7a91e89e data/modern_industrialization/recipe/materials/electrum/macerator/nugget.json -c430946ed40b26230a3bd0f97776f247d8d520b4 data/modern_industrialization/recipe/materials/electrum/macerator/plate.json -984363e0f0992e5b9e5b3658606d33990c964f7b data/modern_industrialization/recipe/materials/electrum/macerator/wire.json -b092d3af3c2989a412d016689b42ee544fd9283b data/modern_industrialization/recipe/materials/electrum/packer/block.json -86e9112bc75ac4afc05591ff974a507ca5e4fda5 data/modern_industrialization/recipe/materials/electrum/packer/cable.json -f57ce9d222e8a2ebaa50a3ff83e028de298d0fe9 data/modern_industrialization/recipe/materials/electrum/packer/double_ingot.json -33bcf6f90834553cad29acdfd7d118cd7c3a0b2a data/modern_industrialization/recipe/materials/electrum/packer/dust.json -76490320aba1316346b6fa8ac5d3afa621b9501f data/modern_industrialization/recipe/materials/electrum/packer/ingot.json -6ca2f94513d7313164fc9ce233eee0dc60cd0822 data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_blasting.json -86ca8709c8bec8951f532a6900622f81107111e5 data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_smelting.json -650e407f539e20c9b143a9e923ee10a53e231e8e data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_blasting.json -fd1b365ffa62730d9073463fe3c9e4355b14abba data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_smelting.json -1ee3aab54d5a8909f57866513d389933d245341b data/modern_industrialization/recipe/materials/electrum/unpacker/ingot.json -bdf121001921aeb5b6e4e2561f85dc2dc5e85a78 data/modern_industrialization/recipe/materials/electrum/unpacker/nugget.json -2ca5429f038afa22997bbf0d029f0a38f15ab238 data/modern_industrialization/recipe/materials/electrum/unpacker/tiny_dust.json -31e22a5d5300022f2d755b212e444389e9eb2cd5 data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json -6e0f1b6241c7a08c7d01f5b0a3a4f6105b659f0f data/modern_industrialization/recipe/materials/electrum/wiremill/wire.json -d077649fcf9bdd959bdc6850bab520c6f440e8bc data/modern_industrialization/recipe/materials/emerald/compressor/main.json -57f08507bc27848b2e0939c94a8cf8464ec40c83 data/modern_industrialization/recipe/materials/emerald/craft/deepslate_to_ore.json -d6a3409916966863a50ff6ed4763a1ff7c90e646 data/modern_industrialization/recipe/materials/emerald/craft/dust_from_tiny_dust.json -d9317c0f673acf00675ce067a121749fcf4096e9 data/modern_industrialization/recipe/materials/emerald/craft/tiny_dust_from_dust.json -b94a6ae50aaf66ef7bfccd4e8e6e6183fb3d7a79 data/modern_industrialization/recipe/materials/emerald/macerator/crushed_dust.json -29833053687bae859472dc276a12ef2dc32f1776 data/modern_industrialization/recipe/materials/emerald/macerator/gem.json -4b065267e0ba2e7edb0f1d81f202fc06bf8cf4c2 data/modern_industrialization/recipe/materials/emerald/macerator/ore_to_crushed.json -88c0dd34529ae1c50f4835ada7d29d3655248ba0 data/modern_industrialization/recipe/materials/emerald/macerator/plate.json -58fd84b836de02ea45e5b968c80c45f64f5a248a data/modern_industrialization/recipe/materials/emerald/packer/block.json -355a3fc118e4209341bb6e4d8cf3e89d3f5b006f data/modern_industrialization/recipe/materials/emerald/packer/dust.json -a138a605be8852a9f2afd439da32edcaa4e64111 data/modern_industrialization/recipe/materials/emerald/unpacker/gem.json -1494100c67d1bffabbdd593eff696e063d7a2b08 data/modern_industrialization/recipe/materials/emerald/unpacker/tiny_dust.json -1e9419996e094c6fad86e45f4ac6499f09549e10 data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_blasting.json -70730050dc79fbe1c37c241ac229b7cff313e5a1 data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_smelting.json -f61be4cdde65f4784db8157d8e32390a3d094127 data/modern_industrialization/recipe/materials/gold/assembler/drill_head.json -71f70d5f2103c5ff511dc01620b5631d114e9630 data/modern_industrialization/recipe/materials/gold/assembler/gear.json -c2f6516c5f5a29e018d3e58a3986d1af20cd3b3d data/modern_industrialization/recipe/materials/gold/compressor/double_ingot.json -0eccf0bf97c2315950f4e4ea0a5f81abd7071459 data/modern_industrialization/recipe/materials/gold/compressor/main.json -c1df10960c0e3d4e1608b5f08b6d4c141d7bd084 data/modern_industrialization/recipe/materials/gold/compressor/plate.json -c59a337c81c70e895e61665fbf4a21d2282396c2 data/modern_industrialization/recipe/materials/gold/compressor/ring.json -a00e731e1b759111850e19e2461b219ada3e0bb5 data/modern_industrialization/recipe/materials/gold/craft/deepslate_to_ore.json -2b248af2b9f5eb2838723c932d62fb1eec010436 data/modern_industrialization/recipe/materials/gold/craft/drill_head.json -bca96b70e2314fc80d19cd34ef99ca78dec0f473 data/modern_industrialization/recipe/materials/gold/craft/dust_from_tiny_dust.json -cbf7e00a14888a3540171290ae4d655f20f8207e data/modern_industrialization/recipe/materials/gold/craft/gear.json -f76af7e9d19875c95c7fe0b43883c11d599c0074 data/modern_industrialization/recipe/materials/gold/craft/ring.json -17200bc877e527bb97ca654545b5dfc29bfb033d data/modern_industrialization/recipe/materials/gold/craft/tiny_dust_from_dust.json -da3f1b4aa06cf841699a062b319870a12ba9f09a data/modern_industrialization/recipe/materials/gold/cutting_machine/double_ingot.json -e7ea6955b72df100c7a2785bbe48cbada7399634 data/modern_industrialization/recipe/materials/gold/cutting_machine/main.json -f06f075d6261d5ff93b30b2d43ce86220f438ba8 data/modern_industrialization/recipe/materials/gold/cutting_machine/rod.json -b1ec335290ac852183b04e46e222fd503f47bf80 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt.json -e0294bcc97de7cc056ad2978cf0078d9b1014069 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt_with_tool.json -22d1804edcc086b8e67c50735d3e4320b7037222 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate.json -a51c35d7e7c6c974e40938c0f74cfce74b9b7627 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate_with_tool.json -6ab9a87cf7bcd316f02ae6b77660d26e25a5b028 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate.json -74a9509581883f11731fb91581fd3b287c2c1612 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate_with_tool.json -33af7888900bee31a6b67656017b4ea50d1eba8b data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring.json -f338c85c8dafef3533b03fa356610d8995293696 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring_with_tool.json -02a02d27a4654610fc755b77145130b1423b084c data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod.json -73413a5f638902341021a596a79eb2bdbf141195 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod_with_tool.json -b403e54185c2b97c39657e8712d7a4b817c262ac data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt.json -620a50471b9f1771b7bf084e321e3b52c0c998c3 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt_with_tool.json -c8e07fa7785fc802aac1096d789578dbe7bfd373 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate.json -63144e991cb34c2cf158864efc2ffe8ba16af259 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate_with_tool.json -e5ae9e68d50caf96e67bd7195b71d3fe5eb6dfdd data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_double_ingot.json -0ec1bd9174b528c1442a5a4784a08db06fdd64b4 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_dust.json -65b16d20e1ca280782d384263979b64cc0fbf183 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate.json -c8c88df7d5dc135109d8e6b5b06c860c19de4488 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate_with_tool.json -cfbcfdd5530223bba0ed0ca57ad8c0a717939591 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring.json -06491f6cc134691ef33071c5d41b8a2d376943e4 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring_with_tool.json -518c5fb19830f214e88e1af2294892ee03b15806 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod.json -58bfdf196029a61aba9c4f81dff73398fd0138ab data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod_with_tool.json -35834782d8db76f6b008fef781e58d5c96cafa70 data/modern_industrialization/recipe/materials/gold/forge_hammer/nugget_to_tiny_dust.json -170ebb2911d685f68c3a94d6180afa2ea44efadf data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_dust_with_tool.json -4739ee2a9342a8789b2df0d36e0b2a412f274a06 data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal.json -8be3601ed3c36d90f25e32e9ed345b653e3705d5 data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal_with_tool.json -8b6f15a76b3a9eed84b864dba7acdeb47e4e2118 data/modern_industrialization/recipe/materials/gold/forge_hammer/plate_to_curved_plate_with_tool.json -ea13244a37c67a29a8aff6d42903cce303d5afaf data/modern_industrialization/recipe/materials/gold/forge_hammer/raw_metal_to_dust_with_tool.json -273c0d38a6d006a6d2396c0fa10f3bbad40cb8a7 data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_bolt_with_tool.json -8e1ff9534aa84cbfcce941f24ce06d719da53ef2 data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_ring_with_tool.json -b09f84486a8fbef7bb3925b4dfd65f362a229872 data/modern_industrialization/recipe/materials/gold/macerator/bolt.json -8a7cbaeeb6ca2128da860f630e603c89397871e5 data/modern_industrialization/recipe/materials/gold/macerator/curved_plate.json -e0b230162d08ceb1ce47ba85a743ed849f5685c8 data/modern_industrialization/recipe/materials/gold/macerator/double_ingot.json -b54191867ef327f001c6fdf5e71fd5cbb898708d data/modern_industrialization/recipe/materials/gold/macerator/drill_head.json -257dde233ef51ce382af3f5abae9dc0865470e72 data/modern_industrialization/recipe/materials/gold/macerator/gear.json -e9ca2489118815ec0e531736b9548370723c7c7d data/modern_industrialization/recipe/materials/gold/macerator/ingot.json -3e0c93270fdc302dc43c519c267a9db5cf1bbc50 data/modern_industrialization/recipe/materials/gold/macerator/nugget.json -e2098de7a9a3f02341a33566cd4fef0fc5ed743f data/modern_industrialization/recipe/materials/gold/macerator/ore_to_raw.json -a0ef9af0bf5e95e85e892c6803327ec3907232fb data/modern_industrialization/recipe/materials/gold/macerator/plate.json -0c8b851f69a530ac4ff681032bc567ddfe8b465c data/modern_industrialization/recipe/materials/gold/macerator/raw_metal.json -33deaf914e3720cd0993393e5e20af2bb9313bed data/modern_industrialization/recipe/materials/gold/macerator/ring.json -990dca357c4cc51095d332274985bb29e6495d8a data/modern_industrialization/recipe/materials/gold/macerator/rod.json -bbfcdf3414e1a90a2a8d7b4bde6a4b4f99767cdf data/modern_industrialization/recipe/materials/gold/packer/block.json -bb7f55a5d62a9c8d4e690813e475a45786bc13f5 data/modern_industrialization/recipe/materials/gold/packer/double_ingot.json -c151e319e12273965fb6ee751ea571e773d48032 data/modern_industrialization/recipe/materials/gold/packer/dust.json -864b22826a9f79c6dac8595e31c266905a34548b data/modern_industrialization/recipe/materials/gold/packer/ingot.json -7008cca06ee454f1dd8945068f7dfef684cc5204 data/modern_industrialization/recipe/materials/gold/packer/raw_metal_block.json -02760e249f7fc5f22cf9acf21fb333a259b27c0e data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_blasting.json -2603aea93b5234fbda93aee1a5bfabf01d64048f data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_smelting.json -5ebc13f31fe2bb2d2e5da121315a1aaf22e9fd8e data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_blasting.json -9e0778f44419fa2b5fab8db10d949afcf09cf82e data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_smelting.json -826cba538f32ed599a9bb374436bea7e8b306f33 data/modern_industrialization/recipe/materials/gold/unpacker/ingot.json -7cf7cd644a50eade1fb78e4f6798aedb4be56d3c data/modern_industrialization/recipe/materials/gold/unpacker/nugget.json -4375d71e0432b36afccac28b4937844fa1e92c92 data/modern_industrialization/recipe/materials/gold/unpacker/raw_metal.json -53761f350e8a3c17baa8ab4bdf87f6b4bab9b187 data/modern_industrialization/recipe/materials/gold/unpacker/tiny_dust.json -0f79f54615a07b6e72993f6bcdf2e2d613bc4645 data/modern_industrialization/recipe/materials/he_mox/assembler/fuel_rod.json -478a62345304fbc7faa2b1420bfde209f3237171 data/modern_industrialization/recipe/materials/he_mox/blast_furnace/dust.json -b0f51cbfce32422405419ac2f57150685a03e422 data/modern_industrialization/recipe/materials/he_mox/blast_furnace/tiny_dust.json -2dfadabc7c92250ec66ef4932d4c7678c6dfaef2 data/modern_industrialization/recipe/materials/he_mox/craft/block_from_ingot.json -81787e60f2168f65321e24497b3c29f24905f6b9 data/modern_industrialization/recipe/materials/he_mox/craft/dust_from_tiny_dust.json -8ce827a12e8adb293e1ce122a7c55996933a04ac data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_block.json -e6a0c116d1319a96ae0229c2e73a5b42066dec1d data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_nugget.json -77cfdadd91829a582f3b8f49e5ff8cd27df07bd9 data/modern_industrialization/recipe/materials/he_mox/craft/nugget_from_ingot.json -fa0ed3a2b329814e1af32634fb3a6ef4fadeebdd data/modern_industrialization/recipe/materials/he_mox/craft/tiny_dust_from_dust.json -4876136be29b1501187dba8bd239b9a93060cb52 data/modern_industrialization/recipe/materials/he_mox/cutting_machine/main.json -1279da5c9f811da1864cab6891632a1230d4a9f4 data/modern_industrialization/recipe/materials/he_mox/macerator/ingot.json -c17c53fbb733f65c2c98ad709f0ac93944f3f9ea data/modern_industrialization/recipe/materials/he_mox/macerator/nugget.json -69f336aefac19896b63f285f2d1d13f932cc307c data/modern_industrialization/recipe/materials/he_mox/macerator/rod.json -e1da236536b17f7c30b79d7de8ec4c7de3912952 data/modern_industrialization/recipe/materials/he_mox/packer/block.json -9e34cded2ec7d9d04f17c9e185a21a870dae0033 data/modern_industrialization/recipe/materials/he_mox/packer/dust.json -46e284da08f35a007a32dcb98fd59ae72fd792ed data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_double.json -dd3c2087bb2b1212329924f962c5fe57b7c6746b data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_quad.json -323551b2a55c73e93667b87b4c90be0a4f19f2c3 data/modern_industrialization/recipe/materials/he_mox/packer/ingot.json -fea6823cf64f3f04856ba7b6e70b181ae85dacfc data/modern_industrialization/recipe/materials/he_mox/unpacker/ingot.json -df60a349c876314f1d23caf414bdea8a93f01555 data/modern_industrialization/recipe/materials/he_mox/unpacker/nugget.json -3dd58c3ba1693ef120cb486d5f4bb52f6172b764 data/modern_industrialization/recipe/materials/he_mox/unpacker/tiny_dust.json -1302044f551cc2fde9d11f957b4005313fd768bc data/modern_industrialization/recipe/materials/he_uranium/assembler/fuel_rod.json -bf556d41020141d41a5cacbf603b608702e9729d data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/dust.json -885e7fdb27ba22cbc339ebe210ea528a843e395e data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/tiny_dust.json -29a36a50a5ea15ed6b2d448ef0d09a9a21893681 data/modern_industrialization/recipe/materials/he_uranium/craft/block_from_ingot.json -4fff1ea5414717ce3f0ff15da072692c285f312f data/modern_industrialization/recipe/materials/he_uranium/craft/dust_from_tiny_dust.json -fa046dc37001a8d674699be2a2914e92e904102b data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_block.json -1a6b46f5d016afcfa7559d13433a7587325cf856 data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_nugget.json -9e0cff0ab1e853636ff84121408cfba948eb3a1d data/modern_industrialization/recipe/materials/he_uranium/craft/nugget_from_ingot.json -b97453b7af5429cf3f1696b129501301aa8da866 data/modern_industrialization/recipe/materials/he_uranium/craft/tiny_dust_from_dust.json -5a3daa437b4c4bfcbdba2be108b101975321ee12 data/modern_industrialization/recipe/materials/he_uranium/cutting_machine/main.json -af33d8b20e1796915f490719d667280b9726cd87 data/modern_industrialization/recipe/materials/he_uranium/macerator/ingot.json -906bcf723c07f4551204dec0b41f0761eff59ab2 data/modern_industrialization/recipe/materials/he_uranium/macerator/nugget.json -3b8daf3b5070c42239cae64dcb340f9f1abae9f2 data/modern_industrialization/recipe/materials/he_uranium/macerator/rod.json -4cd51afa3878d578304bf5d9a5fd5848f5cad8a8 data/modern_industrialization/recipe/materials/he_uranium/packer/block.json -ff3160d58aa585ba3d557640e42740c31b1c2043 data/modern_industrialization/recipe/materials/he_uranium/packer/dust.json -dc1f23ac72761f2fd5dff983cabf841f86984d89 data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_double.json -530400f16922edd5b793008f8c9fac611f5bdb72 data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_quad.json -de5ca3ce54f2d96c53f0aa5f7ee1c1ff2e51aa0b data/modern_industrialization/recipe/materials/he_uranium/packer/ingot.json -5b496d2ef72f87418599cad7353437841a754fc8 data/modern_industrialization/recipe/materials/he_uranium/unpacker/ingot.json -dbdb517a7184e590e075a4f611b38cf80ae29780 data/modern_industrialization/recipe/materials/he_uranium/unpacker/nugget.json -28f8e6e2415d4b47b33ecf878184d3d064e0ab61 data/modern_industrialization/recipe/materials/he_uranium/unpacker/tiny_dust.json -f1be725c1a4f17cc6004a8b273e7cefd0bd09a00 data/modern_industrialization/recipe/materials/invar/assembler/gear.json -e7247698ae9ff0479051ab0dbc7d806111424287 data/modern_industrialization/recipe/materials/invar/compressor/double_ingot.json -e32ac3e60266eb0671ad892748883c5bed6f3a13 data/modern_industrialization/recipe/materials/invar/compressor/main.json -fc0ebe06f99c27ac54d86cd51c841d9677e32dbb data/modern_industrialization/recipe/materials/invar/compressor/ring.json -8f8aa09014d2026d7d4382725bcefbbeb4b39813 data/modern_industrialization/recipe/materials/invar/craft/block_from_ingot.json -364d253678ca5971af8d61c246c51bd983dddc44 data/modern_industrialization/recipe/materials/invar/craft/dust_from_tiny_dust.json -bbde4a02eca84de4fa299a0dd8c27062f12b4e74 data/modern_industrialization/recipe/materials/invar/craft/gear.json -0d5a8d67195090022dee5139aa8dfb647d6075ab data/modern_industrialization/recipe/materials/invar/craft/ingot_from_block.json -4bd76237f38e57e9eeecaa430b585d3101dbffe2 data/modern_industrialization/recipe/materials/invar/craft/ingot_from_nugget.json -43ab8d8c266ddd272d27449f05317645c40f450e data/modern_industrialization/recipe/materials/invar/craft/large_plate.json -302a048ee4b488069e0b04d775e4b9a499d0bc07 data/modern_industrialization/recipe/materials/invar/craft/nugget_from_ingot.json -c3b20a9944540257ad130ec669100e3f8c20b857 data/modern_industrialization/recipe/materials/invar/craft/ring.json -30823d603400070b56c9ad15472d5892a004d6b6 data/modern_industrialization/recipe/materials/invar/craft/tiny_dust_from_dust.json -d56d18071307044ae4d079e2c09b131ef1ea27eb data/modern_industrialization/recipe/materials/invar/cutting_machine/double_ingot.json -ab462b1b4dcb9cda59798f2405c0a8427ddba9ee data/modern_industrialization/recipe/materials/invar/cutting_machine/main.json -cb7069c62511f11ca29f1311a3b13e60733480c0 data/modern_industrialization/recipe/materials/invar/cutting_machine/rod.json -e0565585cdcf7b8976d5bda669de29acea960fe9 data/modern_industrialization/recipe/materials/invar/macerator/bolt.json -0c26d0d06e7ef69b9cae2e1bded13d087fd35a96 data/modern_industrialization/recipe/materials/invar/macerator/double_ingot.json -dc79ad748d6eaf87f0e8e844aa7d2c6c30af6ca3 data/modern_industrialization/recipe/materials/invar/macerator/gear.json -094435fe85d9ca2a53de628df9f7ac160c43644e data/modern_industrialization/recipe/materials/invar/macerator/ingot.json -23f86f43a0cd32ea0e1d5ac40737fe3c0d1180fa data/modern_industrialization/recipe/materials/invar/macerator/large_plate.json -5a7949f6c19729b76253421db8cdc4d52313103e data/modern_industrialization/recipe/materials/invar/macerator/nugget.json -99a62a7bc0d972de0aff522914da7be7ea13f18e data/modern_industrialization/recipe/materials/invar/macerator/plate.json -fc57b8bfd44d3b022c72190402e7191dac33c587 data/modern_industrialization/recipe/materials/invar/macerator/ring.json -7705a80b988f1787897acf2b9880568c02139dc4 data/modern_industrialization/recipe/materials/invar/macerator/rod.json -eb340f54cbe955a104879b62600385f3ebd9ca51 data/modern_industrialization/recipe/materials/invar/packer/block.json -1852e897d5540d244c27c62d2061f95a82602056 data/modern_industrialization/recipe/materials/invar/packer/double_ingot.json -667bb1f22abc15be5de4eefeeac100658e1db131 data/modern_industrialization/recipe/materials/invar/packer/dust.json -0b56456f286ef9f2cced3a64bc0b92e0be68a72d data/modern_industrialization/recipe/materials/invar/packer/ingot.json -c2a38d19d7072d6dab64bf335cd31a99abbe6e1b data/modern_industrialization/recipe/materials/invar/packer/large_plate.json -db0817d9cf74ae807ca6c8b956111ccc4faf6ba6 data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_blasting.json -4fbd4dbee88cc566afeb949f7265904b303541bc data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_smelting.json -cc3be03d27ef8d4cb0c46384f78a1dc63191915c data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_blasting.json -bc3c802c822e0760477b3b2b9f843bc82f9a27e0 data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_smelting.json -a57019ebb0d71275f3a2ddf21ddef931199df813 data/modern_industrialization/recipe/materials/invar/unpacker/ingot.json -6c71d420d459704cf990950b9a2d5f3a672e21e7 data/modern_industrialization/recipe/materials/invar/unpacker/nugget.json -6023514d3c281466a3daf396279a0644177e85b6 data/modern_industrialization/recipe/materials/invar/unpacker/tiny_dust.json -685f8bfd504cb7ac5dd8872f6f0fe4a89c7ed3a9 data/modern_industrialization/recipe/materials/iridium/compressor/plate.json -98ef36a9ba16973857c1e4fbc030fe3ad6d41513 data/modern_industrialization/recipe/materials/iridium/craft/block_from_ingot.json -ab269d48184950dc4e3e9eecdf62dab36976c0a7 data/modern_industrialization/recipe/materials/iridium/craft/dust_from_tiny_dust.json -2d7541d2b0839139555e904988eee045a41d3c69 data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_block.json -08cb848d3f6cc73206b8e4a77bf09a42b16cd295 data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_nugget.json -e5ba9da715788e6e63f10ccc7e7213c09992225c data/modern_industrialization/recipe/materials/iridium/craft/nugget_from_ingot.json -ca20132a035bc256e8bb9bbde53de37a1379f7c2 data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_block_from_raw_metal.json -9b00572a543d266d057542b8e29215f68408b5dc data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_from_raw_metal_block.json -dd8d7bbbdda85d0130e06b89811598680d9ec952 data/modern_industrialization/recipe/materials/iridium/craft/tiny_dust_from_dust.json -439d5b81c8e0e8bbf1b99c350acac60682e17549 data/modern_industrialization/recipe/materials/iridium/macerator/curved_plate.json -ef7b4070d279247a63a116e7f36b8a1e18d4a702 data/modern_industrialization/recipe/materials/iridium/macerator/ingot.json -81d7a781c099528cc80fe4c92f0da91ecb7b068e data/modern_industrialization/recipe/materials/iridium/macerator/nugget.json -e8f9f72fe6b3e3385f7b1e43939750e45dfdce2c data/modern_industrialization/recipe/materials/iridium/macerator/ore_to_raw.json -6990455ba84c0a2011a28973cc729d614a02945c data/modern_industrialization/recipe/materials/iridium/macerator/plate.json -3bdc1ef2f952be917951e0877c6c561beed6fb01 data/modern_industrialization/recipe/materials/iridium/macerator/raw_metal.json -960a54ba73d59a7c7dec6097e4cc61b348c6108a data/modern_industrialization/recipe/materials/iridium/packer/block.json -a3e0b666e9d8f84a0848844a10bf9e29983507bf data/modern_industrialization/recipe/materials/iridium/packer/dust.json -0c9f596c610a090343551adf72aede50c8854e68 data/modern_industrialization/recipe/materials/iridium/packer/ingot.json -11dbd050d36d9250f5a224ee1112390f9ba0c1a6 data/modern_industrialization/recipe/materials/iridium/packer/raw_metal_block.json -32840e2e7f6655858e429b548efee8fd3edeb5b5 data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_blasting.json -2b5b2018b52942e840238f82e300b78bcc5c9f5d data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_smelting.json -a1fee9f57aa34c9da52f779f40f20c567c7cc5c8 data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_blasting.json -69956cccd16cf21035d725b52e7e66e73e8c2062 data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_smelting.json -078d5c7b86707386d8f5a46fbc57bb836b634de3 data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_blasting.json -06fdb8dae4fa307700e1376f3e1fe0c5a667d3d7 data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_smelting.json -2785b5eb6fca689211067f2f7fcaa895b006b8b4 data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_blasting.json -8c3a224ce29531a9d5696d8feadf8757544a6e28 data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_smelting.json -5458d82a0e1ed01590a2e916990d942367e93ef8 data/modern_industrialization/recipe/materials/iridium/unpacker/ingot.json -4287968e4340a6f907f17e1aebc091a234deb809 data/modern_industrialization/recipe/materials/iridium/unpacker/nugget.json -45c1a67b8b4fed1a5f970784fe4c4340e3fde8a7 data/modern_industrialization/recipe/materials/iridium/unpacker/raw_metal.json -e7aa4e33c3603dcb06469db0e62c4eb67818a686 data/modern_industrialization/recipe/materials/iridium/unpacker/tiny_dust.json -6f5c33bbdf62550da748fc319445dd29e6086ac5 data/modern_industrialization/recipe/materials/iron/assembler/barrel.json -a030a6c5f5777c69d5da5628ff899e00fb841018 data/modern_industrialization/recipe/materials/iron/assembler/gear.json -78651bff165d64cbe6abf450e651df48a1c75935 data/modern_industrialization/recipe/materials/iron/assembler/tank.json -09f5206314a7a56299213df96b241fd7d638607b data/modern_industrialization/recipe/materials/iron/compressor/double_ingot.json -a70dea45f6c41fcda291e699d513b6269e272a0b data/modern_industrialization/recipe/materials/iron/compressor/main.json -b67608c7f9ba4c98999568ed87c1233b815ed62e data/modern_industrialization/recipe/materials/iron/compressor/ring.json -0f5d50950d541ec232219b3dcc8cab1534ea6076 data/modern_industrialization/recipe/materials/iron/craft/barrel.json -cb3dca18dfb9d1b50e0b17593c04ea7badfb2f5d data/modern_industrialization/recipe/materials/iron/craft/deepslate_to_ore.json -88fb7eff6e89a1c198c7b7374a6d8b5a2209e4bc data/modern_industrialization/recipe/materials/iron/craft/dust_from_tiny_dust.json -51979268361bf54e72486fd7a03eeb768659fe9b data/modern_industrialization/recipe/materials/iron/craft/gear.json -3009754381f85016d724fcb81c7a5aee04d4ccaf data/modern_industrialization/recipe/materials/iron/craft/hammer.json -e6890cee0101f0d736a3c3dc844fedafa4f82f55 data/modern_industrialization/recipe/materials/iron/craft/large_plate.json -cb94a62afe405e9268450b02f08d668499347bc2 data/modern_industrialization/recipe/materials/iron/craft/ring.json -8eac684bc0d4f749ff1df8e2f0f8d2bba33d4134 data/modern_industrialization/recipe/materials/iron/craft/tank.json -4c75b896638295a24bc20afb90efc9a930c6379a data/modern_industrialization/recipe/materials/iron/craft/tiny_dust_from_dust.json -61dd42c147a174a179773a8754d8dce68522b44e data/modern_industrialization/recipe/materials/iron/cutting_machine/double_ingot.json -9fef4921e9582ad65c86e92938dfe9dfdc157e7f data/modern_industrialization/recipe/materials/iron/cutting_machine/main.json -896ac23f063fc12ebc425e20ec91025e34e55c93 data/modern_industrialization/recipe/materials/iron/cutting_machine/rod.json -773638735e037f5bd67161845be41f8967caf9d0 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt.json -87646255feecbe93b29964fb56385add0d6d2a27 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt_with_tool.json -efc359acb78a5a15bbcb6ddddb8d7aa0b2daf56e data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate.json -aba8d3d54b50bd2e7f5532e344e4e4eea7e82c88 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate_with_tool.json -98ea5d748a7dae07372efaac4e61bad409097332 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring.json -eb44dcf0e08f9a0449d0fcecffacd7956e45b8c5 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring_with_tool.json -52ce8445888805c8adc9a01def91b5d37c9bc468 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod.json -17eeb6f2ac79bad42692428a840ab6f27e9756f3 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod_with_tool.json -c72b1104e811822867f49070187bf634f7c9c916 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt.json -c82ce670d986da2d41ab61d0b6f7b4109db3fabf data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt_with_tool.json -c26b551c30b3d89632f42fcb07b36173c1a309ad data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_double_ingot.json -92e099c8837b441689e22b8fe38a2281fce7e637 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_dust.json -f06b2f686cf9db0e0892aaff0d6f62809a798223 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate.json -d001562a9b249f578af3296b5113e90891512431 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate_with_tool.json -f0823b6bea60585d435d208b8d73ea973a1df712 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring.json -464938c3fa52fb57f7641f5d53f055103c7f4000 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring_with_tool.json -baa39c3bbb34857c09274de6bd96bc1cef91cb77 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod.json -99e0c0828694aac07a4ae5f11cf144de2f949f63 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod_with_tool.json -bc7b15cc5ddde7287478a3dda10434528bab3060 data/modern_industrialization/recipe/materials/iron/forge_hammer/nugget_to_tiny_dust.json -2869d90601582fbc32f785d8ba525549fab42c50 data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_dust_with_tool.json -ba20c88e9151f0b6b95a781445c513b027ba1911 data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal.json -e61fccc87941421c16aebada6349b4e810614270 data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal_with_tool.json -cdc1f8484368bbc7b41e475ea687ce07432df954 data/modern_industrialization/recipe/materials/iron/forge_hammer/raw_metal_to_dust_with_tool.json -de667df5c224a993c06b41022d218a52b634fe82 data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_bolt_with_tool.json -35128cba543d0cc451b54cf5f9bb42f5219ca3ba data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_ring_with_tool.json -4eeeb96a21073231fd722134594147966acedc6f data/modern_industrialization/recipe/materials/iron/macerator/bolt.json -8580701689b40d0d52ddb064ee65e3139f866b59 data/modern_industrialization/recipe/materials/iron/macerator/double_ingot.json -a59b5da93909188273e032e331a79369aab2ae4d data/modern_industrialization/recipe/materials/iron/macerator/gear.json -37a352568edab02aa6c2f7970de7752a520d10f2 data/modern_industrialization/recipe/materials/iron/macerator/ingot.json -00092dc99e4207be23a143188c4a3fb06b547c28 data/modern_industrialization/recipe/materials/iron/macerator/large_plate.json -a95c7c4b0348fe31de18e018055cafacaa3a90f6 data/modern_industrialization/recipe/materials/iron/macerator/nugget.json -b5e6062a1cc3c17faad10358ddacf3673589df96 data/modern_industrialization/recipe/materials/iron/macerator/ore_to_raw.json -165fca1b4def758913244b10a6d5e05ffbd109d7 data/modern_industrialization/recipe/materials/iron/macerator/plate.json -7af6a42230fe9b2730f3fbae72c986cf4f4cc4fd data/modern_industrialization/recipe/materials/iron/macerator/raw_metal.json -7bd1cc7a41acbc81384e53fe34904b2d05971229 data/modern_industrialization/recipe/materials/iron/macerator/ring.json -99d49f4428fafa030e8bd324fd6301529100b270 data/modern_industrialization/recipe/materials/iron/macerator/rod.json -dbbca956ee709bf2a16e0632934a4156b3614a76 data/modern_industrialization/recipe/materials/iron/packer/block.json -d221d6a6fd0dc0371b0f4fd27259676bdfc117af data/modern_industrialization/recipe/materials/iron/packer/double_ingot.json -aa37291be823728d0d039e768dbefe1227104551 data/modern_industrialization/recipe/materials/iron/packer/dust.json -0f8ab38d7b68ad9d1ea67c829c89fd4f769e7e02 data/modern_industrialization/recipe/materials/iron/packer/ingot.json -3a3b8a399aa79a8b2eb321231f13de0f978226d5 data/modern_industrialization/recipe/materials/iron/packer/large_plate.json -4ee41831a1434e72a5719961cb81dddf37a4ec4b data/modern_industrialization/recipe/materials/iron/packer/raw_metal_block.json -d18a9d9abcf6e4227eb2026e094df2abf3cbf139 data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_blasting.json -a4d9453a9b46816c6fc28f4a3e9b8f6cee74fa26 data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_smelting.json -d5dad35e4f5ba0339800f0b216fc42f85ac6df31 data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_blasting.json -33854e439b99cb829391b74e555fdb626d36c277 data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_smelting.json -f0bf885602316629d1838d30bab38c2e14268e30 data/modern_industrialization/recipe/materials/iron/unpacker/ingot.json -b114626b1a8e584178831bc750bd14f7993a9fc5 data/modern_industrialization/recipe/materials/iron/unpacker/nugget.json -035ddffaffda24cd21a13fc9a5a16436274f4ca6 data/modern_industrialization/recipe/materials/iron/unpacker/raw_metal.json -1a37bc2e6bf9e0f3d4271495270b995f7de8c185 data/modern_industrialization/recipe/materials/iron/unpacker/tiny_dust.json -2e79007a4ea5ac06605e017f6681f1f59d1f6386 data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json -f075fb505c412d79b693be4bdfe7a0112b27d7a8 data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json -a26e34c9ceb122883cabb7140bb53474fd867325 data/modern_industrialization/recipe/materials/kanthal/assembler/coil.json -2d543164421de8de45920ebfe737358911b29380 data/modern_industrialization/recipe/materials/kanthal/blast_furnace/dust.json -518e715dbce4799e503af1a70361d85fdcc0082c data/modern_industrialization/recipe/materials/kanthal/compressor/double_ingot.json -2839f2205ba93851b00658fbf5bfdde94b04cd47 data/modern_industrialization/recipe/materials/kanthal/compressor/main.json -f143f4c1fa7a9c15d3b3c5afb4b3ec18484d6cd1 data/modern_industrialization/recipe/materials/kanthal/craft/block_from_ingot.json -f65e3b28d7774bcb77f1cadc5497d136023d6802 data/modern_industrialization/recipe/materials/kanthal/craft/cable.json -63d58f37e22bcc08dd6cd83eca201cb1ed440c2e data/modern_industrialization/recipe/materials/kanthal/craft/coil.json -71fc258b25b0648d270729539021f2e3b6d74290 data/modern_industrialization/recipe/materials/kanthal/craft/dust_from_tiny_dust.json -a829c2439e0f652c2dcc84e2b5b1fb3591a042ae data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_block.json -82a42bce8e21b2badff66c81bc0352f61b0bd15e data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_nugget.json -fd7ff3f39792677ca86bfc7a958457ed5622847e data/modern_industrialization/recipe/materials/kanthal/craft/nugget_from_ingot.json -bc68f1b069214a1a11fc74ab19c9a71f94a252ac data/modern_industrialization/recipe/materials/kanthal/craft/tiny_dust_from_dust.json -58079227a91022cdc420830e358f417071a597f3 data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json -c264f49edd55d479585902bf863fa5921c5bbb2f data/modern_industrialization/recipe/materials/kanthal/macerator/double_ingot.json -227ea21fd2b69c60ba5081eedcbad96a8e37e916 data/modern_industrialization/recipe/materials/kanthal/macerator/ingot.json -e63c89d733a4e84234fede5d6b6ebf2a4a81152e data/modern_industrialization/recipe/materials/kanthal/macerator/nugget.json -481fbd42b7e8dc2589128a5ac0fa385d4b30327d data/modern_industrialization/recipe/materials/kanthal/macerator/plate.json -39ad8ebb894fb93c8141e68ef688d85bb13a89dc data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json -6023f94c88baf5c30cc4a12d045d45df47a6d46d data/modern_industrialization/recipe/materials/kanthal/packer/block.json -1ba969f3ac4753c8b13638defc7f7acfcd0089e3 data/modern_industrialization/recipe/materials/kanthal/packer/cable.json -018ffdb59c217edaeb9d97ae59356a56fd871099 data/modern_industrialization/recipe/materials/kanthal/packer/double_ingot.json -a153f61a2bfba44c59bff36c1b5a27b25f08d398 data/modern_industrialization/recipe/materials/kanthal/packer/dust.json -02210fd782bcdc10cadcdb20bd797ed50e5268b4 data/modern_industrialization/recipe/materials/kanthal/packer/ingot.json -61017fd96f59c30a9500d59cca129cc00d863d1f data/modern_industrialization/recipe/materials/kanthal/unpacker/coil.json -ad4e041c19242ecf10e7dc4b60f477fb2fe584c1 data/modern_industrialization/recipe/materials/kanthal/unpacker/ingot.json -c8261f6a16bb7e4e4642b1956ad47dcd6c182928 data/modern_industrialization/recipe/materials/kanthal/unpacker/nugget.json -fe696083a7979fbeba92254dae65704e0edb3270 data/modern_industrialization/recipe/materials/kanthal/unpacker/tiny_dust.json -103c45fbe5ef8884cef328e1e35180fe0c25ef90 data/modern_industrialization/recipe/materials/kanthal/vacuum_freezer/hot_ingot.json -db1b655b485152cf2f0fde09e2a50217efdb7255 data/modern_industrialization/recipe/materials/kanthal/wiremill/wire.json -aaaee41840f55f4449d3726b6d215c2579da2622 data/modern_industrialization/recipe/materials/lapis/compressor/lapis.json -ed52ac1cdec1d42d00686eabd5ebba9a810dea03 data/modern_industrialization/recipe/materials/lapis/craft/deepslate_to_ore.json -ae0750aec4d21dd64b906ecb8e0cbd5339ab5377 data/modern_industrialization/recipe/materials/lapis/craft/dust_from_tiny_dust.json -d252ad17353b57f7d85ad2bbfa80e6847c4dbce4 data/modern_industrialization/recipe/materials/lapis/craft/tiny_dust_from_dust.json -c01eaaaea292f745f4614dc1461e0680b17eacae data/modern_industrialization/recipe/materials/lapis/macerator/crushed_dust.json -66bbf6d0998254893ded98163d792be295bbd6c2 data/modern_industrialization/recipe/materials/lapis/macerator/gem.json -5721818c3536eb67388160e44d9a729ed3e5be1d data/modern_industrialization/recipe/materials/lapis/packer/block.json -b605d0111af143adc3b79f72b7b8fc6e8844fec1 data/modern_industrialization/recipe/materials/lapis/packer/dust.json -2cfdb1226cadd7446a7a78ca2c45fe24687a52a9 data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json -b99f30a83d9d9baf9c673ddeeb6265522fa4d965 data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json -43c7377599df668da5876abe0f49089460f78dbf data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json -1a4bbb2e97b9cce2394e1d33d2333fa9c9bbc330 data/modern_industrialization/recipe/materials/lead/compressor/main.json -b877d99645c9ca69e4aaece29e3493dae41899ad data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json -718b9bf66decade4fd3d4c4cf0abd6bfb77b1f68 data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json -1f9b150870e35269620fe7a2a22365e26c9e3066 data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json -c7aab170fb33bdb7d46cb3700d0c2be4b50fc8a3 data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json -da71498c412256a1fa39bd7f27680afb471e746b data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json -8c4427da15cfb023bd3429022d64efdca25dddda data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json -24e6b3cae5ae6e7da202c26d0613565fce058326 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json -1945001e03fe97bf90bba394fcb14d6504470b93 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json -eff66069854abd6fee946ac09b984954d5152e47 data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json -0d75f304df91b925e9bfbd0231acd43b4331d861 data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json -86582629f1de49cb3b43e363956099e0d1915ff8 data/modern_industrialization/recipe/materials/lead/macerator/ingot.json -ecf2b3a0f78350b9bd08c688f7af790e8280973e data/modern_industrialization/recipe/materials/lead/macerator/nugget.json -45e4369364924d842c205697d75082a29ee93966 data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json -86e15120d8312db1db774df3f77e05416d73f0a1 data/modern_industrialization/recipe/materials/lead/macerator/plate.json -cc12b93ff29f48db02924544ea567920a7ba767f data/modern_industrialization/recipe/materials/lead/packer/block.json -de911d4f5de7017a8998330aae7090bf07cce819 data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json -68749b7530bd52c1ff00887e8c3566020395ed69 data/modern_industrialization/recipe/materials/lead/packer/dust.json -c1c8d1c6fc90ad37b4ac5e09b87b9fc05c33879b data/modern_industrialization/recipe/materials/lead/packer/ingot.json -97a4c61e7e173d2584900110c3e63b04ad724530 data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json -457122d5b59aac6bb39eb7af5185c27b173e8a9a data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json -4c7d60b8606b568a3b29bd37d3c19a9903c5280d data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json -9237a79c06a40796af3fb5b18bbb1637c772e8d0 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json -2d4cd53e4352908a6e6afdcb1d3f29b6e21982a6 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json -060e6d1f8929f84ba2e8d9685551d828884671f9 data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json -665045466a93cd738ac4a6fc4b5efb4b89acde11 data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json -a63cc0017f838723df4e23fe2a76364473ae2d86 data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json -dddc08160e75a7d3bc97a3dd74750334e1bd28b0 data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json -c478375698e2489ce9aae4ba8abcea52cf1ec3bf data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json -e8c3698be9285630db8fabd28af713bc2621d839 data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json -dfe6d9f29ceca63210599b7a64c1c64e116d33fd data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json -63774a6846d6ee946caa07cd2711acd9bb775c9a data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json -aebb86e1b9a914da7a6fd2d6d5b2b3f1457ef392 data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json -57824124449950db1d739f6afcdc80bd63ac3f90 data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json -54a24d0073fca5090fbd7e0c94622597795769c0 data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json -fc036654d5e504066a5b8eb722925b7859808444 data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json -8dccf56113495121c6a2b681905bdd776fa3feed data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json -7282681500b9250cbbc7652591d5a37befb577ae data/modern_industrialization/recipe/materials/le_mox/craft/block_from_ingot.json -b7d69a63f0a684a1e244d2c1f2cb312c6275b168 data/modern_industrialization/recipe/materials/le_mox/craft/dust_from_tiny_dust.json -2631de65b0375aacb3ab619e2540a16463d491d1 data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_block.json -53a43a8bf61a1247130a4a720c52eab39fdf90e8 data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_nugget.json -6fa9cb182a7cbd864cf019ae7558119a3fe04d8d data/modern_industrialization/recipe/materials/le_mox/craft/nugget_from_ingot.json -7e8d6cdefbafacb1ab90c5862909cf4249534da4 data/modern_industrialization/recipe/materials/le_mox/craft/tiny_dust_from_dust.json -f0b2db48cb53dfe2edc9e61bf280005c8f7a7131 data/modern_industrialization/recipe/materials/le_mox/cutting_machine/main.json -6ded87b4413ad89635f3af997e4a83ffd40ddee8 data/modern_industrialization/recipe/materials/le_mox/macerator/ingot.json -87cb577f848a7dd69d19fb5ce5b210c74af0c083 data/modern_industrialization/recipe/materials/le_mox/macerator/nugget.json -df3c8c936486fd693e19ea07fc18f5d8c0c48975 data/modern_industrialization/recipe/materials/le_mox/macerator/rod.json -21546d6c151174dbb1ad2fe2ea4c2291f180c79e data/modern_industrialization/recipe/materials/le_mox/packer/block.json -72c85d01cfbf1b51f800514349b46a45de770655 data/modern_industrialization/recipe/materials/le_mox/packer/dust.json -e81cf538cd85e70292c1506a79945b3c14b278bf data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_double.json -d7a0be8ef47a27b906e817bb2abd6cfb58463ac8 data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_quad.json -444851a9df3a856be95de44a488d9b74062d0d7a data/modern_industrialization/recipe/materials/le_mox/packer/ingot.json -2ebe4db06aa5279c371658c8761d81ca5f076c5b data/modern_industrialization/recipe/materials/le_mox/unpacker/ingot.json -cc9f1ae9ee410a126dfa0c0eb454476f65b030a9 data/modern_industrialization/recipe/materials/le_mox/unpacker/nugget.json -b267c821a5b13bf483c550d5d17d6292379f5033 data/modern_industrialization/recipe/materials/le_mox/unpacker/tiny_dust.json -48815ef9ff973f0e1e7c33571942b05cfcbae9ce data/modern_industrialization/recipe/materials/le_uranium/assembler/fuel_rod.json -1e1ac113344e4a5c0ac356272eb147faa0a76b66 data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/dust.json -c2351e3e860da89e95c0ad801b7459ae02439d8c data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/tiny_dust.json -138a60e4747dccdbe469eea31825d447af186a63 data/modern_industrialization/recipe/materials/le_uranium/craft/block_from_ingot.json -4cd3ac9738ca15cdec65f46ffe10218433226684 data/modern_industrialization/recipe/materials/le_uranium/craft/dust_from_tiny_dust.json -82988df951a5259eb6297c62ed8a66364af87bf0 data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_block.json -4bc572c3b19c3973d310122a0c6fb96e3d2408c5 data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_nugget.json -43e92c51bf6517e51d20d0d80c6d219729655a6f data/modern_industrialization/recipe/materials/le_uranium/craft/nugget_from_ingot.json -6f1aaa4c8e25eba6ddd7ee2c61d44701689d8bb1 data/modern_industrialization/recipe/materials/le_uranium/craft/tiny_dust_from_dust.json -cfe75776e6c1a936c66a360785a931f53cb51eab data/modern_industrialization/recipe/materials/le_uranium/cutting_machine/main.json -68273c853ec7c6f500a0047a0d250808ff5fd56f data/modern_industrialization/recipe/materials/le_uranium/macerator/ingot.json -f9a088c24b767d2dc9ed8ba50911cdaadd947b84 data/modern_industrialization/recipe/materials/le_uranium/macerator/nugget.json -135dfc93df7168427e27fdbaefd524722a6f9cac data/modern_industrialization/recipe/materials/le_uranium/macerator/rod.json -7ba358ffc9c626e1e3b474230deb297e904962c0 data/modern_industrialization/recipe/materials/le_uranium/packer/block.json -4ea76384919edfa0ef0972d11127b343978c1948 data/modern_industrialization/recipe/materials/le_uranium/packer/dust.json -468d933461f4667d81630efda80d3e2721d6bf9e data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_double.json -77c00ffd2053a550ac6a5c4fad158062a47afbee data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_quad.json -7638384361a88d678cc31853f2ca2e201fa1f2f1 data/modern_industrialization/recipe/materials/le_uranium/packer/ingot.json -45126bbb351179774bb773231ad7abebcdab050c data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json -6b9cff3b427d7ca78cb0b185958869537952884f data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json -d807e1dac58695735b5f9cf78752cd7bf3d1933b data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json -8c4d56ea084cb7beb6ec5cbab27c87238ce74547 data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json -e65c190aa3e06fcf7e81767018c0c57daa413251 data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json -d1e4038a88e04eef99f35de2fccc84c5e3fd6794 data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json -7384bf33537c670772af1ad59132070805a4129e data/modern_industrialization/recipe/materials/lignite_coal/craft/dust_from_tiny_dust.json -d6e5f03fc18adbf39688921fc434370e47f498a6 data/modern_industrialization/recipe/materials/lignite_coal/craft/gem_from_block.json -87af215f35da9931ceab2186f9e3222aba3c85e9 data/modern_industrialization/recipe/materials/lignite_coal/craft/tiny_dust_from_dust.json -7a76b5db2470be93ab1b021460e9ba2472bb51a3 data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/crushed_dust_to_dust_with_tool.json -104c371c79e0f8fcfd67867e0606c7f7fad1548e data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust.json -fce17bbad76f7f5d85dc5e02413c3aab1c6ca6d8 data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust_with_tool.json -5f56170687528a5af09b85cde33259d42720f366 data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_dust_with_tool.json -b96b8244fff9985c9501ecf8e4be612edc130134 data/modern_industrialization/recipe/materials/lignite_coal/macerator/gem.json -392bc0d7c20fe0404acdd282b91c504126457d0b data/modern_industrialization/recipe/materials/lignite_coal/macerator/ore_to_crushed.json -bf4ff1810d19c27fbd32301ee462f22cf40f9e89 data/modern_industrialization/recipe/materials/lignite_coal/packer/block.json -f6e8a048f9f1f89aba0c72248b1f08ebda59870e data/modern_industrialization/recipe/materials/lignite_coal/packer/dust.json -eac0737a766bcb7f79a4321ffbc0ea8a6a7d2673 data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_blasting.json -be3a81510f509132293a675a32411813032caab3 data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_smelting.json -20b9cc2a78d5b60da14051e3b004f3caa758e0d5 data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_blasting.json -6c701bc6af517ad8b843063d78e323c333452584 data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_smelting.json -75460fbe78d36666abc58e290be21922cae090b6 data/modern_industrialization/recipe/materials/lignite_coal/unpacker/gem.json -c7ffe9139b247036e51ae186553f0b7422b94cca data/modern_industrialization/recipe/materials/lignite_coal/unpacker/tiny_dust.json -6446ef45b779a55eb2e3c6c57f7ec7dd45c5f907 data/modern_industrialization/recipe/materials/manganese/craft/dust_from_tiny_dust.json -e760857957ee741c15cf1f25c6e2f308f2b08764 data/modern_industrialization/recipe/materials/manganese/craft/tiny_dust_from_dust.json -13334646fb4d3aa34585aae46c6946cd85df12af data/modern_industrialization/recipe/materials/manganese/packer/dust.json -62fb7343307411321183c08fc226ad535a229ec2 data/modern_industrialization/recipe/materials/manganese/unpacker/tiny_dust.json -3ee37ed2ded7b72ca81af073f0f9a93d76dec7b9 data/modern_industrialization/recipe/materials/monazite/craft/block_from_dust.json -a3337fc7ccda776858abb44bd09ec5ebeb82f9b8 data/modern_industrialization/recipe/materials/monazite/craft/deepslate_to_ore.json -1248e456745e9628d43fb472bb781c79b102eefc data/modern_industrialization/recipe/materials/monazite/craft/dust_from_block.json -262bd3f11781962c57132d389efbc8ed23e9738c data/modern_industrialization/recipe/materials/monazite/craft/dust_from_tiny_dust.json -592efb17726e0d20d8142c152c7d467f97fedbf0 data/modern_industrialization/recipe/materials/monazite/craft/tiny_dust_from_dust.json -fff93f6d19ed57c39eb65676c14121a3e78808a0 data/modern_industrialization/recipe/materials/monazite/macerator/crushed_dust.json -0643fe53e1f89614252dbe75dbc25c79df6e1a63 data/modern_industrialization/recipe/materials/monazite/macerator/ore_to_crushed.json -178bd16a3c812c6352a033e33aae3a6a2afd6579 data/modern_industrialization/recipe/materials/monazite/packer/block.json -c36ebdeb3140bae2d0d839972fa9936674e2b370 data/modern_industrialization/recipe/materials/monazite/packer/dust.json -ec73bd680487be0003543c55ec61e123e161abec data/modern_industrialization/recipe/materials/monazite/unpacker/dust.json -1efb284fa9bd944592d0e98bbd421b9200af9838 data/modern_industrialization/recipe/materials/monazite/unpacker/tiny_dust.json -e0316b94caecbb04b442af97e77c191da172816f data/modern_industrialization/recipe/materials/neodymium/craft/block_from_dust.json -e7b36dde04e360346e9673dc8c2606295328243b data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_block.json -b3ae89f47d8bdff5c9a6418ab222650afebcfcf0 data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_tiny_dust.json -1d1c157b4b20df20042a85a932bbd9148f5b58c1 data/modern_industrialization/recipe/materials/neodymium/craft/tiny_dust_from_dust.json -71cbf267c4e41a7385f37448350492e10fd8d648 data/modern_industrialization/recipe/materials/neodymium/packer/block.json -6551ca0c75f6a6795a2eba2554089c4bb3fad888 data/modern_industrialization/recipe/materials/neodymium/packer/dust.json -2d56c47f0f4f1885550f14ec3ad7cf0f7c2a4c23 data/modern_industrialization/recipe/materials/neodymium/unpacker/dust.json -0cb69995ca312f5c11e21b2b76c80cb6326990a9 data/modern_industrialization/recipe/materials/neodymium/unpacker/tiny_dust.json -c0f64f34453d32343cafc55a9db11ffca5fd905f data/modern_industrialization/recipe/materials/nickel/compressor/double_ingot.json -ff0010ba2048ccbbcd878b3bb3879df29d73f828 data/modern_industrialization/recipe/materials/nickel/compressor/main.json -7493f2e8387bdece72e20c73ec8cb923ced19abb data/modern_industrialization/recipe/materials/nickel/craft/block_from_ingot.json -12b60609b2a3b1c6fc8a138187913828479bb3d3 data/modern_industrialization/recipe/materials/nickel/craft/deepslate_to_ore.json -85d13d22a9d4f4d178cb42c03268190164e1a0c0 data/modern_industrialization/recipe/materials/nickel/craft/dust_from_tiny_dust.json -8ffb137f51e757fad03663c5fb87d464d68272fa data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_block.json -f1f6614b6cd5b9e5ec3bd9e157ba9ef7a252bebe data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_nugget.json -55d763aeab0716ee00176538ff4a799f982f0c55 data/modern_industrialization/recipe/materials/nickel/craft/nugget_from_ingot.json -93601b8346c5c6e755554ebe0080999bbf6a13f9 data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_block_from_raw_metal.json -0ff330f97a83f0ca22df6107b672fdecd13daaa8 data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_from_raw_metal_block.json -e49f144afab23cb599ca427e64101b982543a78c data/modern_industrialization/recipe/materials/nickel/craft/tiny_dust_from_dust.json -fe45a58739b7c5c025cc784b9148a092ca5ae339 data/modern_industrialization/recipe/materials/nickel/macerator/double_ingot.json -f2dd1e52f10818935eb6da38402f16aebed736da data/modern_industrialization/recipe/materials/nickel/macerator/ingot.json -622d85301d9f31c5da644da23e90b8f87fc1a199 data/modern_industrialization/recipe/materials/nickel/macerator/nugget.json -30ccee320bcfeeee550a129e601008e32ad4b680 data/modern_industrialization/recipe/materials/nickel/macerator/ore_to_raw.json -6406352afa41c11dd11b05c41496416fe06e1512 data/modern_industrialization/recipe/materials/nickel/macerator/plate.json -c1868ae3b90f228a8e90139bcc3624e73e2c799b data/modern_industrialization/recipe/materials/nickel/macerator/raw_metal.json -55a8685900f0377e7b9691237bb542de4556d760 data/modern_industrialization/recipe/materials/nickel/packer/block.json -cfce7cd98212b967e0dea0e8d712797392a1967e data/modern_industrialization/recipe/materials/nickel/packer/double_ingot.json -9d396fbb60dc404308f19a50205e128e33d3a90e data/modern_industrialization/recipe/materials/nickel/packer/dust.json -d021da2320295fcf933459e63e86f80d5c476551 data/modern_industrialization/recipe/materials/nickel/packer/ingot.json -13d4278ddc37bbc3e40c5cf5a9bb04402e54a512 data/modern_industrialization/recipe/materials/nickel/packer/raw_metal_block.json -a49e1480fcf072cd5874abd2828149da62d13dc6 data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_blasting.json -ef47710130d444b9041278a3fcf6150c2166a2b7 data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_smelting.json -a28b5edd59b4d7e574af23186ae7791f8a4ac5dd data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_blasting.json -52565a9c74068335cfc08b4f830a6db719484f08 data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_smelting.json -543c86cec37723b21eb2cc8072ff78469c26d2c3 data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_blasting.json -f0961725e2cdd48283cd4bcdb3cf5a8b74b552f7 data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_smelting.json -90faf21073236d5565e35ebd941a682a8b75c767 data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_blasting.json -ee1bc2cf694dbadfde14e0950e61456dcd3cbbad data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_smelting.json -c369da59eeef4c8baa75c87b7214d535bb635cff data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_blasting.json -9468c0d09b0be95e65e3633852aabe1127a817d2 data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_smelting.json -34b6ff43eb0eafe76b45194be550e4356a598122 data/modern_industrialization/recipe/materials/nickel/unpacker/ingot.json -c1de124e3f315b80101b9ed7e34a6e8ba6929883 data/modern_industrialization/recipe/materials/nickel/unpacker/nugget.json -82244391aae49cdf9aaff8273034d316d84c0ba4 data/modern_industrialization/recipe/materials/nickel/unpacker/raw_metal.json -e6ec7fcb5e48871cf35de49ebdb922074a0364f1 data/modern_industrialization/recipe/materials/nickel/unpacker/tiny_dust.json -65db00e36bd55b66b506290a95f779bd73cec7bf data/modern_industrialization/recipe/materials/nuclear_alloy/craft/large_plate.json -aae48ce87ed1f03ee28b05a0672b8ddd3d2d3bea data/modern_industrialization/recipe/materials/nuclear_alloy/packer/large_plate.json -8ce4719244069761af73b046cb759deca71199c7 data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json -22daad445744fd1e7780732809ad584cda1e2a12 data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json -1ac77875b5ab5e6387515d9d3b7604e994e97b75 data/modern_industrialization/recipe/materials/platinum/blast_furnace/dust.json -efa800b02584edb7e8204104edcba13a2b941197 data/modern_industrialization/recipe/materials/platinum/compressor/double_ingot.json -73a5449534af1a0f9a28a34706a4883cd74ff587 data/modern_industrialization/recipe/materials/platinum/compressor/main.json -80174f0d098e45b859c9570bc6bc752f4fa5cbff data/modern_industrialization/recipe/materials/platinum/craft/block_from_ingot.json -dacee752fcc3561ad880621b1a9479b9811a2b1e data/modern_industrialization/recipe/materials/platinum/craft/cable.json -da46fe001643d593b2862fd1cc4d184dd540cee6 data/modern_industrialization/recipe/materials/platinum/craft/dust_from_tiny_dust.json -4c67d1d2647d2bc0798222dd616c125f053caac6 data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_block.json -49497fdd995edc40f90c02e92a0d6ab7b83a9503 data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_nugget.json -c802f2711eed2cba9de4b54cb3b797f2519d4db9 data/modern_industrialization/recipe/materials/platinum/craft/nugget_from_ingot.json -23b051b8fd222ccc8c46e1c907fa156fb07eadcc data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_block_from_raw_metal.json -45173e8751b9d295f50a7d8eefc5983cbcd32f46 data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_from_raw_metal_block.json -0d52caea52816e69d6910cc31d082439d95265b4 data/modern_industrialization/recipe/materials/platinum/craft/tiny_dust_from_dust.json -7da339a3a9e762dd93221340471584930217f767 data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json -6f5efa4b721ada473d5cb7f15d2a01267639e368 data/modern_industrialization/recipe/materials/platinum/macerator/double_ingot.json -cc0c692d656c18b541fcd5100cda9245905c2d06 data/modern_industrialization/recipe/materials/platinum/macerator/ingot.json -1b1ef7650d1e2eb3d738addede62dc30b56bff49 data/modern_industrialization/recipe/materials/platinum/macerator/nugget.json -70500bee70931d978d38df56d7013d7176cc9613 data/modern_industrialization/recipe/materials/platinum/macerator/ore_to_raw.json -1e8805b2b332641f85a0cc7111ca612aeb132729 data/modern_industrialization/recipe/materials/platinum/macerator/plate.json -2b9b6079191c18aeef9f69c02a4aaaf42fd57597 data/modern_industrialization/recipe/materials/platinum/macerator/wire.json -c528f2b47bc9d501482928da3c500f1b9eb2d6c3 data/modern_industrialization/recipe/materials/platinum/packer/block.json -9215abd1edda807a221f0acd9c59337ffebedd8e data/modern_industrialization/recipe/materials/platinum/packer/cable.json -03e87578768a48f43b0301c27099d85d7f2f21f7 data/modern_industrialization/recipe/materials/platinum/packer/double_ingot.json -7efcb7acb129b4d700f758f59f1313ee3ee2bf31 data/modern_industrialization/recipe/materials/platinum/packer/dust.json -8acf5aa8a1b797db3904e059ac04e5338a7655e4 data/modern_industrialization/recipe/materials/platinum/packer/ingot.json -1e9a3ebce0427851c38c706e0c4126dbe07fbb15 data/modern_industrialization/recipe/materials/platinum/packer/raw_metal_block.json -b29c350a2386dac576020e9083f75e0e224a597e data/modern_industrialization/recipe/materials/platinum/unpacker/ingot.json -a20b75db81b985eb690451488c0fb9289443d977 data/modern_industrialization/recipe/materials/platinum/unpacker/nugget.json -e59b224829be94543ee15a993f3770bb55187385 data/modern_industrialization/recipe/materials/platinum/unpacker/raw_metal.json -40edd3f641f15c6a5348cb84b06eda74a4ee9d8c data/modern_industrialization/recipe/materials/platinum/unpacker/tiny_dust.json -cba11507b37d3fac386f1aeff5179a944757f4ac data/modern_industrialization/recipe/materials/platinum/vacuum_freezer/hot_ingot.json -431b615f70eb3babf9423307da05a5cb68642aef data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json -97e862a3f751584f9dcbed447fdfe346594de4aa data/modern_industrialization/recipe/materials/platinum/wiremill/wire.json -e34552e82da078791beda93b0fa5493d9c489d2d data/modern_industrialization/recipe/materials/plutonium/blast_furnace/dust.json -11607eff8b09a54c38abbd7649d055bd20a32303 data/modern_industrialization/recipe/materials/plutonium/blast_furnace/tiny_dust.json -52aabb1498634f34cd501dc55a48d633167f046a data/modern_industrialization/recipe/materials/plutonium/craft/block_from_ingot.json -1505136f7eb6300b0958ddefc669d3e839864534 data/modern_industrialization/recipe/materials/plutonium/craft/dust_from_tiny_dust.json -241177dcfd993e12221aec1e78a5c0e62e75f586 data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_block.json -5ff642c28aa833e48c701e4d356f43bd0d38ce7f data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_nugget.json -73dc330affd5916676ed6647c204641610c96391 data/modern_industrialization/recipe/materials/plutonium/craft/nugget_from_ingot.json -b19e3685058c525789eeef5d773c1315f45c4d7a data/modern_industrialization/recipe/materials/plutonium/craft/tiny_dust_from_dust.json -dc7441820243d623b3057bd1a660ecf3d7e506d9 data/modern_industrialization/recipe/materials/plutonium/macerator/ingot.json -546feaa14bfa02be95a37dcad0d233e40140a351 data/modern_industrialization/recipe/materials/plutonium/macerator/nugget.json -2ba01be04fa88f4646b419d73537f20a9350d28c data/modern_industrialization/recipe/materials/plutonium/packer/block.json -3312b784150ab1499972a274d89edf916fa805a6 data/modern_industrialization/recipe/materials/plutonium/packer/dust.json -b1fc6bc94cdcf04d19682c13b8069b1f64d1e649 data/modern_industrialization/recipe/materials/plutonium/packer/ingot.json -fc7f7a7f98969faa7e4adc766f3a6e173bc4b325 data/modern_industrialization/recipe/materials/plutonium/unpacker/ingot.json -0c337215bce1a6355a4e214ed1a1da9e3e615c33 data/modern_industrialization/recipe/materials/plutonium/unpacker/nugget.json -6c40e2b3cceef305dc6608b26c3ed78effc0d208 data/modern_industrialization/recipe/materials/plutonium/unpacker/tiny_dust.json -abf62bc7f93234e42ba6973e99f021aff4c90dea data/modern_industrialization/recipe/materials/quartz/compressor/quartz.json -502392c92a86d11635ac85f89eadd8a4861d0f23 data/modern_industrialization/recipe/materials/quartz/craft/dust_from_tiny_dust.json -6d79e4a1adc284ed1985416dcf0335b05153e187 data/modern_industrialization/recipe/materials/quartz/craft/tiny_dust_from_dust.json -35e390aa8427ce5edb19f8792e10b9d9c7a0ce68 data/modern_industrialization/recipe/materials/quartz/macerator/crushed_dust.json -68d945bb7192d6e886ad02b94a7a91dc29158b4f data/modern_industrialization/recipe/materials/quartz/macerator/gem.json -ded9a13820fbc928a01314b4e0bb70ca4e887ee4 data/modern_industrialization/recipe/materials/quartz/packer/dust.json -a21b7b9b52462801089f1849a416bd5987a09aa9 data/modern_industrialization/recipe/materials/quartz/unpacker/tiny_dust.json -78ec921bc4bf8abf3c2a3414cbae76b7a3598381 data/modern_industrialization/recipe/materials/redstone/craft/deepslate_to_ore.json -e100b1623909b10f9fb97ed9e0816ee78ce2032b data/modern_industrialization/recipe/materials/redstone/craft/dust_from_tiny_dust.json -bd252141fd4f8ad5e87f9133f8e19e94d2b8e0e9 data/modern_industrialization/recipe/materials/redstone/craft/tiny_dust_from_dust.json -b5b740e1459a7c2954bb50c48ba6388fac3bffe7 data/modern_industrialization/recipe/materials/redstone/macerator/crushed_dust.json -0de361f8abb357e4d8ee0bd94f2c18d86477154b data/modern_industrialization/recipe/materials/redstone/packer/block.json -550688e01cd43ecd20c12127cf41ce382aaa01ee data/modern_industrialization/recipe/materials/redstone/packer/dust.json -644b4571df38af9aa8cd3ce3aa64b9c11ec22f06 data/modern_industrialization/recipe/materials/redstone/unpacker/dust.json -c43bbdc0380456010b228dae311e124251641a8b data/modern_industrialization/recipe/materials/redstone/unpacker/tiny_dust.json -e5e63af9b894b8094b373c5a29de87ffe2bde498 data/modern_industrialization/recipe/materials/ruby/craft/dust_from_tiny_dust.json -30845a2e329d458ad2a7cd8c3b100c2299083273 data/modern_industrialization/recipe/materials/ruby/craft/tiny_dust_from_dust.json -7ccadb902da565f4a02f05f02ec5ccb34456d689 data/modern_industrialization/recipe/materials/ruby/packer/dust.json -191eb3f93957c1623d85e5a8f943dc5b39bea129 data/modern_industrialization/recipe/materials/ruby/unpacker/tiny_dust.json -387965c5dba4902db2da90c5866e5cee5a0229ba data/modern_industrialization/recipe/materials/salt/craft/block_from_dust.json -eb28792595e065b89847962fb4af05f067e21f13 data/modern_industrialization/recipe/materials/salt/craft/deepslate_to_ore.json -e6739dc1034b2f19520506230e3ce74826bfd58a data/modern_industrialization/recipe/materials/salt/craft/dust_from_block.json -368987e90775b5b37caabb6b01a40de23f6919eb data/modern_industrialization/recipe/materials/salt/craft/dust_from_tiny_dust.json -ea5e81c031aac0f816529c571f7d94d4450b9419 data/modern_industrialization/recipe/materials/salt/craft/tiny_dust_from_dust.json -529ea07ff4ddbb0cc84ed7d9546940b4e38c02f9 data/modern_industrialization/recipe/materials/salt/macerator/crushed_dust.json -75b6dd9c441d67faef9614ec6204f72d9cb3b85d data/modern_industrialization/recipe/materials/salt/macerator/ore_to_crushed.json -25e9bdd414f8d2da31f8ddb9c7c6bcbd98675e78 data/modern_industrialization/recipe/materials/salt/packer/block.json -e587da5f5554d42d87ef03082029ad514e487234 data/modern_industrialization/recipe/materials/salt/packer/dust.json -e59f850935093a5629e95c01837764cdf269dcf2 data/modern_industrialization/recipe/materials/salt/unpacker/dust.json -78b3a45ab038c0858fe85763b605dd3b68ac9655 data/modern_industrialization/recipe/materials/salt/unpacker/tiny_dust.json -2fd868562f4328a042e28be251ea51579e9c5542 data/modern_industrialization/recipe/materials/silicon/compressor/double_ingot.json -da46fee58a91283abf34dcd2c703a1fbc736e458 data/modern_industrialization/recipe/materials/silicon/compressor/main.json -862b806fcb480201a214b648b7fe2a2821d3ce27 data/modern_industrialization/recipe/materials/silicon/craft/block_from_ingot.json -5c94b098ac66b500185ac336f1522df7bd3d027f data/modern_industrialization/recipe/materials/silicon/craft/dust_from_tiny_dust.json -2a704efb194b72e460943445313a43f26d9bd39d data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_block.json -34bd64392da781b84ce90891e6c0438ad63d9b32 data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_nugget.json -58443326a5043e63e1bef1fe70d979f3d54ea11d data/modern_industrialization/recipe/materials/silicon/craft/nugget_from_ingot.json -c18cf025a0103ea0945266f69441959f70b1938c data/modern_industrialization/recipe/materials/silicon/craft/tiny_dust_from_dust.json -82ede41d4e8fc78f0eed3cd3fa21fe3483dd9ab9 data/modern_industrialization/recipe/materials/silicon/macerator/double_ingot.json -081d9ad128ffd8e5605ab4675147d0042cd8aec0 data/modern_industrialization/recipe/materials/silicon/macerator/ingot.json -e26664e1118467d8fae88569c4d922a765341f69 data/modern_industrialization/recipe/materials/silicon/macerator/nugget.json -3b475919fd270991a267375350b77cc2759c2d1a data/modern_industrialization/recipe/materials/silicon/macerator/plate.json -ca40d5f37941f391cf6353b1ac4b4583ae1915b5 data/modern_industrialization/recipe/materials/silicon/packer/block.json -d09a30376f9c468a6752471a7aaec8f3ec55315c data/modern_industrialization/recipe/materials/silicon/packer/double_ingot.json -87573eb34c5188063903b7c48b9646c0cefa6518 data/modern_industrialization/recipe/materials/silicon/packer/dust.json -bb0c4f29e2c690b9a98761da64bd6c75f68c6bb7 data/modern_industrialization/recipe/materials/silicon/packer/ingot.json -076afc947386e469e16b341a47b57af6f3b0dd26 data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_blasting.json -c5a44ae7205a3c36287282ec7ce98c5b86541b2b data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_smelting.json -bd33fe13e9602f1358fe6adc33607c9c3e3b988d data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_blasting.json -54f3eea958803f633e2138709f82afabdb97c5a5 data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_smelting.json -395d1ec8f0adef802e5dddd12e4dff61ed349d79 data/modern_industrialization/recipe/materials/silicon/unpacker/ingot.json -258cb695207003f754e046b13365a1383d7cfe10 data/modern_industrialization/recipe/materials/silicon/unpacker/nugget.json -66bb84c25a17fb0b87222f3b442502c8513d5d61 data/modern_industrialization/recipe/materials/silicon/unpacker/tiny_dust.json -81bd650fc6a640a3aeff449ce48e9c65d787ceee data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json -7021e9866132fb1762dbf8f969fdbb61ff018617 data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json -1aef7f9ad0b60253061ec4bec068696632cac6e1 data/modern_industrialization/recipe/materials/silver/compressor/double_ingot.json -32c36dfa95691007743ca7dbd92dbb3a108f8436 data/modern_industrialization/recipe/materials/silver/compressor/main.json -ae729df0f64ad6c94e929dd874581fe16138138d data/modern_industrialization/recipe/materials/silver/craft/block_from_ingot.json -b7e1952070b511f85700189abee5109aada7c800 data/modern_industrialization/recipe/materials/silver/craft/cable.json -f5db75f9c236a4a07d5031b468dc67a90996fd66 data/modern_industrialization/recipe/materials/silver/craft/dust_from_tiny_dust.json -28b1c2fcd3459045cc99845e42f1110b326c2953 data/modern_industrialization/recipe/materials/silver/craft/ingot_from_block.json -9e4ecbe31c5e49797d9b22a237aa260f0de9000d data/modern_industrialization/recipe/materials/silver/craft/ingot_from_nugget.json -38b85e0952b7d490db1fc8b6de1f6909e7d0893a data/modern_industrialization/recipe/materials/silver/craft/nugget_from_ingot.json -6ae43bfeff4036b0d4edbc2c0e3370fd8b02b0ab data/modern_industrialization/recipe/materials/silver/craft/raw_metal_block_from_raw_metal.json -056bdbd510754a1d84fba4d83e303e69dcd0c3e0 data/modern_industrialization/recipe/materials/silver/craft/raw_metal_from_raw_metal_block.json -ccc81af42d09513cfdc44fbc0de139d2bd06dad4 data/modern_industrialization/recipe/materials/silver/craft/tiny_dust_from_dust.json -da23d99208397609cb2ea2531fef49dda59a7ea9 data/modern_industrialization/recipe/materials/silver/macerator/double_ingot.json -dc6826575738934239e14d37f8db78241a1718e2 data/modern_industrialization/recipe/materials/silver/macerator/ingot.json -ea1503551a3e48f1c435e71294dff72c2f2a2806 data/modern_industrialization/recipe/materials/silver/macerator/nugget.json -12a4f3adbdb8e5fc96182deeb033c9c7277bdcaf data/modern_industrialization/recipe/materials/silver/macerator/plate.json -76d7862847225b8784e902689dacd1bb692ab510 data/modern_industrialization/recipe/materials/silver/macerator/raw_metal.json -5204948b31f3702d3079e1690e43f087b47eff56 data/modern_industrialization/recipe/materials/silver/macerator/wire.json -83f611d0dcbb0624f77feb467865010b676966da data/modern_industrialization/recipe/materials/silver/packer/block.json -d815c29190320a238e2ca3cbcc83b60180ba553d data/modern_industrialization/recipe/materials/silver/packer/cable.json -24a0ebf784351a9e8f893a5ae126b6fc0cc615dc data/modern_industrialization/recipe/materials/silver/packer/double_ingot.json -5d8f73d24afb928c123d8cbf54254ef83687bd17 data/modern_industrialization/recipe/materials/silver/packer/dust.json -9722a1bf1ce7fa3b2db3af1874a5cc00a649fed7 data/modern_industrialization/recipe/materials/silver/packer/ingot.json -5d22477336b7df7fecfc8506a5e9bc1fd5b42697 data/modern_industrialization/recipe/materials/silver/packer/raw_metal_block.json -009411017024eef931e69fc7336a10772b3eed37 data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_blasting.json -365c3c9757c1ba39f04c58aac057c272ccff37e7 data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_smelting.json -1526b5f41901058b1af9a1f8711105b39a632856 data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_blasting.json -bd78c56a2a549319720ad87c8464fda9096777fc data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_smelting.json -7bc4e6ffca2913de3e1e3c4b8196b6b913e3b4b1 data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_blasting.json -5a0cc8b925a46dedfb932148a49a660087aced47 data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_smelting.json -5793b95db036657f261f7736c337be55a251428b data/modern_industrialization/recipe/materials/silver/unpacker/ingot.json -542a55a4243972b4707b7d7b2ca9f2985528b694 data/modern_industrialization/recipe/materials/silver/unpacker/nugget.json -2b858533a67c9004d1eb90c55dc6c809d8a94cc5 data/modern_industrialization/recipe/materials/silver/unpacker/raw_metal.json -fe36995c30ae0504eed5abaa2261fea0d0fcf52e data/modern_industrialization/recipe/materials/silver/unpacker/tiny_dust.json -bdd9ef11853bfcc0c30e7c2c45ce00ab2e44a63b data/modern_industrialization/recipe/materials/silver/wiremill/wire.json -098fc076953642cb081fad805351e92d4f716d61 data/modern_industrialization/recipe/materials/sodium/craft/block_from_dust.json -250bdb9375c157f095869b0ba0e28f68bc09e5b3 data/modern_industrialization/recipe/materials/sodium/craft/dust_from_block.json -e4e1d00bf402fde720c293b2fdc552d855e4336a data/modern_industrialization/recipe/materials/sodium/craft/dust_from_tiny_dust.json -c626f2f32a5dc44df1ebd27ded7fa2635bd25ae1 data/modern_industrialization/recipe/materials/sodium/craft/tiny_dust_from_dust.json -d0e017ebd423c5dcaebd174defe399f0645dbb61 data/modern_industrialization/recipe/materials/sodium/packer/block.json -a8d9254d6ab91de939ade69eba4e53e205428df6 data/modern_industrialization/recipe/materials/sodium/packer/dust.json -36875562da285f915f7d36ab777277163ce4f91b data/modern_industrialization/recipe/materials/sodium/unpacker/dust.json -3011cb1476451f86778f64f8554da23834ed0ce1 data/modern_industrialization/recipe/materials/sodium/unpacker/tiny_dust.json -2d499a2c023ef46595a5d363e9dc6fa799c82b50 data/modern_industrialization/recipe/materials/soldering_alloy/craft/block_from_dust.json -dd7381cd0457d0a0436b557f449a2d372d06fd07 data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_block.json -e777988e4b364517a139aed51d24ce0567bc938a data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_tiny_dust.json -3e369d3b0a1e0e0db2e630f51b4f198ee15e96a0 data/modern_industrialization/recipe/materials/soldering_alloy/craft/tiny_dust_from_dust.json -723f76873f7a5a65f44b1ba7b0f915963eb51f98 data/modern_industrialization/recipe/materials/soldering_alloy/packer/block.json -05fd8f79c34443d59491599d6ed9899a904b8c94 data/modern_industrialization/recipe/materials/soldering_alloy/packer/dust.json -7278da7c4afd99d5441b0abefce7bd07a16c0527 data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/dust.json -ae0e8ada16225d340b802dccbf50f1aa9fc4c315 data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/tiny_dust.json -4b0a106e7b633c4c2f19b448dd8b02e74518cd14 data/modern_industrialization/recipe/materials/stainless_steel/assembler/barrel.json -d4c1e0d7b04bd54aa972e815ea19f0241d83d528 data/modern_industrialization/recipe/materials/stainless_steel/assembler/drill_head.json -fa4b29506a3f18e465389681298d9852421a8ab7 data/modern_industrialization/recipe/materials/stainless_steel/assembler/gear.json -2e70bccc3246fd5dd2eb3af96a97f17895fa7afd data/modern_industrialization/recipe/materials/stainless_steel/assembler/rotor.json -998a0c0505165db5673237a00735755b54a5a007 data/modern_industrialization/recipe/materials/stainless_steel/assembler/tank.json -be5b87fcd268ca503fe732635d3300568e68dca2 data/modern_industrialization/recipe/materials/stainless_steel/blast_furnace/dust.json -89a0b233371494274e3f5f8552a1036523f7a26b data/modern_industrialization/recipe/materials/stainless_steel/compressor/double_ingot.json -15c61a54d7364d956e5369f2dc82e008bf36cf54 data/modern_industrialization/recipe/materials/stainless_steel/compressor/main.json -17919d186d753b42208915a4f17582c8f2498bfd data/modern_industrialization/recipe/materials/stainless_steel/compressor/plate.json -a891df4e180c4ebf07d700c30c6dccc6f3952215 data/modern_industrialization/recipe/materials/stainless_steel/compressor/ring.json -d1a563e660ccf256e98e4a9418c49252a83dc7a2 data/modern_industrialization/recipe/materials/stainless_steel/craft/barrel.json -c236324f69ea3a4ef891b30911e41067e24fe8a4 data/modern_industrialization/recipe/materials/stainless_steel/craft/blade.json -04df151e95c03a1228bfbc597482657dedd7599f data/modern_industrialization/recipe/materials/stainless_steel/craft/block_from_ingot.json -acbff0c39dc50c44a96bf7c3792787fece78409c data/modern_industrialization/recipe/materials/stainless_steel/craft/drill_head.json -c18aada09ce68b3ac9c790bef9d1aed2cc5b08d6 data/modern_industrialization/recipe/materials/stainless_steel/craft/dust_from_tiny_dust.json -3d22f3d8fe6852354990a0ce1e1cd15374977be7 data/modern_industrialization/recipe/materials/stainless_steel/craft/gear.json -37e502d8dc4e30884440fe045c26d1b7673ee34a data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_block.json -a3773c49555163e0f5aaf6ca762ed0bae308b084 data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_nugget.json -753e2aad4c39f8ef2ff4f86ba52c3bb398833017 data/modern_industrialization/recipe/materials/stainless_steel/craft/large_plate.json -48fa89ca8125e3b7af0e29589a66b78134b653a4 data/modern_industrialization/recipe/materials/stainless_steel/craft/nugget_from_ingot.json -349ef52e7db76b16aa9f7c160e90ef2235a6d169 data/modern_industrialization/recipe/materials/stainless_steel/craft/ring.json -344991bd647987dbedf20e4217382058eb12f572 data/modern_industrialization/recipe/materials/stainless_steel/craft/rotor.json -4f1b01800d7533fa185ded76eb50c749d7f89431 data/modern_industrialization/recipe/materials/stainless_steel/craft/tank.json -81df9094ccb6d530fefe56ecf7cce11636b183f3 data/modern_industrialization/recipe/materials/stainless_steel/craft/tiny_dust_from_dust.json -84900a19319d89f0ed9361483e9c69c4ab9a2202 data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/double_ingot.json -16025ae38e4f3dd1baee8787d01bba2b532c8b50 data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/main.json -6552155dda6da39f6e4774f5b9c3639d60b4e385 data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/rod.json -c14abf35361249779b72dd038f823f9da4bc58e6 data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json -e97ac044faf527e2629028d6167ca7079611ac16 data/modern_industrialization/recipe/materials/stainless_steel/macerator/blade.json -190d27d0e9cb564023c5cd5c05927cd46fd079d3 data/modern_industrialization/recipe/materials/stainless_steel/macerator/bolt.json -a0c25fe024c94e667e039551967e90270857a48d data/modern_industrialization/recipe/materials/stainless_steel/macerator/curved_plate.json -12c6eb0dc244fcc72756204d8af5c6c188234379 data/modern_industrialization/recipe/materials/stainless_steel/macerator/double_ingot.json -2dafa65db52a0131f3ed9cb742714ca577b52b9d data/modern_industrialization/recipe/materials/stainless_steel/macerator/drill_head.json -7edd6602ddb8ec033fe1e790185946b4791e0d7d data/modern_industrialization/recipe/materials/stainless_steel/macerator/gear.json -35e49566e026348404423ff9884d8f6394be91e4 data/modern_industrialization/recipe/materials/stainless_steel/macerator/ingot.json -19b95ba5a2403c9d65d2d0a16fafda3be805a33c data/modern_industrialization/recipe/materials/stainless_steel/macerator/large_plate.json -44cdde2cebde25b0d0c3745e1c1d2e00e7f0a262 data/modern_industrialization/recipe/materials/stainless_steel/macerator/nugget.json -1a6e85e7e07b9ff54a8b0b655132cd462d92b69b data/modern_industrialization/recipe/materials/stainless_steel/macerator/plate.json -02d4189a449d2c3d18e05bc351c438625da423d4 data/modern_industrialization/recipe/materials/stainless_steel/macerator/ring.json -ad30adf23402410a944178e5e49ea09b577c8346 data/modern_industrialization/recipe/materials/stainless_steel/macerator/rod.json -b628a101eaa4880e1e5c0acf67c7475422288f73 data/modern_industrialization/recipe/materials/stainless_steel/macerator/rotor.json -bd8361728563d153ff5062a32977e06394a3b0cf data/modern_industrialization/recipe/materials/stainless_steel/packer/blade.json -42fbef33428871ac0d4035da7b69a8cd009c8811 data/modern_industrialization/recipe/materials/stainless_steel/packer/block.json -43987129f01c5f49a01576f6f3e7450bb190eff9 data/modern_industrialization/recipe/materials/stainless_steel/packer/double_ingot.json -3e7cca235dfb750d3ec2034e633d7192f7a34fa0 data/modern_industrialization/recipe/materials/stainless_steel/packer/dust.json -2d32cfef57ac20c8324c830421e64f73382035d7 data/modern_industrialization/recipe/materials/stainless_steel/packer/ingot.json -b830f2e5fc27785447480f24168a56753cf8e4fe data/modern_industrialization/recipe/materials/stainless_steel/packer/large_plate.json -5cbfb91ac92681dd01950c29b91ed903d23431e3 data/modern_industrialization/recipe/materials/stainless_steel/smelting/rod_magnetic_to_rod_smelting.json -5e5f07ee30277ea158eb8f6d84fd833c215a3a05 data/modern_industrialization/recipe/materials/stainless_steel/unpacker/ingot.json -8fbfb94792d88ee7aa9419820b83fb40491938f6 data/modern_industrialization/recipe/materials/stainless_steel/unpacker/nugget.json -99fc769587bf56fb88f1b6039a859b35e7c9f06c data/modern_industrialization/recipe/materials/stainless_steel/unpacker/tiny_dust.json -d426bc66b4c8f3df67f536f59214bb82209211ca data/modern_industrialization/recipe/materials/stainless_steel/vacuum_freezer/hot_ingot.json -fbf3e613249e71a0220403fac044717d9a2a4d40 data/modern_industrialization/recipe/materials/steel/assembler/barrel.json -bbf32b9041c7cadf7cec6e89b5ed69c56329fde0 data/modern_industrialization/recipe/materials/steel/assembler/drill_head.json -a1de986ec410ce45987d681139a3761c24cf4a96 data/modern_industrialization/recipe/materials/steel/assembler/gear.json -1bc1db965635139de01c8e6d0ef81cafa5c565f1 data/modern_industrialization/recipe/materials/steel/assembler/tank.json -28e0fe8a2759b544ae4d5eef75ca222ac22284cc data/modern_industrialization/recipe/materials/steel/compressor/double_ingot.json -8693e2a23a27d10910e3eec3e41532438ab98e10 data/modern_industrialization/recipe/materials/steel/compressor/main.json -776df5d75b09004f4ee85681bf6b6c20b474a432 data/modern_industrialization/recipe/materials/steel/compressor/plate.json -f1eaf1ed5ac58529e5d92c03c5d9f1ccfac7d367 data/modern_industrialization/recipe/materials/steel/compressor/ring.json -7dd08f117da9440c5f8865b295d09d2a6f20dab7 data/modern_industrialization/recipe/materials/steel/craft/barrel.json -39760b4da6a4e1ed88b61208de5b4cb69a3ce4e0 data/modern_industrialization/recipe/materials/steel/craft/block_from_ingot.json -51990367e6f5f00d45028868a471e66e70141ee6 data/modern_industrialization/recipe/materials/steel/craft/drill_head.json -e2171ee957ba0d9ce73852a2316e64792220c9d4 data/modern_industrialization/recipe/materials/steel/craft/dust_from_tiny_dust.json -54e61b4318428772c84d174731f261d913b79fc0 data/modern_industrialization/recipe/materials/steel/craft/gear.json -b97f41a32b7815f42663628bce484a8bf0b662a6 data/modern_industrialization/recipe/materials/steel/craft/hammer.json -afd767ac1549bee75d9d2c75a00f03dec4109ffa data/modern_industrialization/recipe/materials/steel/craft/ingot_from_block.json -b826fc9c6123c219103db94f896798855fe530d7 data/modern_industrialization/recipe/materials/steel/craft/ingot_from_nugget.json -054f605c20e07f234ea7aa6d23f0d2408594aa42 data/modern_industrialization/recipe/materials/steel/craft/large_plate.json -80077aa72c5e2a11dc7a1d83c89b6a08862f5372 data/modern_industrialization/recipe/materials/steel/craft/nugget_from_ingot.json -e2f7659f9963fe21006252bec0e7a3475f553229 data/modern_industrialization/recipe/materials/steel/craft/ring.json -7b418ef77b0a163e83a2d01ca78d4ef0bd7f85c7 data/modern_industrialization/recipe/materials/steel/craft/tank.json -15df88b1d176d806e8b85ecab733f9c3a5484b17 data/modern_industrialization/recipe/materials/steel/craft/tiny_dust_from_dust.json -182de6fcc34374a03a75c4c4530be8d3d2cee261 data/modern_industrialization/recipe/materials/steel/cutting_machine/double_ingot.json -9d9c02b22b43cf13b3991dd01886c7989185f72e data/modern_industrialization/recipe/materials/steel/cutting_machine/main.json -85d67df3dc2805885e429ba41bebe9afa0d7df50 data/modern_industrialization/recipe/materials/steel/cutting_machine/rod.json -df6927025bd6f07e091a136cc7a90babb979cd13 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt.json -209df02a3b996933f3ed044f0bc226199c91183f data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt_with_tool.json -1101d7a04fe37c3c5820da254520543257e877f4 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate.json -5a1d0ac441b0884aa5461991dc047662c8120df0 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate_with_tool.json -e97050dbc3c2fe33e2ac0f6a894018c465afb891 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate.json -4eb1579491eb6784f00bd104f655ccdc3617585e data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate_with_tool.json -699e5921ea9ad3cf24dda827ca891674fcb8a9e9 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring.json -a436fc622b06b0a972d4742e92e7563d03b6ab1e data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring_with_tool.json -aeeb1b65afa49b997ae9865ac459d5875c6f5e34 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod.json -5b34a1e89bb132b803fca5b1c66354cbe0b2a86b data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod_with_tool.json -e1db59c52c966d131078acf82e77d0a96dba26f2 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt.json -e9fdba96bb76795d9d8e3123bb751493353dac4e data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt_with_tool.json -ca48a558298ba745ead573bf547abe05c907660c data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate.json -7fb75809a9dfdb816878e8d6012b30d570bff26a data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate_with_tool.json -197bd44637d2476bc3b759db820ad347ab61d86f data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_double_ingot.json -dbea3a8edd513afdd1d4a98e443cf1661be26462 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_dust.json -a9c35671806ea636dcd554fb92c252c372a58d62 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate.json -fc1b4c75729f7d95c5dcf1134ed3caeee0997ae8 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate_with_tool.json -c3183e6cf2f0bbfbb3ffb0177dad6284a913e75a data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring.json -9fa45ab8738ec57161e4fbfd1a4b9e2ff6a46eb7 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring_with_tool.json -6b4ff40635404d0f4cb34d38a78a5d8ebb6d2a4a data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod.json -76c21dd083de056f6642ac3c91fbdc80a721bb24 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod_with_tool.json -84b47970a84f95f6280d0dc64e8aaa8ad2a08772 data/modern_industrialization/recipe/materials/steel/forge_hammer/nugget_to_tiny_dust.json -3048de03b1a181c3ad4efc7e156ed5245e3a1239 data/modern_industrialization/recipe/materials/steel/forge_hammer/plate_to_curved_plate_with_tool.json -9be2411c24b85d3bd5e693740e37286695958bd2 data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_bolt_with_tool.json -39e6ffefaa2b79af355e95967a2d1ac774d1bcd3 data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_ring_with_tool.json -86975830249e0fcf8de6a5f250949e483118e7ce data/modern_industrialization/recipe/materials/steel/macerator/bolt.json -0bb83b946eb228b5dcc03ceaa669fc04830866de data/modern_industrialization/recipe/materials/steel/macerator/curved_plate.json -3fccb657a557ab5fcb32c130c5e25016401ab1f4 data/modern_industrialization/recipe/materials/steel/macerator/double_ingot.json -92c5fe7bdd10e2c845a956ef46554c1a768a3c8a data/modern_industrialization/recipe/materials/steel/macerator/drill_head.json -20f1ea094e4c8466a326c5b403f6ee9116d076d6 data/modern_industrialization/recipe/materials/steel/macerator/gear.json -abab101627eb1e97ff38b5591931c894964c0ead data/modern_industrialization/recipe/materials/steel/macerator/ingot.json -67765e0afd4679c97c280c5b67acf5d4862ba926 data/modern_industrialization/recipe/materials/steel/macerator/large_plate.json -31ea13f200486ab90924ae5244a75f91fb473d6d data/modern_industrialization/recipe/materials/steel/macerator/nugget.json -e01713c648fd0b45f520d8c77c5966b632a011aa data/modern_industrialization/recipe/materials/steel/macerator/plate.json -fc88f3c5522cff4a22a67f6ca8ff5c9e8166eafe data/modern_industrialization/recipe/materials/steel/macerator/ring.json -fcf8d34436772ca07e2c228117c02029f7c84a77 data/modern_industrialization/recipe/materials/steel/macerator/rod.json -e0ea9b051a277dbb251324f4fb248dacb806ea29 data/modern_industrialization/recipe/materials/steel/packer/block.json -0b399b761ecec40e91c18b787bb0144cd20d7e24 data/modern_industrialization/recipe/materials/steel/packer/double_ingot.json -18d81e3ccb2adc98b33f122cc5fe0115878c120f data/modern_industrialization/recipe/materials/steel/packer/dust.json -c824403b1991994009922978634e18b5fe932bf7 data/modern_industrialization/recipe/materials/steel/packer/ingot.json -3fbd68f02ffcf91cac8d2cb582d1843fcaeabc7e data/modern_industrialization/recipe/materials/steel/packer/large_plate.json -9a2ddfec55bbf60f58825fe4234e961003d9cb22 data/modern_industrialization/recipe/materials/steel/polarizer/rod_magnetic.json -ef680e4fde549e7c112baa6a1f9110231f5cd03e data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_blasting.json -3610cfd14e092938c1bdf3abb35f2fea5d498ed6 data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_smelting.json -4ef78968406336ea546cbacfb282cf2c7bc4c8a2 data/modern_industrialization/recipe/materials/steel/smelting/rod_magnetic_to_rod_smelting.json -b4f1906ac6baa597a591d8535582f4ab5836455c data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_blasting.json -a1d77281deea4f2c3cc1c5a12806ad00b2548332 data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_smelting.json -8d6d07a409794d09b44dac0aff03f4d303b7bf59 data/modern_industrialization/recipe/materials/steel/unpacker/ingot.json -a821756a85748f3a78e60d65757f9d6c8efeeed6 data/modern_industrialization/recipe/materials/steel/unpacker/nugget.json -476faf8ae061dbaec824f76559949ac2dd9678e8 data/modern_industrialization/recipe/materials/steel/unpacker/tiny_dust.json -7a565e6cfe1fc0bc8a4a491c23f6a368b54ce955 data/modern_industrialization/recipe/materials/sulfur/craft/block_from_dust.json -2851aff55e523f8c91e62ed60a26b902df302198 data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_block.json -f010e423b50b00defef59bf4edcacfa6d306b81c data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_tiny_dust.json -05d4f42f6dd8c9b457c1157bff28acf24dde0a3d data/modern_industrialization/recipe/materials/sulfur/craft/tiny_dust_from_dust.json -a631c916bb582083bbd1938f1ee9a56ca3048c98 data/modern_industrialization/recipe/materials/sulfur/packer/block.json -11330fa3f3d677ca5bb859c9561e4075dd0659fe data/modern_industrialization/recipe/materials/sulfur/packer/dust.json -1dd25ef9df9aaa55755d51a248c70a74e98a5c28 data/modern_industrialization/recipe/materials/sulfur/unpacker/dust.json -3c155275a0c94e9d9967142c52daee668ce2b16d data/modern_industrialization/recipe/materials/sulfur/unpacker/tiny_dust.json -b1d51f4ef78e0937a26dd30d52694a3ef8efc69c data/modern_industrialization/recipe/materials/superconductor/assembler/coil.json -24e1281e72ba09ee5395c97e9dbfaa9cff4248a7 data/modern_industrialization/recipe/materials/superconductor/compressor/double_ingot.json -9807e5841f7c04215215ea72b6ff51d6e62f0d04 data/modern_industrialization/recipe/materials/superconductor/compressor/main.json -2b1dda3a3ee5f97dde09a5baf3f65bda51b2f47c data/modern_industrialization/recipe/materials/superconductor/craft/coil.json -3a2767d67dbee6793d6e05782dab4fc84b4594b2 data/modern_industrialization/recipe/materials/superconductor/craft/dust_from_tiny_dust.json -d1171eaf156ad3956feb35a860fedb8bf8ddd874 data/modern_industrialization/recipe/materials/superconductor/craft/ingot_from_nugget.json -15aa52cde1986bb393b632051e6b09f1a58f6990 data/modern_industrialization/recipe/materials/superconductor/craft/nugget_from_ingot.json -2aec37ce0a2b2984be7ddb927d48b990dcb61667 data/modern_industrialization/recipe/materials/superconductor/craft/tiny_dust_from_dust.json -3e550f402d90a035f5f4aa1d4f06e29a79092177 data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json -59d6543b6fbd8b34970f65b08016ddfb5a1554b2 data/modern_industrialization/recipe/materials/superconductor/macerator/double_ingot.json -25e586fdf40537eb710530e35945acdd77844b62 data/modern_industrialization/recipe/materials/superconductor/macerator/ingot.json -a5336126c0b0a74550adc8f19cf8a0083082db07 data/modern_industrialization/recipe/materials/superconductor/macerator/nugget.json -4e018930fbe45755b4ea19f901b75dd67320bae5 data/modern_industrialization/recipe/materials/superconductor/macerator/plate.json -0b0e1e3598190b30890a11a30ca70298bc8c6470 data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json -c7dbf7cd561ce647f273f39e5542d0e085ac0e5d data/modern_industrialization/recipe/materials/superconductor/packer/double_ingot.json -ac4189bb5459aed5441f435a32314648291167dd data/modern_industrialization/recipe/materials/superconductor/packer/dust.json -949ba17b4442f02b9b0717301ce78a891f7708a9 data/modern_industrialization/recipe/materials/superconductor/packer/ingot.json -9aa1b6311e70d9e8e1834cd67f23059808fecd97 data/modern_industrialization/recipe/materials/superconductor/unpacker/coil.json -24a8b92205860f19eedffcaa8a274eda5bf4c100 data/modern_industrialization/recipe/materials/superconductor/unpacker/nugget.json -245f9592c77bfa3bbef4ae825455da67c09c3c09 data/modern_industrialization/recipe/materials/superconductor/unpacker/tiny_dust.json -b68fa03298a5f358b2ae4d2e8a89c6707a89d79a data/modern_industrialization/recipe/materials/superconductor/vacuum_freezer/hot_ingot.json -00b9058578dd586877f0bca73c33b39aa9a1a019 data/modern_industrialization/recipe/materials/superconductor/wiremill/wire.json -3e2da5e394118531e14c8884da907ef85166fdbc data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json -863f2513740332f364265de60710ac0ae5c12675 data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json -4b7e4bc82cdf00563e64e8709dc4d9a08965b685 data/modern_industrialization/recipe/materials/tin/assembler/gear.json -0b9f48802215eb9e396bd653961e66a5cafe965a data/modern_industrialization/recipe/materials/tin/assembler/rotor.json -4d2f543d36608ad6096789ba47ecc1c24cc7796f data/modern_industrialization/recipe/materials/tin/compressor/double_ingot.json -2fc527db9b6dc23ce530c1fbf95e29eb341167cc data/modern_industrialization/recipe/materials/tin/compressor/main.json -8643300a7476808bba1ac8b76cb2e0a2bab6185c data/modern_industrialization/recipe/materials/tin/compressor/plate.json -76d087985475b67899014dff38dfe760849c05c9 data/modern_industrialization/recipe/materials/tin/compressor/ring.json -7d5bdb5e5763be29ea2e9ea1e9adf60b1314c838 data/modern_industrialization/recipe/materials/tin/craft/blade.json -174d9ee4edbaa769a1e93c614ffb03682e9012b4 data/modern_industrialization/recipe/materials/tin/craft/block_from_ingot.json -ecc9746a2107fe0482372a689e90187b52120e5c data/modern_industrialization/recipe/materials/tin/craft/cable.json -757f9c70253e13f0e3c682c8b8333afcaea3466c data/modern_industrialization/recipe/materials/tin/craft/deepslate_to_ore.json -2181422d98c5165c3117c092e10d211c1f172ca8 data/modern_industrialization/recipe/materials/tin/craft/dust_from_tiny_dust.json -245edba95449562b0252e6d2a473bbf0916dc9e7 data/modern_industrialization/recipe/materials/tin/craft/gear.json -f650d8fda89d1a35ad6786758c9186326071b395 data/modern_industrialization/recipe/materials/tin/craft/ingot_from_block.json -71b3032e72bad583e4ea3e036e5b602f572bfb3b data/modern_industrialization/recipe/materials/tin/craft/ingot_from_nugget.json -18072134105ac90e2ceee33a851d2054a01067da data/modern_industrialization/recipe/materials/tin/craft/nugget_from_ingot.json -53031ced3b49996be04dffd8131fce6b19d14518 data/modern_industrialization/recipe/materials/tin/craft/raw_metal_block_from_raw_metal.json -d9e1ecf8e4398a8e2f5427dcdb66ba3c255e3076 data/modern_industrialization/recipe/materials/tin/craft/raw_metal_from_raw_metal_block.json -c5fac87ea20a92fcbe6967b6a3f2f777e6a00ac3 data/modern_industrialization/recipe/materials/tin/craft/ring.json -050ef9d221789542a4d616ef5cccabaf9556379f data/modern_industrialization/recipe/materials/tin/craft/rotor.json -25d1598888c0f2c3a2d0ed33718c901067480678 data/modern_industrialization/recipe/materials/tin/craft/tiny_dust_from_dust.json -4ed9fe8d9c1228bd14b18832c6eb28a2ed381aa3 data/modern_industrialization/recipe/materials/tin/cutting_machine/double_ingot.json -237a64c1274b4356b79d05d61f97544fcd3080c8 data/modern_industrialization/recipe/materials/tin/cutting_machine/main.json -db5bc3bc95395dc716cd24b24cf7ae8ca903fa00 data/modern_industrialization/recipe/materials/tin/cutting_machine/rod.json -2d4d2cc432818290bada23be1bb1f5198dab870e data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt.json -293cd79f19f716ca04a84f4aea6bc154bcd66065 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt_with_tool.json -2881ceed8f65fb4e56e7c6b7aab35847bbdacb70 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate.json -7c52e40bddf3878961894f54f9779028e52df842 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate_with_tool.json -4cfe01fdc38bd1857cf2ebaee5d9707375a89744 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate.json -bcc7522730edba145c5ccc36f4bbd81579b1b041 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate_with_tool.json -5af14f82013b14530d45b4d8400235cb7c0fe6ef data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring.json -481d61dd37b16de0e85c8f65bf2ec2d688367f3e data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring_with_tool.json -78b3deed86df8d10228f3bc3316bcee04f26e1fa data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod.json -8a1d67b71e79ca777ceceeef97e1100fbacca04d data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod_with_tool.json -c23e93dea216fd9b229fc2e3a90e007c14d024b0 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt.json -6779f2e7212604b55e117561fbca457b9556e1ab data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt_with_tool.json -e7c6275ffb4d85fb2743aa5b782bc483f9934811 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate.json -e6b8c7d5d7ba058ab97ffdf5da024be731449455 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate_with_tool.json -4a8c7dcbf0acdf5d7f0d5bc4a0ada14123e036d1 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_double_ingot.json -9a631b268f8c13b92f707735c9a01c609374f828 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_dust.json -93b86affd0370c2a9393c0c21bc504300bf2ec57 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate.json -1aae5815ac17e904718f143f5419d6d3ff090da1 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate_with_tool.json -aa132f781611e6290610976d5c6c10fa08cb9af7 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring.json -405ca8b6187f3df89ae30ee46cb2bd1042a43c7d data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring_with_tool.json -a1cd96336ab80ef830a471dc9d245b0da7a7930e data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod.json -db17bf8c9b1aedf130eacea4960876e5b1a39383 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod_with_tool.json -8845401389bda91039008f5c07375417ba2ff185 data/modern_industrialization/recipe/materials/tin/forge_hammer/nugget_to_tiny_dust.json -b9a3b85446c84e7f5e12694423b7662675e08407 data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_dust_with_tool.json -b3dbb3a874b86af41a3b57baace149758e822e46 data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal.json -d001c765fbf83d65f41e1db0d3a7af36835e9cb7 data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal_with_tool.json -a8b223e4f03cceb2e481d7b777502b5294942e9e data/modern_industrialization/recipe/materials/tin/forge_hammer/plate_to_curved_plate_with_tool.json -66db7a259faa6f65da60a465c3c88aa1e1061af3 data/modern_industrialization/recipe/materials/tin/forge_hammer/raw_metal_to_dust_with_tool.json -7c6c0d6a82f9ff50722d8892a54c834e346ad1f6 data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_bolt_with_tool.json -5ae169dd178c00581cc45e95779bef465fdbbd94 data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_ring_with_tool.json -99543830a236736c9f6d6fb06d80d8129b63cea4 data/modern_industrialization/recipe/materials/tin/macerator/blade.json -330443cda4320c07ff9759c07304e552d95a567e data/modern_industrialization/recipe/materials/tin/macerator/bolt.json -b9eb58295236b894cffee5c6ea71d80300862781 data/modern_industrialization/recipe/materials/tin/macerator/curved_plate.json -f197b199cd925be34cb8b35dcec0946776d03460 data/modern_industrialization/recipe/materials/tin/macerator/double_ingot.json -0c3eed8186a6b8d85591217f0721a378c6ae20d6 data/modern_industrialization/recipe/materials/tin/macerator/gear.json -14759c4eb5d4df77d7cf565e8f8dbc9850f2a9b7 data/modern_industrialization/recipe/materials/tin/macerator/ingot.json -9c84ec050fcbb3d7efbe6604e283449cc201d8dc data/modern_industrialization/recipe/materials/tin/macerator/nugget.json -e1119362859047e73cc277267b7d60e861fbc151 data/modern_industrialization/recipe/materials/tin/macerator/ore_to_raw.json -1f9944ea25c6656b63c29a1cc71e9b8a643bb14c data/modern_industrialization/recipe/materials/tin/macerator/plate.json -9c8f3fa6a952148382f28df918b9cff57350b493 data/modern_industrialization/recipe/materials/tin/macerator/raw_metal.json -7c1a68ff41a95e6f32ae1afa7e460832395e81a1 data/modern_industrialization/recipe/materials/tin/macerator/ring.json -c32f5f8a4d11aa3ab02662323625d0fd49b24071 data/modern_industrialization/recipe/materials/tin/macerator/rod.json -e3445ea20729d71390b73d998d864a8c4d05044e data/modern_industrialization/recipe/materials/tin/macerator/rotor.json -a24b562effcfeb4a827717bc7404fe1e6ffb4256 data/modern_industrialization/recipe/materials/tin/macerator/wire.json -25f86c9119ea96b766ff2bed7e091d8fadbda209 data/modern_industrialization/recipe/materials/tin/packer/blade.json -15ee180e8ad671aed22e83141c44757fcb59a1a5 data/modern_industrialization/recipe/materials/tin/packer/block.json -e14234354b836f86c4a08dab8ec71ae4220ea6ae data/modern_industrialization/recipe/materials/tin/packer/cable.json -a2472334ba45937e7a82fc8dcbe0ce1c4babf6f8 data/modern_industrialization/recipe/materials/tin/packer/double_ingot.json -660477b81497867661a9c6d37c83a39e8894c4ef data/modern_industrialization/recipe/materials/tin/packer/dust.json -0429f1072da45e4552909395e187d2f89a42da85 data/modern_industrialization/recipe/materials/tin/packer/ingot.json -25dd24eec1d5ff1cf603d92738b3c465984c403c data/modern_industrialization/recipe/materials/tin/packer/raw_metal_block.json -f43f5cc09381e7bfabb928e5117ab05f98752083 data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_blasting.json -92dbd947f88c975190f51dc380589f6d3c22bd23 data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_smelting.json -bed0b1f96f9a82c329ed7d4601c06001210196e0 data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_blasting.json -0ef2d9836f5dbc1b627c531944b5fc67d468b46d data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_smelting.json -b5f662766dade3513a59126ae4e55246f2d4f551 data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_blasting.json -a3dad058981a90907b530d2d42b8520643616820 data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_smelting.json -a4050fed4a3c3f563807a58bf850ce2574dd90aa data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_blasting.json -80e26a368fdc5a57b3e458fc063e143c265b5c93 data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_smelting.json -e1173eca48da62823d85bd696b5fbd89f59266ea data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_blasting.json -e235f215174b7221ba304fe5508ab5f66a1d8f5e data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_smelting.json -62e40301a83ed067bf2aa0417a44e957d25f1151 data/modern_industrialization/recipe/materials/tin/unpacker/ingot.json -52b4d771987f39c93881e3a80af7ebd0749fac08 data/modern_industrialization/recipe/materials/tin/unpacker/nugget.json -6d2a4db43fae64cb315c8c75fccac55e2e1c054c data/modern_industrialization/recipe/materials/tin/unpacker/raw_metal.json -8c48e75bbf9ceb1c8183cf2805e8c2da72405b4b data/modern_industrialization/recipe/materials/tin/unpacker/tiny_dust.json -3ef786dcfaf2c507e200372ae2b8319d28c4b9c7 data/modern_industrialization/recipe/materials/tin/wiremill/wire.json -56a5df06e7f9014f5d5518b2060deb40cd991cd4 data/modern_industrialization/recipe/materials/titanium/assembler/barrel.json -4954787fad19de2c38560dc1a67fff596e25f2e6 data/modern_industrialization/recipe/materials/titanium/assembler/drill_head.json -09cab3f7e0b06def1b67f9ae567f21b47c8267c1 data/modern_industrialization/recipe/materials/titanium/assembler/gear.json -de6e7efca04da96b5cf918dbfbc8eb70b235f26c data/modern_industrialization/recipe/materials/titanium/assembler/rotor.json -da619c2ed7b35a1324992f8a8607effbd7333a7b data/modern_industrialization/recipe/materials/titanium/assembler/tank.json -0c35c2531ae9bec9963014691c462548ab2fd0de data/modern_industrialization/recipe/materials/titanium/blast_furnace/dust.json -3137eb111b097d393db832351c9fd998e447cb3f data/modern_industrialization/recipe/materials/titanium/compressor/double_ingot.json -0fc1ae642ea0d9de9eab7581dabdd7b36353d005 data/modern_industrialization/recipe/materials/titanium/compressor/main.json -df5a40f614a969a6a7eca88dc6344d6279b54263 data/modern_industrialization/recipe/materials/titanium/compressor/plate.json -38f9f4c8320724060e31d81f632ddcb9304d2e15 data/modern_industrialization/recipe/materials/titanium/compressor/ring.json -88317cd3df8bbebbe71907da1bdaa58c2dfda6ef data/modern_industrialization/recipe/materials/titanium/craft/barrel.json -7207dcf3c9c5a7fb1ea12ec0252e0bf4278dce53 data/modern_industrialization/recipe/materials/titanium/craft/blade.json -49c8754a0bd8c287cd8253ba502bd50c5bad27c4 data/modern_industrialization/recipe/materials/titanium/craft/block_from_ingot.json -945e8c46349ee63802132dc9148039f7225210b5 data/modern_industrialization/recipe/materials/titanium/craft/drill_head.json -26cf20bd2d1aaa4701d7bdcdb0c4f069f1d96e37 data/modern_industrialization/recipe/materials/titanium/craft/dust_from_tiny_dust.json -2d40d03763686748c0d0eb9e52b7dab0e9706247 data/modern_industrialization/recipe/materials/titanium/craft/gear.json -aa675585f3e162bc09c64bc76da6f4d7831099f0 data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_block.json -6a7cb31d85222162b8b75d09ab55f56ea97f5a42 data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_nugget.json -9b66618860f2d1ce39787459cd81630f41745b13 data/modern_industrialization/recipe/materials/titanium/craft/large_plate.json -1e4a64e6351dd21a8172b6f6a46a2a6a5d53fe6c data/modern_industrialization/recipe/materials/titanium/craft/nugget_from_ingot.json -582af4c3112db0ccc52dc11f8d4afa5b9703ff71 data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_block_from_raw_metal.json -79605e3a5107b563e601ff0bc971928fb201ce1a data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_from_raw_metal_block.json -865a2b8db25e73b0a7e58204491b31e0c4e796cc data/modern_industrialization/recipe/materials/titanium/craft/ring.json -196e2903641a346ef2190ed2b5158505407df338 data/modern_industrialization/recipe/materials/titanium/craft/rotor.json -584fbb53a1864f94e9516c33127d0ba1458fc37b data/modern_industrialization/recipe/materials/titanium/craft/tank.json -2720998ba2d609598bce5703d8bc8784a01f7db5 data/modern_industrialization/recipe/materials/titanium/craft/tiny_dust_from_dust.json -77bec4d4fc86e0bb5a3798724bc821b2160dbacd data/modern_industrialization/recipe/materials/titanium/cutting_machine/double_ingot.json -a97486cb2d4bef53c285ef6a775bc6b4e01c618c data/modern_industrialization/recipe/materials/titanium/cutting_machine/main.json -5ec337ce8cca5237893e7ee687bce98285eb0753 data/modern_industrialization/recipe/materials/titanium/cutting_machine/rod.json -484232b097be1d79850728449d2d7e22fca51cb4 data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json -aff9cdc648467d1c9067248df91fa0f8b9479e69 data/modern_industrialization/recipe/materials/titanium/macerator/blade.json -72b8cddaf42544e329508251b7e09c54d7e2175d data/modern_industrialization/recipe/materials/titanium/macerator/bolt.json -b754cf49f0d047bfcae97ea8b5b742dbeeb76bb9 data/modern_industrialization/recipe/materials/titanium/macerator/curved_plate.json -15a66544b90aa2282c90b978a0bb3c15358b42f1 data/modern_industrialization/recipe/materials/titanium/macerator/double_ingot.json -216943a0cce7b7c7b7af7433e90058b21c8c93e0 data/modern_industrialization/recipe/materials/titanium/macerator/drill_head.json -90a20f62854393038b8c2592920cb8ac93940f0b data/modern_industrialization/recipe/materials/titanium/macerator/gear.json -d6f5d0d42c0ee26859606b19d533b926a868fb52 data/modern_industrialization/recipe/materials/titanium/macerator/ingot.json -a5a36152cfff8281fcc77950e21886a565e279d4 data/modern_industrialization/recipe/materials/titanium/macerator/large_plate.json -2c99c3613e81b2c345ec714f04ea764aef5eff28 data/modern_industrialization/recipe/materials/titanium/macerator/nugget.json -a4a48e6ae098307737b94887b499758ba67019db data/modern_industrialization/recipe/materials/titanium/macerator/ore_to_raw.json -10b230f5e1c79122476361900e1a7daa89effde2 data/modern_industrialization/recipe/materials/titanium/macerator/plate.json -d197be037905e7942ac309d2db3b9e7780648c78 data/modern_industrialization/recipe/materials/titanium/macerator/ring.json -693e078af3af80e7a9bfcfe7732689e8ba596899 data/modern_industrialization/recipe/materials/titanium/macerator/rod.json -c173558d608ccebabc9211807c9cdf6d1cf6fe1c data/modern_industrialization/recipe/materials/titanium/macerator/rotor.json -0668d5394aba2adf03f78dc0f35fab599628b6ae data/modern_industrialization/recipe/materials/titanium/packer/blade.json -f8a0e0433a12725da39a7493ec97636d9a78dd66 data/modern_industrialization/recipe/materials/titanium/packer/block.json -a806dea1d9f5321d61857781d9bce5375808f55b data/modern_industrialization/recipe/materials/titanium/packer/double_ingot.json -a6fe6aac50f4eb8f3111890621abc8edb50f7d7a data/modern_industrialization/recipe/materials/titanium/packer/dust.json -9eaf9b2c1850d63860619d381d7839717962d792 data/modern_industrialization/recipe/materials/titanium/packer/ingot.json -1d3355a68ddf77bab546101083cf0289d50abc06 data/modern_industrialization/recipe/materials/titanium/packer/large_plate.json -6938fa1f75489e296d70435b3b4b703b3bf2c81c data/modern_industrialization/recipe/materials/titanium/packer/raw_metal_block.json -654bd5d7fd374086c0c8a43277472370e1f8c79b data/modern_industrialization/recipe/materials/titanium/unpacker/ingot.json -5f945b69f1b2fefa8e088bdbfa1649b9bfdf7f16 data/modern_industrialization/recipe/materials/titanium/unpacker/nugget.json -6ebce2710c21235382ca1a50e95c8c4a807e82a7 data/modern_industrialization/recipe/materials/titanium/unpacker/raw_metal.json -76b9d10a7f1b0be29ee1702354a1e0cf083172d3 data/modern_industrialization/recipe/materials/titanium/unpacker/tiny_dust.json -7cd9579238572d86404b629977fc97d7ff969366 data/modern_industrialization/recipe/materials/titanium/vacuum_freezer/hot_ingot.json -3026c805b4e3c9d4350d324036e38bedf360b96c data/modern_industrialization/recipe/materials/tungsten/compressor/double_ingot.json -2bb0129048385f37b2f75a94551f7512b5465764 data/modern_industrialization/recipe/materials/tungsten/compressor/main.json -09920a64823e22f2310c0e062a11edeca308a4f5 data/modern_industrialization/recipe/materials/tungsten/craft/block_from_ingot.json -8eda171657c33d922bd72b7c72a6ebd0cd85794f data/modern_industrialization/recipe/materials/tungsten/craft/deepslate_to_ore.json -271926ad28065fb515f82f6897c7fb26e3dd407a data/modern_industrialization/recipe/materials/tungsten/craft/dust_from_tiny_dust.json -7b561cdffcdcf7d94745fcb21cb23a746b9641d3 data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_block.json -a6968bc36d98198f5e5afb5867b287a6b9208b52 data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_nugget.json -d8abbe9d0f49d0407f72ec5b8d29890a9d4414a0 data/modern_industrialization/recipe/materials/tungsten/craft/large_plate.json -c1650f12550bbec28cc127ea3634586d84cc5425 data/modern_industrialization/recipe/materials/tungsten/craft/nugget_from_ingot.json -b5e9d8b30626a819c2a1b05422253e7696c7ed7d data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_block_from_raw_metal.json -68be721b769d8e20450335d437489dd3274a6b73 data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_from_raw_metal_block.json -986cd9450aedd98a2e64f500c97aead76d924b2e data/modern_industrialization/recipe/materials/tungsten/craft/tiny_dust_from_dust.json -ce25777f7c723087274d5bde9d20db4f313b1edc data/modern_industrialization/recipe/materials/tungsten/macerator/double_ingot.json -7ec9edb29b557209bde57c786f22f1f9bba734ad data/modern_industrialization/recipe/materials/tungsten/macerator/ingot.json -f5a427fb54815eca64c259810264001237b28bf6 data/modern_industrialization/recipe/materials/tungsten/macerator/large_plate.json -eb2af54e5edd4e936f9ac0419857dfabd40f0cdf data/modern_industrialization/recipe/materials/tungsten/macerator/nugget.json -16d7f126c7a6b58c9acbdd646e6bef3db2896b56 data/modern_industrialization/recipe/materials/tungsten/macerator/ore_to_raw.json -36c54fc7eef705518b56dc114d4537856e379aaa data/modern_industrialization/recipe/materials/tungsten/macerator/plate.json -16b269d842596eb8a10c7415477099d0011675ea data/modern_industrialization/recipe/materials/tungsten/macerator/raw_metal.json -cfbeaf37b1ef0f3ab94a884143d6186b87e7a259 data/modern_industrialization/recipe/materials/tungsten/packer/block.json -9b36a19860a90bdcf948ba2dda361eacec0e3f10 data/modern_industrialization/recipe/materials/tungsten/packer/double_ingot.json -40942dcb0c5241c58b7cc1c426dd623b24f55683 data/modern_industrialization/recipe/materials/tungsten/packer/dust.json -dc6d3f4a2f697112f678b6ece23687bcb6240aca data/modern_industrialization/recipe/materials/tungsten/packer/ingot.json -3d80a5d4fc206db7b3b70866db2f2dfcb988b6e8 data/modern_industrialization/recipe/materials/tungsten/packer/large_plate.json -061b30e2c9992067b5c849e61400178891ef868d data/modern_industrialization/recipe/materials/tungsten/packer/raw_metal_block.json -6879cea0b800863b0d776c7dde3f09986dc85595 data/modern_industrialization/recipe/materials/tungsten/unpacker/ingot.json -15091263ef961050965a8b95ce6d76fa869c8057 data/modern_industrialization/recipe/materials/tungsten/unpacker/nugget.json -1dcefc3787103176689215d15be8b0a528fd64ac data/modern_industrialization/recipe/materials/tungsten/unpacker/raw_metal.json -54ce6d0d4979274bba6ba6ebe8bced62c8dc25e5 data/modern_industrialization/recipe/materials/tungsten/unpacker/tiny_dust.json -7ab6315b293d9f6712d622fc42a4ec966530975f data/modern_industrialization/recipe/materials/uranium/assembler/fuel_rod.json -33d0dc3a7a484f53d503d8aa297b7161a622b220 data/modern_industrialization/recipe/materials/uranium/blast_furnace/dust.json -c971a4c72db3c76b7fe0aec592b922f15bdc345c data/modern_industrialization/recipe/materials/uranium/blast_furnace/tiny_dust.json -cae4a87a20f7430bdfca489ead29f6b168139647 data/modern_industrialization/recipe/materials/uranium/craft/block_from_ingot.json -dac136dbc310c99e3923ebdac607de2cb3879b6a data/modern_industrialization/recipe/materials/uranium/craft/deepslate_to_ore.json -9038dc2e50e16924116d06f151d79db344a8e1fc data/modern_industrialization/recipe/materials/uranium/craft/dust_from_tiny_dust.json -ca9739915383bfadd76bed47df55257d4c216107 data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_block.json -369ae808c01c7ef45fb75edf957852bbafdab077 data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_nugget.json -d56d324577135ec7c5f20da0a85d836744117d4f data/modern_industrialization/recipe/materials/uranium/craft/nugget_from_ingot.json -49f980bfb19e2d591ab48d6e7d0c301d4b1cc78d data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_block_from_raw_metal.json -18860eb367e945c3f7246f1b87714733e1e2e10d data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_from_raw_metal_block.json -18254bc3d7bd0e4fb08bd91221c5d1434b4c747e data/modern_industrialization/recipe/materials/uranium/craft/tiny_dust_from_dust.json -c5b4d3a2ad4b33f8b15316a07a6c20b59a60cad3 data/modern_industrialization/recipe/materials/uranium/cutting_machine/main.json -4184a42d9dda9234595876265c15e668f8aebcc5 data/modern_industrialization/recipe/materials/uranium/macerator/ingot.json -ad4e165a78e1854ca157e33f45d24c1a08899bb9 data/modern_industrialization/recipe/materials/uranium/macerator/nugget.json -d71066b2230df7e2699cd83705752abae1fcd3ea data/modern_industrialization/recipe/materials/uranium/macerator/ore_to_raw.json -885f9eca07dd980717cb48f5fff86231c5d45dba data/modern_industrialization/recipe/materials/uranium/macerator/raw_metal.json -eb9bbb56822151c625efc56fbfa084bea016b1a7 data/modern_industrialization/recipe/materials/uranium/macerator/rod.json -b41400dd80c351a58df099a6af241c0eed37c705 data/modern_industrialization/recipe/materials/uranium/packer/block.json -c5f6da9d193a20cfec08b388d5f5d1c35b6f8c79 data/modern_industrialization/recipe/materials/uranium/packer/dust.json -0d282874870edff8a34eb174972b15937cae0032 data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_double.json -a5ce6ae591c11a35ae37766eee8c5f1c6b1cf898 data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_quad.json -9f02e946265be4836c48a4a5d3a914dba38dfe9a data/modern_industrialization/recipe/materials/uranium/packer/ingot.json -c1f27749c25e8c7db1095a66e52912e2318da01f data/modern_industrialization/recipe/materials/uranium/packer/raw_metal_block.json -35a64aae845ecfe9012248d0d74fd4b2e778bf1f data/modern_industrialization/recipe/materials/uranium/unpacker/ingot.json -294e8a613864fb22cded67f5600ff46c4898445f data/modern_industrialization/recipe/materials/uranium/unpacker/nugget.json -e5927e4fbe8a39295f9ff31596ea6ea37618902f data/modern_industrialization/recipe/materials/uranium/unpacker/raw_metal.json -f6b22313ceab562521d0b71c3d570375e5f09d48 data/modern_industrialization/recipe/materials/uranium/unpacker/tiny_dust.json -ea4c651ceb10fe07f00284ad7516a5925a4334c0 data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/dust.json -b670fab54178d39456d96f58603db7456b4f5bec data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/tiny_dust.json -1b19606b410c075f49be5e8e0da5d6f9c0add618 data/modern_industrialization/recipe/materials/uranium_235/craft/block_from_ingot.json -bf2b39dcfb864c1c2f57d239a49b65e9b0c0b3ac data/modern_industrialization/recipe/materials/uranium_235/craft/dust_from_tiny_dust.json -6160ac8b136baa90affee6e0d7c97784cbe1747e data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_block.json -b6c250726353a0469faaada206d693e30336ff3b data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_nugget.json -a6b501e5cf115a7ccdd78ee0d438c49a10ba0bb7 data/modern_industrialization/recipe/materials/uranium_235/craft/nugget_from_ingot.json -eea1da5808a134b9661572c43d029d53675c39fc data/modern_industrialization/recipe/materials/uranium_235/craft/tiny_dust_from_dust.json -7df5f612b5762cb89bc4e3996c5e2cf2985c8d69 data/modern_industrialization/recipe/materials/uranium_235/macerator/ingot.json -62a81cfee3da69887b81c5dd52c991bbc823a5b5 data/modern_industrialization/recipe/materials/uranium_235/macerator/nugget.json -207001bfc80acea78f7d75db2c5ad79ff6cca0e9 data/modern_industrialization/recipe/materials/uranium_235/packer/block.json -2f5287d8bac39a77dee07a23d245f94feb76c507 data/modern_industrialization/recipe/materials/uranium_235/packer/dust.json -ec25de38400f055fc745f731d37756c66e88a5b6 data/modern_industrialization/recipe/materials/uranium_235/packer/ingot.json -de364b7d719c2bac8e93f46b0e730a8b1f9ed0ce data/modern_industrialization/recipe/materials/uranium_235/unpacker/ingot.json -644aee2b8431dbe785243bb17b017b3ca3726920 data/modern_industrialization/recipe/materials/uranium_235/unpacker/nugget.json -7a56cb772e9657b0b8cb05726259324562b125df data/modern_industrialization/recipe/materials/uranium_235/unpacker/tiny_dust.json -f7442ee73965415941fc5ed6d9273e5627503da2 data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/dust.json -215bbcbefb9885dcb565232723a40b31bc9e0371 data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/tiny_dust.json -351a1555bb394633ac59f18b1dd7ae1f40244ce6 data/modern_industrialization/recipe/materials/uranium_238/craft/block_from_ingot.json -21feedd1ab086d7fb803cd3d6fd4a6e0dcec0124 data/modern_industrialization/recipe/materials/uranium_238/craft/dust_from_tiny_dust.json -8b307c4b5ac919c91e05d1058156979195d9118e data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_block.json -e76a4027f9ebec7bd99800e400409156459fcb7f data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_nugget.json -91bd351286a36a967163951f4d1a6170eb173f8c data/modern_industrialization/recipe/materials/uranium_238/craft/nugget_from_ingot.json -249dd342efe9ca7be8f702b1a3d2f26ba3118ed1 data/modern_industrialization/recipe/materials/uranium_238/craft/tiny_dust_from_dust.json -13b31a172a9fc3c06970adf4f0290fd93d33f5d1 data/modern_industrialization/recipe/materials/uranium_238/macerator/ingot.json -fadb31c53259cbcc05f9f56443c18ae1b2a01d3d data/modern_industrialization/recipe/materials/uranium_238/macerator/nugget.json -a95d3bbf63ff7eea37ccb8a84d6d093b43c3babd data/modern_industrialization/recipe/materials/uranium_238/packer/block.json -f0768d0a52ad3644edc9172abaaadcb5746c5a50 data/modern_industrialization/recipe/materials/uranium_238/packer/dust.json -4f00c004efb7cbd9cad7d9bbfe7fc0b53d904962 data/modern_industrialization/recipe/materials/uranium_238/packer/ingot.json -2399c954f77a5cb02a1dd66df91965983a245645 data/modern_industrialization/recipe/materials/uranium_238/unpacker/ingot.json -f595935b2e9724a34644543f4d63d42e019552fa data/modern_industrialization/recipe/materials/uranium_238/unpacker/nugget.json -8aa81128d629c07ba6f4d8356eb3753c28b55171 data/modern_industrialization/recipe/materials/uranium_238/unpacker/tiny_dust.json -b7e78ac9dca4ed60ddf520a2f03c708bcfb2aee5 data/modern_industrialization/recipe/materials/yttrium/craft/block_from_dust.json -ce50130f48286ac28e908176a08bb3d63090b382 data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_block.json -ed043a6d5e2cfd6e80610b55c029aac1135d6790 data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_tiny_dust.json -5738d9d84a3e582e9e4fe5c382526487552ff672 data/modern_industrialization/recipe/materials/yttrium/craft/tiny_dust_from_dust.json -180b3442750c3b2e63df75790e0545a2ab88bfd5 data/modern_industrialization/recipe/materials/yttrium/packer/block.json -7bec7ec755b17df3914d071d094cecb557090331 data/modern_industrialization/recipe/materials/yttrium/packer/dust.json -03dd62d9a908d055a134637350762a091f8fe16a data/modern_industrialization/recipe/materials/yttrium/unpacker/dust.json -760bc9d8ab988c8cd8ef5ce81105e954dac15ae4 data/modern_industrialization/recipe/materials/yttrium/unpacker/tiny_dust.json -24b172a878ed13758d35c939ca3666e29095d5f5 data/modern_industrialization/recipe/packer/stripped_wood/acacia.json -a081bfa2112c266031380f51ed8d934adc6f0ba1 data/modern_industrialization/recipe/packer/stripped_wood/birch.json -912b1c0d1d1492a7925c05b0f18f76eaea3067fe data/modern_industrialization/recipe/packer/stripped_wood/cherry.json -e3f7308379261ad00830003cc5c85f8efb233e76 data/modern_industrialization/recipe/packer/stripped_wood/crimson.json -eb43f188c0c23e216b26efc84d7a87a5d4741918 data/modern_industrialization/recipe/packer/stripped_wood/dark_oak.json -95b62d966184e130d144b883f34eb16bbf38deab data/modern_industrialization/recipe/packer/stripped_wood/jungle.json -cda4dcab7b32a861556247d0b338430c46494c5f data/modern_industrialization/recipe/packer/stripped_wood/mangrove.json -e50fdbb2e36aa391636b2cb168e0b42309406943 data/modern_industrialization/recipe/packer/stripped_wood/oak.json -1570bc88fa3ef85a3807336f279ee8f5d03603a4 data/modern_industrialization/recipe/packer/stripped_wood/spruce.json -9ea68069e67fdaab867a278d3b35db3603e90403 data/modern_industrialization/recipe/packer/stripped_wood/warped.json -da6473781adf02b21166ab232977ae7329632b6b data/modern_industrialization/recipe/packer/wood/acacia.json -c59d19968ca4a6d27732d820117e6a3f17afe7bc data/modern_industrialization/recipe/packer/wood/birch.json -41497e7c3ee4bba5c3d002c1ed8e9a8b373b5750 data/modern_industrialization/recipe/packer/wood/cherry.json -f629a7f63ea941a57826cc7d9afbc194922038fd data/modern_industrialization/recipe/packer/wood/crimson.json -87452bec5b70eb564a346cf4178db553c9bd41a1 data/modern_industrialization/recipe/packer/wood/dark_oak.json -d1578671646390617983d21465b9ff112af9758a data/modern_industrialization/recipe/packer/wood/jungle.json -da555ccd2c574215650e08029ddeeee0a82aa5a2 data/modern_industrialization/recipe/packer/wood/mangrove.json -5b3a2fc0cdd8e07c515706242c77130c14e26c89 data/modern_industrialization/recipe/packer/wood/oak.json -c5a8cdbd31db5c3dca7305f09c82bec2236ff944 data/modern_industrialization/recipe/packer/wood/spruce.json -4c1e9e8a1ae3372bb0821c17fe9a4c5820311970 data/modern_industrialization/recipe/packer/wood/warped.json -13f5450abfb71de61dfb7524b453d39331e1d22a data/modern_industrialization/recipe/petrochem/distillation/crude_oil_0.json -68a8fcabd71f3bada9d8a0ea1ec91d2b1951d7e5 data/modern_industrialization/recipe/petrochem/distillation/crude_oil_1.json -3d51bc34798dfb0b932143833983aa4f4817e683 data/modern_industrialization/recipe/petrochem/distillation/crude_oil_2.json -2151e4d63b5366c96b6dd3b4d13c139903cad4f4 data/modern_industrialization/recipe/petrochem/distillation/crude_oil_full.json -a477a20fcb6ce78a58d305173f1c95fc7a3fed0b data/modern_industrialization/recipe/petrochem/distillation/shale_oil_0.json -c04aecc30ae7be0e79297199a09cd7cd266353a5 data/modern_industrialization/recipe/petrochem/distillation/shale_oil_1.json -caaee68cdf8d906c03a94c0eef696fd05d6af694 data/modern_industrialization/recipe/petrochem/distillation/shale_oil_2.json -938bbd1d999db73a4b12d49f82e303135e91f342 data/modern_industrialization/recipe/petrochem/distillation/shale_oil_full.json -bdbccedaee5e7368adcefc8f2fb8b752812ab128 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_0.json -3bba9f8b1c4033bc1b6b6d06e68a406dcbb780bd data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_1.json -d1a6b2fad95e17ceb186ed860f71721b02148fbc data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_2.json -d1c3926c15fec1dd3833689906e02a3fa4019423 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_3.json -f48635a15660810a0cd47f825d8f41166cba16af data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_full.json -eac03074d2eb60084fbdf8b9c894a5f09526314f data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_0.json -6d88bd6cdcd150249f45c60c5343527da0c4d514 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_1.json -40b331d24b823f11d3e1021722c9efb271c63d75 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_2.json -09b04234de0603d4852b47195072e6efc3a6a8a5 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_3.json -09c2392f16702617ca9c30366a2a1d17227a6fdf data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_4.json -aa51b882a3e9d54dbef9e2ccd967c0d2352f30bd data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_full.json -158f6064f8b1d71e21627ec75f40df577b52ab16 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_0.json -30d8739729ca87230bf169a23f29998eb7e911ec data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_1.json -6e02bc9b8dcbd0bc3bca8df6b2330f50f82c3b83 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_2.json -f85e92dbebd1b8fe59726b33f2080669286bcbcc data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_3.json -da23fff3b18a4b242d5ecb9edf21440246899fc1 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_4.json -8068152ba6b9dd324cdcda7dd337b40d192285b1 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_5.json -12f409435ebc455716d599c5c121c62bf00f6d2e data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_6.json -23c93e4b28882a5c2f97a18138167b4a0ed9c35d data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_7.json -ba2ee70e3e135f1e7467cf456e08f092a64cb1dc data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_full.json -f94fde21570e92d8f542f633e22f47f84b3ab642 data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_chromium.json -34aa75281dffc0a9ffd092b20093dcfc335b3cc9 data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_lead.json -900ac3c087b0f7788a145f6f0e35d2eaad65942f data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_chromium.json -071004c96bfc1c2e1b9f550d4c61e13368a6f10e data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_lead.json -c7b39f97675ebe406bb0138f0b10379e75448166 data/modern_industrialization/recipe/petrochem/polymerization/ethylene_chromium.json -d3c16d5b6008dd30c7e6cbefb9b520ad4e6b4c42 data/modern_industrialization/recipe/petrochem/polymerization/ethylene_lead.json -5defd3c9a52efa2b32b799515a310e7784e98d7c data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_chromium.json -c3c9bed8f46329688d5c7c061414cab4dc3924ab data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_lead.json -20e14c204bc294a666fca65f9054d6dbb95df15c data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_chromium.json -c9b7966f5d6e6c348036703c3a25297e89487073 data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_lead.json -f9a1479e27c26646bbd8d05c06f07688bbc43902 data/modern_industrialization/recipe/petrochem/steam_cracking/heavy_fuel.json -22921d61e9d04ab54658adb679a6e3e34a3012a6 data/modern_industrialization/recipe/petrochem/steam_cracking/light_fuel.json -1ec491cc97c8724ae6309a330623dd8ff496020e data/modern_industrialization/recipe/petrochem/steam_cracking/naphtha.json -4616b056ca24d047d912b65dc1b6a80c57c00d6f data/modern_industrialization/recipe/petrochem/sulfuric_purification/crude_oil.json -2245328ceb1bed20cc9286b229cff82c2bacaf1e data/modern_industrialization/recipe/petrochem/sulfuric_purification/heavy_fuel.json -c7c4349431d59e310891198e00ad0f11c083e600 data/modern_industrialization/recipe/petrochem/sulfuric_purification/light_fuel.json -7004dc6ba39e8061e2457fa5282d5dad9340a87d data/modern_industrialization/recipe/petrochem/sulfuric_purification/naphtha.json -fce5cad13c671a995ba1720325b5a01ba98aa164 data/modern_industrialization/recipe/upgrade/craft/steel/boiler.json -b1497d404529fe778a4d6e575bcfe4afa571e60b data/modern_industrialization/recipe/upgrade/craft/steel/compressor.json -af5430fffab4f05ff1b3ee07233503d432fa6555 data/modern_industrialization/recipe/upgrade/craft/steel/cutting_machine.json -abee0751d48e55444b716780108467ff22c4d2f8 data/modern_industrialization/recipe/upgrade/craft/steel/furnace.json -658728f5be69db28e3d2381dc932a7dd2dcd5dbd data/modern_industrialization/recipe/upgrade/craft/steel/macerator.json -8014ac7872e1f9df59a20dd687c2ed67afaa681e data/modern_industrialization/recipe/upgrade/craft/steel/mixer.json -6d13ff2aebbf64f3bc5fb6a2751d7fac211e22ac data/modern_industrialization/recipe/upgrade/craft/steel/water_pump.json -4aaba970eeb2e16d0c61935020e8f13adf44b31c data/modern_industrialization/recipe/upgrade/packer/quantum/boots.json -55a5164674087823a5e9b4c7171ad4795ebc2afd data/modern_industrialization/recipe/upgrade/packer/quantum/chestplate.json -a60ad1f46332452fb587cec5c8896ead6d09880b data/modern_industrialization/recipe/upgrade/packer/quantum/helmet.json -04449c2db0a55e4fbeeea9d8c12f32bdd1cb94d6 data/modern_industrialization/recipe/upgrade/packer/quantum/leggings.json -db817b980b1c7833987f40d14f332cdaa8ff343c data/modern_industrialization/recipe/upgrade/packer/quantum/sword.json -edb5c4ae253366a63ca412aa49a0068d3d81da53 data/modern_industrialization/recipe/upgrade/packer/steel/boiler.json -3af7994e9bc56f206c2c56f45bbbf45e3cf80e14 data/modern_industrialization/recipe/upgrade/packer/steel/compressor.json -a9a6e88c602482a2156b3f99f98727a358e5219e data/modern_industrialization/recipe/upgrade/packer/steel/cutting_machine.json -5f803fccd560a35ff110b153b18aff7a1b5fd52d data/modern_industrialization/recipe/upgrade/packer/steel/furnace.json -176531a4f2f80e9b389f006999e223fc94d6c9a7 data/modern_industrialization/recipe/upgrade/packer/steel/macerator.json -d172e8606a59cd2ec81748d405d04ba94df57489 data/modern_industrialization/recipe/upgrade/packer/steel/mixer.json -d70bd3f2f8578d65df020b3d9c9d2aa09f68723c data/modern_industrialization/recipe/upgrade/packer/steel/water_pump.json -631569d75681da7f0b3a46bd9c56f18ff1eb4b74 data/modern_industrialization/recipe/upgrade/unpacker/steel/compressor.json -23a79aba53dad8053a70c06a667742dcabb39402 data/modern_industrialization/recipe/upgrade/unpacker/steel/cutting_machine.json -f37285eb6fa33f6ede740186556d6a21d14786b4 data/modern_industrialization/recipe/upgrade/unpacker/steel/macerator.json -123b70878233b9658f3d12ee44e1599f04b214e0 data/modern_industrialization/recipe/upgrade/unpacker/steel/mixer.json -fb66ea83678954fd6c05e14dd4b9a3a005795ff3 data/modern_industrialization/recipe/upgrade/unpacker/steel/water_pump.json -8860fe0f5f25672fcf2c549c3d7bdcb51cdef8c4 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/copper_block.json -ca9f41d568a34626d52ed46b0b9879512c0354a1 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper.json -5dfc268f52953e7255e67c4484cbf2f5137503a1 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_slab.json -93873f70fae6b4dbd709a8b6366f9664c0e0316c data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_stairs.json -d3f285da426b59aa329853f1929b6c6a80798ec2 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_copper.json -5708fab9fe7767b510627def6135ba7d6d7e4c70 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper.json -6648128ac2c108e3f09ad47321d93430b56f0f26 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_slab.json -ef7dd82f1c0384186dd78d8b476d54d4eab35744 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_stairs.json -2142fce8e7fc4e7bf342b439d544db6c3d1c21ba data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_copper.json -e6d83af6ab7dd8706da66bc25473c3e97d09f9e0 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper.json -d643046a3875a437434ebc7c4f3919605dffc9f6 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_slab.json -16d5127985ecd29e3bdec388d46920ec77f158df data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_stairs.json -a2141b949b00ca477251043e14cddb395a9e7fa6 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_copper.json -24bf8ca3ac6c52badc7fcf706ff5a5e700ecfccf data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper.json -565179fccce60321843775dc8d493b1f15938a19 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_slab.json -9ba0f63c2c9fa71f62755c2e3d5c4203c326f174 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_stairs.json -8757b88dc60d6c177a41ee9557d154273126ec47 data/modern_industrialization/recipe/vanilla_recipes/macerator/stone_to_cobblestone.json -82dfc1d6d8c91ab24208072431b677aac1d8d320 data/modern_industrialization/recipe/vanilla_recipes/oxidation/copper_block.json -ad59720619a692bf04bfb8552bcb97177af5bd26 data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper.json -39b24a38ae5d2201a8b898c8a65b108e2e6bfec1 data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_slab.json -3fb872f8537386316b8a00dcd193ea9955482075 data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_stairs.json -5cb480c3ea3f0b6e6da4fec4a556430022cefef1 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_copper.json -91e1de425687625fe0ddcedcd232c24761d5e328 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper.json -99e8ce4af117e79c57a70ad262975b192df36394 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_slab.json -e5ee4aaf54e68bd6175fcd19b0b9801933bbdd44 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_stairs.json -2dc7fe501aec13547bf46e0733efdb5812efac50 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_copper_block.json -90fd02930271bc001e4e2d0c7b4ba883cfdc0840 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper.json -25efcdf2f7b1bf21bd977d8a967e1b19fefd1a6d data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_slab.json -e2a0e31eb93fc70d4e488cb343a3e2499f4011de data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_stairs.json -7aa773462a22ab05cb05e97116bd6b2c40e71ad4 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_copper.json -c735fa5d53b88402e140704c9870b680003a7c40 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper.json -f9f7be33300645abed5d9fc0009baee41f079a5b data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_slab.json -d2e295ea88ebe370cb2d660e88ffaff3ca1c8bec data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_stairs.json -e4e0bc79ab4c4ca4cd568059355bfe6c233fb5eb data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_copper.json -af9dcbe41797c889ccfaa62938496efde6159421 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper.json -a8777a11fe5438a3082e07a5d5e9c0bfbbb7b743 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_slab.json -178e728e477d75e4cc64ab91407f92e007216c8a data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_stairs.json -2704f3dd5939d5f810827bae47ea51e38554ce11 data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_copper.json -a3c98251ba404ead353b3fc6dcef280548170f7e data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper.json -094e36b6577fcda4cd36eec114059eeb03064f7f data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_slab.json -52ede682fd78d54d42fcec2549f7fad9d2d9eb56 data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_stairs.json -8c1a9d1ea1b453ddb5177f84ae9f9f0dd787a092 data/modern_industrialization/recipe/vanilla_recipes/waxing/copper_block.json -e214436841265181ef45604f051f3677026161ba data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper.json -62a8b096ca35989f5dc7a55d9f48868c17a8744d data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_slab.json -80eec82ee52abfa5fe1cba8c642247b8e572f0d9 data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_stairs.json -b1b93eb74c8cc2d49db9c3a62ae7c9cfd118c8b7 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_copper.json -d465a0f62b4d204f852b67c485965e8c4fafce69 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper.json -1cebb3254846f0985f5dad38ff6c2b3104aeb6f2 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_slab.json -cc562c97a0fe338aa6aa838d13f15226211155f1 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_stairs.json -0f785cad09805bb99f9c28cb0385493d7865c155 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_copper.json -cceb19a8804a48ce14fc692027d7a877a4dd7a48 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper.json -f753d695864a4aa446e7e03241f7c2d2f40d87a0 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_slab.json -3859520a3a5ed1a2aabc0c1b54655aa0bebe20c1 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_stairs.json -86f4461f53d24aff9dc85ea7385874cfd83c3cd1 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_copper.json -4e03c9225ef683e463bf1409e9ba40f267717bf3 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper.json -fbfeb3094201c2b2ad9b47cc387ff23f41a6b120 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_slab.json -1279e1624baca20ca2330e10b263a33bb2b20fa6 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_stairs.json -1f8b08000000000000ff8dd6bd8a23571845d1d27f771be3f771ecd8e1e4f22083f04cf7d052e4a7f7f4e0adc0986f55c10d04fb06b510c5795996e7657fbbfe7dd92dcbf2719e3acfcbd3e5f57ebd5f2fb7e5e3795e8e7f7c79fbfcd7ed6559b6df7fedbebdddbaf47876cbe1763fdf2fffdef8bf66b3a2d9ae68762b9afd8ae6b0a239ae684e43b359e15333f9d44c3e35934fcde45333f9d44c3e3593cf76854fcde45333f9d44c3e35934fcde45333f9d44c3e8fffd98a66f2a9997c6a269f9ac9a766f2a9997c6a269ffd0a9f9ac9a766f2a9997c6a269f9ac9a766f2a9997c0e2b7c6a269f9ac9a766f2a9997c6a269f9ac9a766f239aef0a9997c6a269f9ac9a766f2a9997c6a269f9ac9e7b4c2a766f2a9997c6a269f9ac9a766f2a9997c6a269f1fef0d9f1aed9f0d7c6ab47f36f0a9d1fed9c0a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e0feb158df68f7c6ab47fe453a3fd239ffd0a9f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fdb3854f8df6cf163e35da3f5bf8d468ff6ce153a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3f3bf8d468ffece053a3fdb3834f8df6cf0e3e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff27978af68b47fe4d3d1fe91cfe31bbca2d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fed9c3a746fb670f9f1aed9f3d7c6ab47ff6f0a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed9f037c6ab47f0ef0a9d1fe39c0a746fbe7009f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe39c2a746fbe7089f1aed9f237c6ab47f8ef0a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe4f3f8b6ae68b47fe4b35fe153a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47f4ef0a9d1fe39c1a746fbe7049f1aed9f137c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a7e6bf3ea76fe72f97fbfdf2f2f1ce4fcbfef7f3d7cbf2f3d7ebebe5f3fbf9cffbafe7ebfbf7fb3ffd76be9f3f5dde6fd7b7d765f9e5b6fc0305bd0c7672480000 data/modern_industrialization/structure/empty.nbt +// 26.1-snapshot-4 2026-02-03T21:47:16.5420397 Server Data (aggregated) +79aaf560072c506ef9367e2cc6a6179d6a48948b data/modern_industrialization/advancement/recipes/misc/armor/diesel_jetpack.json +03aedda192248ddd98b4042115f4462a3257d1cb data/modern_industrialization/advancement/recipes/misc/armor/gravichestplate.json +14ea933ffd327d9bb3b007fbb9db1cbf173bcc84 data/modern_industrialization/advancement/recipes/misc/armor/rubber_boots.json +9bd5dbbae37da71530fd6755d7bf51b1c697476c data/modern_industrialization/advancement/recipes/misc/armor/rubber_helmet.json +ded2d7f353c89325fdc059f02541b6b140369e92 data/modern_industrialization/advancement/recipes/misc/electric_age/battery/cadmium_battery.json +848fb19f2286dedb7f55d237a578080362eb2eb9 data/modern_industrialization/advancement/recipes/misc/electric_age/battery/lv_battery.json +d1d603349c740d37da69acaa94b1e37132a82f86 data/modern_industrialization/advancement/recipes/misc/electric_age/battery/plutonium_battery.json +d4feaf0a55a15c2accf8cb08df50d28df9de6e55 data/modern_industrialization/advancement/recipes/misc/electric_age/battery/portable_storage_unit.json +c521509b88067568a8a08154938d1f58aeaa397f data/modern_industrialization/advancement/recipes/misc/electric_age/battery/silicon_battery.json +24458fca4e5b6b3d85a26341faacd6ddadfc23ed data/modern_industrialization/advancement/recipes/misc/electric_age/battery/sodium_battery.json +4378ce2097423ae4b9b3e3b3e3bddea8c19f1252 data/modern_industrialization/advancement/recipes/misc/electric_age/blocks/fusion_chamber.json +667cce36f975950d130171e85e934c42493cda4a data/modern_industrialization/advancement/recipes/misc/electric_age/casing/advanced_machine_casing.json +6ade8709ffadbb741136d5b3e0b811eebfc8b533 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/blastproof_casing.json +d3c7ff1ac601cb0f63d761a963fbb5428a8fcf8e data/modern_industrialization/advancement/recipes/misc/electric_age/casing/bronze_plated_bricks.json +4396d918137a6f4deea299b5c0228cb3d36ca39f data/modern_industrialization/advancement/recipes/misc/electric_age/casing/clean_stainless_steel_machine_casing.json +5b8ffb1b97751c8184463de33b38cf16a2321518 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/frostproof_machine_casing.json +063e525e0a3b3bf7bc8c913cf66ec22e0feeaf4e data/modern_industrialization/advancement/recipes/misc/electric_age/casing/heatproof_machine_casing.json +67d8ea990a3b93bccb7cd0afaba3ca9f2c77c385 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/highly_advanced_machine_casing.json +3d3e8710450782fb376ac48bcbe840db53447a85 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/iridium_machine_casing_pipe.json +dff9ed7ca197cd805f49f5de39a67a8464abab5e data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_casing.json +11863823686126e8d2a75e45b35eacbf84d92b3c data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_fluid_hatch.json +bf4b83dcf9ee67e72a4f77550f434113d3041020 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_item_hatch.json +376299b96fdd506832a33fcdccece57a7b7d3901 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_pipe_casing.json +ed55ba0b1b92699c702f1b576174a39b403c3790 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/plasma_handling_iridium_machine_casing.json +d86a8b84b9ddadec6b4707fe9466be27eed6e9c8 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/quantum_machine_casing.json +e06c34c919e5963380c34c3ca0e85d87471b2ccc data/modern_industrialization/advancement/recipes/misc/electric_age/casing/solid_titanium_machine_casing.json +7559b7fdb1fff665f7f31b2a6d5d91334e90241b data/modern_industrialization/advancement/recipes/misc/electric_age/casing/stainless_steel_casing_pipe.json +8c2206320aafdf906a9fef5c2f58e268c12add0a data/modern_industrialization/advancement/recipes/misc/electric_age/casing/titanium_casing_pipe.json +851b28c4999b5cb8737bcced9f7aee3a9e1f0207 data/modern_industrialization/advancement/recipes/misc/electric_age/casing/turbo_machine_casing.json +a3abb4ce0a26aae861c272af0769baf7537d19ba data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/digital_circuit.json +e7f8e03dcf08ce5c29b723f2e811e1384c09331b data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit.json +3cb556caeab7265f57bfb9af1d52a3867a4628aa data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit_board.json +dc8b3b0aff5a15bb74bc753a66463d77880760b4 data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit.json +a80c435ad821a96e194c913ab366e75c168349fe data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit_board.json +3461ea1ed2706647fa79e35345845e7c5c622493 data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/processing_unit.json +be4b43828aa10621a39ebaf0e919376cc72af2af data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/quantum_circuit.json +e265c70b5c8cba666c76624268a71bc77da89302 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_motor.json +83b33e3c32394b23f77b52b6fa878b9f970f0f29 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_pump.json +62e2b8c880b67d2b6212c52533d454b9a226409c data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/air_intake.json +843b36d41a7c082e57b6be8ab4ed3108f1359da1 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/and_gate.json +9adcbe496221b603777ef577d36bdc9e002c7be1 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/arithmetic_logic_unit.json +e13b5c10275d78a2388085a5bf2878d4f37c755b data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/capacitor.json +2e77bc316fe431259ff9535f1ca6e509c2ba756d data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/conveyor.json +d7d86f81a8513cdc2e9e7ba9a994eca6331ad5e8 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode.json +15d258ddf0992cddd053b7963da7d8c887db8343 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode_doped.json +608a9503138dcf9f9faf31613ddef507d8467f89 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/inductor.json +9f8cc93961ec1101b36614423d2221be8e4fe787 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/invar_rotary_blade.json +a65a9320ffe389a4beaa652f166078c7936f8bc4 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_motor.json +6e071e1be44d1f98cdfb9da9e8da27e7f319d76b data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_pump.json +90b01c641ae61733ecbb9edb7253628a5323c68a data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_heat_exchanger.json +58087c730918b3b4d6251757d38c4f98f03f987b data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_motor.json +474c4a83673add5721acd9cd49f076a4d00c1f1d data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_pump.json +b47c5c5cdca30ec674b93049faafdda78fe74e65 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/memory_management_unit.json +ef94361127cff7e229e96bad999f71df1e1dc918 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/motor.json +70098b0ebd42fdde446640ef888b4c48705f825e data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/not_gate.json +882d6ff3da4bcce99c6ac8f69365749debc20f0c data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/op_amp.json +4f3e95fb8daf7e538ee95f7ce724766642222a4f data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/or_gate.json +e6892cff200afadcc848dff3276ab94ff92a6242 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/overdrive_module.json +92a1d60bc2255f7e03ea2c5bd6d74e217a4b9d56 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/piston.json +a66bf24395d2c78f2ca366134810ca30157aea94 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/pump.json +8353d68fe4eb4e30e2bfd5faf26a45795b4075ac data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/redstone_control_module.json +350f1ddbadb0b012716f66123d3d3854475ae7bd data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/resistor.json +1da67e92f3c897338a18a76ef33ec2457f0eff11 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/robot_arm.json +1c8b8099c1d9367094ccea16ed85003adcf7b6b4 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/small_heat_exchanger.json +6864e2ef15ee0c34ba90052e1c6733f1cb26ba43 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/steel_rod_magnetic.json +810826f569045f3470159bb66e5f051b0cb8986d data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor.json +63293aa92fd9a8293cf33f3cceacc475d6e74c9c data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor_doped.json +06f982323260c0bafbf3f1864d2e200fe8025da6 data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/ultradense_metal_ball.json +01b3b85ccaef15b595fdcc8e7d7c525c3f992d36 data/modern_industrialization/advancement/recipes/misc/electric_age/hull/advanced_machine_hull.json +6f1205bf6086c96bcd8305651ad1c03e120bd605 data/modern_industrialization/advancement/recipes/misc/electric_age/hull/highly_advanced_machine_hull.json +392f346e3258623f57df23da0b683d7464d0318d data/modern_industrialization/advancement/recipes/misc/electric_age/hull/lv_machine_hull.json +9ebbb990ab19088d9ac302aedfd020086d526f6e data/modern_industrialization/advancement/recipes/misc/electric_age/hull/quantum_machine_hull.json +514f4c892200de37ba1fce4e74ec395e5f3406e7 data/modern_industrialization/advancement/recipes/misc/electric_age/hull/turbo_machine_hull.json +8ed3716640ff3a26dee85472690c7f91bd504ecc data/modern_industrialization/advancement/recipes/misc/electric_age/machine/advanced_large_steam_boiler.json +f22ba21b65c9f5d25053061885a4425e717a904d data/modern_industrialization/advancement/recipes/misc/electric_age/machine/assembler.json +aeafbf171df4c700579a0fd250bbb344a2056ce8 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/centrifuge.json +2626ea26b5e256e2c57f7c38ee35b7493c2b40f5 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/chemical_reactor.json +61f2934685d2810e5119e5b4ffe0217dab80c872 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/compressor.json +2545f4999f5f3eb919f82d78b1acf3f69a961946 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_chest.json +19cb8ad92cdc87334e891e378a22506210ff0145 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_tank.json +57cf8bb3c3fe8967d082f92c705dd93fbd227337 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/cutting_machine.json +757c13ba9208bf3f4474b65c08a1a3d8683e3814 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillation_tower.json +ccf82eed87e61bebfdf6f1752e0fd2d1097ab283 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillery.json +9ceae90b2dd7ff05c7f58b0cd0c021dcdb31ac32 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_blast_furnace.json +823a9ab4a9c632a79d29caddd4d4a46f10b97890 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_quarry.json +c0937ccc29d3e271fbe95dce6df621eac71f3577 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electrolyzer.json +a0e005dc6d298bf5abce75eb9a7fd0507d7d7529 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/furnace.json +478a7f0bef564db6dc86edb12c049e9b8ef3ab4f data/modern_industrialization/advancement/recipes/misc/electric_age/machine/fusion_reactor.json +f91a6ff453c4e56952b68120a8b51479f172ac0e data/modern_industrialization/advancement/recipes/misc/electric_age/machine/heat_exchanger.json +64ef5a63df849c29aab811b8fc4022ccafb856ae data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_advanced_large_steam_boiler.json +9d365629db16257e36205d7360bbe40d319bcfd2 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_large_steam_boiler.json +af74290e82b1f597cfe2c1048c3d66481c88bfa1 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_diesel_generator.json +a2846a3536ab7533f56ee19be2b01fb3c6167819 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_steam_turbine.json +2283d3a6202684241f2dbc4cc010da9d94d90c8e data/modern_industrialization/advancement/recipes/misc/electric_age/machine/implosion_compressor.json +10787b18cff0368b940d28925b882ffb9c7ed166 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_diesel_generator.json +f498f0d91acac8877d37bca5b331b82a25d79579 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_boiler.json +28bd8fccf155fad456873c93f93bbb6d98ac605b data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_turbine.json +9af3a111ec2a638bc7c20b4f8e016d232bd0f6e8 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank.json +870ac6bfd40095f81ba6708116111b3a3143e361 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank_hatch.json +daa0d1643e8aab319131a42ddc9453040e4556cc data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_diesel_generator.json +d3d7b7b8fc9083c8540e08704afbe88bffd0a7ee data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_steam_turbine.json +a348ba1cb54dfcef6225af58f04e9df421a14483 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/macerator.json +609ef714540c4e0c20ddca8af6be8f701cccbdda data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mixer.json +aa1705eaa10da478d3ef2ff65af33bddad50be60 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_diesel_generator.json +3b2c6a89cd14acc4e593311a0221a2d167c402ff data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_steam_turbine.json +7c1796eb9557d8ef8540658572d9d468d5e68d66 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/nuclear_reactor.json +156882aa86a39f9b42bdecccc1c4701d2a1f1c92 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/packer.json +a2a31cfa33816d0a52816dbcb662697d7722f027 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/plasma_turbine.json +e56a5078ecf6382b0cc7618cf3a24cd7ab7ad16c data/modern_industrialization/advancement/recipes/misc/electric_age/machine/polarizer.json +e8128b12454b781f98e31dcea0b7da85428bdf18 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/pressurizer.json +e913397d6c1f4329a85a45601ac4a39eaeec4bed data/modern_industrialization/advancement/recipes/misc/electric_age/machine/unpacker.json +1528eb1430ca2fb261db390e3148e2b9c44b35a2 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/vacuum_freezer.json +ecf51e8dd14c463a6876801074be9e4dc19c7e4d data/modern_industrialization/advancement/recipes/misc/electric_age/machine/water_pump.json +b3d1846be0fd8dfc55f67dada8ce5c81fed61574 data/modern_industrialization/advancement/recipes/misc/electric_age/machine/wiremill.json +32bc58d19b331d2ba56646cfc855cfc99ae3d620 data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/ev_storage_unit.json +79cc3d3d108ed87032c9592c6f10da70f16d7eb7 data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/hv_storage_unit.json +7fbdbe959a215ac7a282b65c6bd872e28485c281 data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/lv_storage_unit.json +b1752ac6d20ff9f48669f3ea6dcf3fc8da525997 data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/mv_storage_unit.json +d00c02e9df9a59e04320467cdb58b76ff1a31001 data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/superconductor_storage_unit.json +2586a6e35c45ca0b703aec94b0be6c7e425c264b data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down.json +4f075c491e348ccf70144c8dcf5a6b9074fbece4 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down_to_up.json +2ad836f351afd089641822aa62fb934c7a7758de data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up.json +ceea822bf0d8faa5125fcc9b3223adfd347574e0 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up_to_down.json +8f0f1d79922d98c537867da90395f8d4db5a5c27 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down.json +2f97f426e67054021655e7714d40b7f965f31520 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down_to_up.json +4bd91b0affee63e15146a6da184b143f7435823e data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up.json +d393c7922c59fa9e6559a873d46480fcebc512a7 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up_to_down.json +b8e1accd13ef644207a7c180e8dd8fa41c41684b data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down.json +d61db6a26a9620b10a12ab3f490542de0bd5320a data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down_to_up.json +e8415a347bae221ee533e7def8ef4af805f1f3a5 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up.json +56a92f4c1584c3b52e2521d0016d67c55c530f22 data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up_to_down.json +79eb8d75a5f2efbcba9801789847e203697623fe data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down.json +ccb1092cbd6c601c54ee1a3cccb196b89a1c6fbd data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down_to_up.json +59c6de2b036f7ccafde7d67a51871d884417676b data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up.json +43f5f272c60630abeff24d387fac09e97658d48b data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up_to_down.json +efaa18f17aa2469bd4365564a0c1ba47015eb27c data/modern_industrialization/advancement/recipes/misc/materials/bronze_dust.json +2467d59346c14e76971c10e2f802b9ab4e34786d data/modern_industrialization/advancement/recipes/misc/materials/bronze_tiny_dust.json +3ec0e496e7c6d78157b02145fcc071b19ea85bf6 data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_bricks.json +2a82b1064c0ccd4e37feb7a28fb513a859d8bbef data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_dust.json +d5be0b8560845c0bb2ef82a7f9cc205e4ae3299d data/modern_industrialization/advancement/recipes/misc/materials/uncooked_steel_dust.json +ca038716b338e5f524ca42d2a0f5acc403dcd84a data/modern_industrialization/advancement/recipes/misc/misc/forge_hammer.json +8f44938aab03204260b0c031506454e47a4c053e data/modern_industrialization/advancement/recipes/misc/misc/guide_book.json +82cb1f6f216f14205418a9b8ed60ec43281da1ec data/modern_industrialization/advancement/recipes/misc/misc/packer_block_template.json +da30dd32883933661b23f5ada456009ca56d1b54 data/modern_industrialization/advancement/recipes/misc/misc/packer_double_ingot_template.json +d24380e9f50083809a197a5e92b1c3b09de6832e data/modern_industrialization/advancement/recipes/misc/misc/trash_can.json +64744b1582c7d2d3e5aa914f86cbc48b89620ad7 data/modern_industrialization/advancement/recipes/misc/oil/oil_drilling_rig.json +3c92bd830f9efdabab4470d854373e9c9181d8d2 data/modern_industrialization/advancement/recipes/misc/quarry/drill/aluminum_drill.json +ff4b02f3628b50d02d820dbf6ccf5c58b7b1dc14 data/modern_industrialization/advancement/recipes/misc/quarry/drill/bronze_drill.json +9d29443fd95b8226fa476372281cccd0b929daad data/modern_industrialization/advancement/recipes/misc/quarry/drill/copper_drill.json +ae5c88f5d0983fc3042a05aec30626710c3a859f data/modern_industrialization/advancement/recipes/misc/quarry/drill/gold_drill.json +943e47e9a07cb729405ab42fee7479f0db209f6e data/modern_industrialization/advancement/recipes/misc/quarry/drill/stainless_steel_drill.json +b263cd7a56a026ee32a87db5156e5824984a2231 data/modern_industrialization/advancement/recipes/misc/quarry/drill/steel_drill.json +cbfae488392c05ea403cb7b8892405e5dc787a08 data/modern_industrialization/advancement/recipes/misc/quarry/drill/titanium_drill.json +78c77066435995bab5558019d347428ad0d79d61 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/boiler.json +2dad19938136c3ba1b100d09eb89354a985711d4 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/casing_pipe.json +da6b734c18693c531c62a483ab3f984de1543614 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/compressor.json +609c43a4454ed3a4aca79340cd9ea958e80fc2bf data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/cutting_machine.json +3d2b9a78f151f80be4039644e00d12ee27a8ca1a data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/furnace.json +b9d6461dd40f925b901badfc589585e1bf186670 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/macerator.json +f28651056b94ec22c347d54dd6fe12f86ca91e98 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/machine_casing.json +25b5a1bbc35b660c084276afedeb692290b7f518 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/mixer.json +af9a14395d5c01d1cefc5ccadfacd9aa6f436d15 data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/water_pump.json +4170774ccda49295e98fd48c4c584bbbc323cf95 data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_fluid.json +0181163ff829adcd1418f0800fde81d0e636b5b6 data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_item.json +4cb89579cba8e9d0a64c543fb9583b993fc05cf8 data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_fluid.json +214f1081ace27a9612534f7cdf65bd0601182223 data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_item.json +126373480adee0597afb2f64eb97704073c86aeb data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/coke_oven.json +0998cc44dbec2d85168b662fc533f9b174a487e2 data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/steam_blast_furnace.json +49339026c6050338e8d120fdb6877a85ab7a74e5 data/modern_industrialization/advancement/recipes/misc/steam_age/fluid_pipe.json +f7e1167e5cdc2e444270c731a139ef200cdc6c00 data/modern_industrialization/advancement/recipes/misc/steam_age/item_pipe.json +0e84b3cc5d2777f1a6b4f03bfd62ecd7b74c2acd data/modern_industrialization/advancement/recipes/misc/steam_age/steel/boiler.json +5010d3afd7d3abec68d52aa67abcbbf363cba4c7 data/modern_industrialization/advancement/recipes/misc/steam_age/steel/casing_pipe.json +75615b8cd301ac4a19a1ee1492e6ef3fbdd1acce data/modern_industrialization/advancement/recipes/misc/steam_age/steel/furnace.json +8e46ce8df00b405381640bfd07a553abb31b6c19 data/modern_industrialization/advancement/recipes/misc/steam_age/steel/machine_casing.json +d8d2fcf7d993b7d4b7ba08132a3d7be0255d9034 data/modern_industrialization/advancement/recipes/misc/steam_age/steel/packer.json +8f9489741b68a9a97ebe641799fad4d40fddfbb3 data/modern_industrialization/advancement/recipes/misc/steam_age/steel/quarry.json +da0c1e228b176136739ff5d3aaada5686251fe0b data/modern_industrialization/advancement/recipes/misc/steam_age/steel/steel_upgrade.json +8ec589ac001272f2f69c1c84d9da9425010e29a5 data/modern_industrialization/advancement/recipes/misc/steam_age/steel/unpacker.json +6f475b381731774bfc5dfd05aee6869b3c1b1617 data/modern_industrialization/advancement/recipes/misc/steam_age/steel/wiremill.json +7b1a028955f1cfdeeba0dea7d3f19c66a50325a7 data/modern_industrialization/advancement/recipes/misc/tools/config_card.json +ddb8d36840c2ccdf0748d24e8df4a7ebb6b87546 data/modern_industrialization/advancement/recipes/misc/tools/diesel_chainsaw.json +e2f90982c4dc6a2a4a781aad79b7e0f0667ab7f2 data/modern_industrialization/advancement/recipes/misc/tools/diesel_mining_drill.json +b75e5ffbd555f72cd6f336bb8e559938d19a01b7 data/modern_industrialization/advancement/recipes/misc/tools/steam_mining_drill.json +492d817017d40592e611a19c67f40be96992c837 data/modern_industrialization/advancement/recipes/misc/tools/wrench.json +0cf474c2221145c49b73a610ba58139960133470 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/blast_furnace.json +f13903df4ba7bde17036392baf2c4ac662e06d8d data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_boots.json +9aaf3e20f2f95d033a310c237136a1f8d9c13496 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_chestplate.json +6b854c949ebf45dd12d124478eb358deae445a14 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_helmet.json +d996f74e54799068f1a4356e6155016356b213e0 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_leggings.json +87689ecec72db49fd0b75361dfbdc20d8765d702 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chains.json +6ef9f9c19ebf5872e5362f1006dae4f6d8705a28 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/clay_uncrafting.json +3053ef495861d49c7f80384b8affe9aa8b3c87d3 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/easy_chest.json +02614708afec83adf0bda76a0ae01c3e95ccc01b data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/lignite_torch.json +d5340c0fb93f219a11dfd17a4cab66458c9df9a8 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steam_bucket.json +41ea69283bb71ea81a6ea53db28ba5b092420354 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_anvil.json +e124e211ac6bf5895a7e65b08322a46400aa2d77 data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_forge_hammer.json +b43e36dd636cdd06f56bd6f3e4e8a7a15aa7afdf data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_hopper.json +7ac971d09eff03a67ffac2ba99ef1a902b92230f data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/torch.json +cfbcd0789bbbee1ae6b83fc05f7d08a2dfc5d349 data/modern_industrialization/advancement/recipes/tools/tools/smithing/netherite_hammer.json +2d83be39a930820ce89fcab6263ad194ca2aa2e4 data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json +1f2f7b34dd38e3aeba53251f634ef762b9401472 data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json +31125aa45ec39d922ee66824378ae7ac1e113685 data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json +02ab24e3d987b78587e4be4ecbcd88e638a2619a data/modern_industrialization/recipe/alloy/mixer/bronze/tiny_dust.json +3f0a2e56bc06795e97aecf80f9e7769f8810f3e0 data/modern_industrialization/recipe/alloy/mixer/cupronickel/dust.json +dbceaf76575ded87eb342fac6a192a505352e47c data/modern_industrialization/recipe/alloy/mixer/cupronickel/tiny_dust.json +c47132f358c89860bef2f5d359939dc5b1201856 data/modern_industrialization/recipe/alloy/mixer/electrum/dust.json +7a11712c774d462d93ec54da07f15b9ae7f19a2d data/modern_industrialization/recipe/alloy/mixer/electrum/tiny_dust.json +da6d066fb3ec0f3bb17ec781076da4e7aab05957 data/modern_industrialization/recipe/alloy/mixer/he_mox/dust.json +fca44d29368986e2a1b46d652c8672479d557983 data/modern_industrialization/recipe/alloy/mixer/he_mox/tiny_dust.json +639480f157ab0b9580543a6fd1e7b3f14d384d5a data/modern_industrialization/recipe/alloy/mixer/he_uranium/dust.json +b7f610b0e1a00eb862c0075e48976645166b9acd data/modern_industrialization/recipe/alloy/mixer/he_uranium/tiny_dust.json +81251ea5889eab0da346876688890cb75fc5c74b data/modern_industrialization/recipe/alloy/mixer/invar/dust.json +a772f556793bc11082284851f3f1cea5e66827d6 data/modern_industrialization/recipe/alloy/mixer/invar/tiny_dust.json +035c1759cf6e7683b0b8be9e80d56f30a79e4b3e data/modern_industrialization/recipe/alloy/mixer/kanthal/dust.json +63e17031a6abb1886149fdd758b4efb468078af8 data/modern_industrialization/recipe/alloy/mixer/kanthal/tiny_dust.json +ef3a7fe43b9169d36f51b8ecb94867b8305a35d2 data/modern_industrialization/recipe/alloy/mixer/le_mox/dust.json +942a49fd3106d45b28696445db4fb323e76299ba data/modern_industrialization/recipe/alloy/mixer/le_mox/tiny_dust.json +c747417b288c096baf6c0e2158337ea6949d84a5 data/modern_industrialization/recipe/alloy/mixer/le_uranium/dust.json +97fc992de4bcfd70c9944fd7a08465259c5821ad data/modern_industrialization/recipe/alloy/mixer/le_uranium/tiny_dust.json +617cc17cc43738154b753318d7f7fcced5e4d1e6 data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/dust.json +bb6bbcc86fa2860e2cc9c48e26f6ebb5c5ca5e36 data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/tiny_dust.json +5eac8eeff68a3c0d50801989a7fe76028d277f5c data/modern_industrialization/recipe/alloy/mixer/stainless_steel/dust.json +25505d989b37651341ae7aeafcd72b8dd309c1e6 data/modern_industrialization/recipe/alloy/mixer/stainless_steel/tiny_dust.json +b44623fd04ee504713be1d89fd07906488b7a50b data/modern_industrialization/recipe/alloy/mixer/superconductor/dust.json +ed16f1650220804a9d60ed515ebca43248bdcef5 data/modern_industrialization/recipe/alloy/mixer/superconductor/tiny_dust.json +8671d23fefc8a7f1c2aa69466aa60a7adfd4d3c9 data/modern_industrialization/recipe/armor/diesel_jetpack.json +e69577754de054d750dee87379ee1ab0fa0384ff data/modern_industrialization/recipe/armor/gravichestplate.json +94fb4efe700961fcb43c381d9541096fce9a0b6d data/modern_industrialization/recipe/armor/rubber_boots.json +19835e0b80ffaddd3e782a8c8ea791f32e80a016 data/modern_industrialization/recipe/armor/rubber_helmet.json +ab2d953d459fa34d380831bb05aa6fbb0e040969 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/cadmium_battery.json +5550b60e56f440661d63cdcd586d4ae201f7c8ab data/modern_industrialization/recipe/assembler_generated/electric_age/battery/lv_battery.json +76910726db4b46b0bdfb3e20bd32d4988d6106bc data/modern_industrialization/recipe/assembler_generated/electric_age/battery/plutonium_battery.json +59f90275f1f5625a2aa0d218e87d4bb50339d8f2 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/portable_storage_unit.json +682ef31b49db6f55a28ea65fd9ad1528653f2818 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/silicon_battery.json +0d1070b28348a651a7e5d478e1840175b712ffa9 data/modern_industrialization/recipe/assembler_generated/electric_age/battery/sodium_battery.json +082bd6739a9ce95da88a096fa8da7507ba8cbe6e data/modern_industrialization/recipe/assembler_generated/electric_age/blocks/fusion_chamber.json +ff86a522a059b553525f14a7b2fd56cf9dcb7b16 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/advanced_machine_casing.json +85bfd338fd7f0940917292ff6fe7cdd5af234f96 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/blastproof_casing.json +92d1211134679c5f034cd43e5663cfd5974d36bb data/modern_industrialization/recipe/assembler_generated/electric_age/casing/bronze_plated_bricks.json +540df8d2a138d51e047d52adb7851bfe61ad43af data/modern_industrialization/recipe/assembler_generated/electric_age/casing/clean_stainless_steel_machine_casing.json +f35bf5568d621ef1398d7da5443c4db51a6104cb data/modern_industrialization/recipe/assembler_generated/electric_age/casing/frostproof_machine_casing.json +1666a20061806924d42935895003650520974c6e data/modern_industrialization/recipe/assembler_generated/electric_age/casing/heatproof_machine_casing.json +b1f0fac5d1ccb3df867f98d4f5800826abff086c data/modern_industrialization/recipe/assembler_generated/electric_age/casing/highly_advanced_machine_casing.json +6bbed4e2da3db718a114d0e7998784aee174efa9 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/iridium_machine_casing_pipe.json +732fdc1df4983cb2e1f80b8b969775721378f43c data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_casing.json +ed68fc75a492ddfbd86d69cce2a16c393fc8f484 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_fluid_hatch.json +9edda2c0a1b8086f8c8db8b62f037b422d9deb57 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_item_hatch.json +230a5e1ce593ac1f7f4d821e1167befa87533068 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_pipe_casing.json +fd877bb5d0c07af8323dc54cc9d1e4d8fc228f6b data/modern_industrialization/recipe/assembler_generated/electric_age/casing/plasma_handling_iridium_machine_casing.json +f626427f143440478faea68f7f7580c75deb870e data/modern_industrialization/recipe/assembler_generated/electric_age/casing/quantum_machine_casing.json +d21c84b53894827fe1cc86b6d891a807593d5edb data/modern_industrialization/recipe/assembler_generated/electric_age/casing/solid_titanium_machine_casing.json +ea354d58718f8bdc0332249e70cfccf213755e1d data/modern_industrialization/recipe/assembler_generated/electric_age/casing/stainless_steel_casing_pipe.json +b534d30100fc7f6b7255c69908c3cebcc56e4598 data/modern_industrialization/recipe/assembler_generated/electric_age/casing/titanium_casing_pipe.json +d193afdee98eec3de0c53ba9f7877b65818f7aaa data/modern_industrialization/recipe/assembler_generated/electric_age/casing/turbo_machine_casing.json +dab3dc4e8811556efdde080a664b329faf49f011 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/digital_circuit.json +fef266847e8a3064b87b37e202df5f3e73d90682 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit.json +5191e5ff8fb7e0d1b4f09d7d27526132037e604b data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit_board.json +1c2341cfc4eec8f7b37a81ca6cfeabe03d285478 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit.json +cf0feb67b3243d4b0821a919ce004cc9a6f7d018 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit_board.json +29eefc04fef4571a904c76e6be361de1b8f295f1 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/processing_unit.json +2bd1c1d58d5dbc20c1e70a0f004da42599a7ad62 data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/quantum_circuit.json +810621c0ddbd2d1f38c0e51f6f236c041be6bb7d data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/advanced_motor.json +6e20b5dc02618ff3118a276f3a8b921850dd7833 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/air_intake.json +20907572e6e639c4bc453311be48df149cbbdebd data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/and_gate.json +fe33309bddd0436e246af3c13080066d32e2acee data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/arithmetic_logic_unit.json +de0183b717726a9c15da205374f2a5fcb27b311a data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/conveyor.json +c616f11dd25869106d71b31d2bc8b1dc8ed11876 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode.json +56c2a29e684ece3f62adcd35ecb1b711f8401a9b data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode_doped.json +d81075b088817d966134a4e300cdebf550255125 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/invar_rotary_blade.json +db45fdddded8fee2948968d81bf4cd0f3f38646c data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_motor.json +c8413e7c7345879b1d65dcb276a175546e5b154b data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_pump.json +d538c9b1b956864c808d77ddd590b3a55450eb73 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_heat_exchanger.json +3a5e9d48862b3e2758915890038c99781a80194b data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_motor.json +5fc3e0cca585dd87d1a6d80d3e9fb229939fb1cf data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_pump.json +4e50b2990a89c7fe68267f6c9e32eb45ed132176 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/memory_management_unit.json +9a0ad560a576519b0ade8150ca9af965253f3928 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/motor.json +bc5e391723c9c4128e1a736e3728b22c9e9da9f6 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/not_gate.json +da5ce0a51ed99bc94a4bc798ca00fd4bee421c2a data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/op_amp.json +1d6e70b15b2bc49e91f1e94ae3a84a67a77937e6 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/or_gate.json +3442838be53cb53676281b6174926d02a4d1b55c data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/overdrive_module.json +cd34454b30623bd15d198fc697a0bbdf0372eb6a data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/piston.json +e3a62a9607a63f42e7ccbff29af19a7c349296ce data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/redstone_control_module.json +3f57a5fe6f143c009a3ef80bbba3876fa954362b data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/robot_arm.json +6f90422eb6a8c536d17076200778ad1ed00678d8 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/small_heat_exchanger.json +e426ae9ec9e250eda01ca701a5e4b9e9c0eb62bb data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor.json +052b04054c18b7943f41f1bc2f740efe9cf449fd data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor_doped.json +57d15cfc2bc9d0134add8864f16ccc57a48f7f41 data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/ultradense_metal_ball.json +09b788bda21327d2769e19f9d4af8930b4d8774d data/modern_industrialization/recipe/assembler_generated/electric_age/hull/advanced_machine_hull.json +c894387f2b6abeb5b7fdf095a6b5759ffd211b84 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/highly_advanced_machine_hull.json +e650419f74abac91b52815e3b448b9238fa80642 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/lv_machine_hull.json +042626c80e660ebc03d1d8b3ec39e3b21650c44e data/modern_industrialization/recipe/assembler_generated/electric_age/hull/quantum_machine_hull.json +3618f1037fd47ab1446d1300a439b5f3a20d9c40 data/modern_industrialization/recipe/assembler_generated/electric_age/hull/turbo_machine_hull.json +b30586c15d2d0a82f36b97462841f162d3478085 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/advanced_large_steam_boiler.json +406aeb47fcbd2c55217af768541bf8baa6546536 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/assembler.json +53bfa4f577e4213dd70844ad7b5f4218dc6be45a data/modern_industrialization/recipe/assembler_generated/electric_age/machine/centrifuge.json +6477519c205c4160647577af440d107fd85dd5f0 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/chemical_reactor.json +54e2d148707e53a3d181228f83678dfedfb01a87 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/compressor.json +eb17cae07792d561f4cc2ee866b251dc2ec4b61f data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_chest.json +17cac1981a6a4664be852eee0c574fdbcfd66e76 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_tank.json +7e25f26ec9de56b6c21a26b7f664c67e749e075c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/cutting_machine.json +357a1145889a9d5c2fe530e9540dcbc9db3faeb6 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillation_tower.json +69e4bba60307bca5e17d2c8d2c9ec29731830bcc data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillery.json +3ba41770b0ff7d2d1e7970db0ba198872a04ea02 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_blast_furnace.json +516259d58bc86c1f1526377397897a632da9fe42 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_quarry.json +fe6e6274eaab986dcf5d4b44ad7f4417d61419df data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electrolyzer.json +846eacd3e31330b41efb31579f227f287d430f64 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/furnace.json +804a28cb4f0c547b6271f62ca10969e985fc9dd6 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/fusion_reactor.json +7cec9e1d43c36ee67e897068a01f8e43deecfd04 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/heat_exchanger.json +cc9780694714bff82a7cd466a42e1027fc15a700 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_advanced_large_steam_boiler.json +192d640cebffb377f1c18d6ac96f57b48d7fe8c8 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_large_steam_boiler.json +404ce8a78a67c0ef8b8bf29d3137baf8a66e79f1 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json +63922918f1563b6117d7725c280ded1537c2be6a data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json +c9195090b30a835546c4af32b73ae1b5f2404639 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json +d4d84d8fcb49559521503e0b9313bc5c2d6bbf8f data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json +cb9959b364bbc852ed6079cccd7df1c2cae1db78 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json +2a9d91bcce6124c4ef36d4e132f9c182ede1a0d2 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json +63d2bcb3396fcf8ff7bc18515d0c7547593ea4b8 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json +b1bcfcf98fe63861f054b5e4fb9ce4f22768090b data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json +855499439c9ce9e191be9ea8e361b0c6e6974de6 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json +dd1c22b36bfe4d0f3ae6ed92068bd297d46e781c data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_steam_turbine.json +17c183924c74cabb652ed2332589872b5fefe7e0 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/macerator.json +3b946d99585f168229627c76d3a96d92000b32bb data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mixer.json +357840f546c1385cd2c056a0967a1f42b05aaa21 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_diesel_generator.json +3e3f169ebfc66efa5b855b2b26205f10429ffe99 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_steam_turbine.json +e7b750c84d0d2e8caae4b7a68cec288493118c9b data/modern_industrialization/recipe/assembler_generated/electric_age/machine/nuclear_reactor.json +f3e2c8903b2d2ab1858b1b152c6b0b98430308db data/modern_industrialization/recipe/assembler_generated/electric_age/machine/packer.json +26d4e4ea8a6afabb9cc7ce0c208e0f604f9dd6af data/modern_industrialization/recipe/assembler_generated/electric_age/machine/plasma_turbine.json +78bc8991ea5ca03ecfaeb56da9782f54aab9c65e data/modern_industrialization/recipe/assembler_generated/electric_age/machine/polarizer.json +0eeec879dd32214057334052b75d4eedfe5289b1 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/pressurizer.json +db2364623dd6aae85783e4cfbd73ed280678dbdc data/modern_industrialization/recipe/assembler_generated/electric_age/machine/unpacker.json +20efc2b7d28d8ceb5931fd7b1acb46392066d2a9 data/modern_industrialization/recipe/assembler_generated/electric_age/machine/vacuum_freezer.json +2d8c69d8a0b2c810758d25d7cf3d98dbcf5f022a data/modern_industrialization/recipe/assembler_generated/electric_age/machine/water_pump.json +b9ea6786e0f394003bf4449cdd563f93d8ea140b data/modern_industrialization/recipe/assembler_generated/electric_age/machine/wiremill.json +150c1c2299c93203da3631464dc46351ee8873f6 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/ev_storage_unit.json +9d96978b5aff0ea728f9dab55640bfdef038665d data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/hv_storage_unit.json +148c8fa6fa1370798c6e1c8abdb3395ba0ee1f81 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/lv_storage_unit.json +588823b0c5b94b77cb8e444f3d9ea6acb849b262 data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/mv_storage_unit.json +160235903f43eff6192b75e55047eb14d1bb89da data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/superconductor_storage_unit.json +4c6693b8323482141ba5338cf50e21eb840a6dc0 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/down.json +ba6349f21b100afb6ec1627b0a8ea4bb616b0315 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/up.json +fb65b4b98bed0d77ca3ea896eb88ee421c0d15b5 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/down.json +5851b3e51b8bc0953d61a2c741fd21490aa632f2 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/up.json +2c169d389c974d0e8a30b5ccec838bf7c43a0067 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/down.json +1cb21770941f2334e3b621a5542272ae1a707dba data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/up.json +fa24d722a9a299e519ce04fff0399724fb4cdf67 data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/down.json +2144084c3bf1b30d18197ab39670b3333187864f data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/up.json +6ee982bd4ae0948475f7cd999e01caa2822532bd data/modern_industrialization/recipe/assembler_generated/oil/oil_drilling_rig.json +dc6d2ffcac9eff4ccc0aec44beaf878224950e12 data/modern_industrialization/recipe/assembler_generated/quarry/drill/aluminum_drill.json +070e12c2d27d7fadafe0599094c1c8d6679f54f5 data/modern_industrialization/recipe/assembler_generated/quarry/drill/bronze_drill.json +1fc0a7714599a89564cc67504e399173ae6ae004 data/modern_industrialization/recipe/assembler_generated/quarry/drill/copper_drill.json +4b6cf263a3c816153f4f87f3016fd94d9250d32d data/modern_industrialization/recipe/assembler_generated/quarry/drill/gold_drill.json +92b5edeae2b8476fce007a8a5669de3a77da48ab data/modern_industrialization/recipe/assembler_generated/quarry/drill/stainless_steel_drill.json +03bb69750e448c59cbc624c462e4082bce95e0c8 data/modern_industrialization/recipe/assembler_generated/quarry/drill/steel_drill.json +92741485df699c37024448a8c139330be7ac139a data/modern_industrialization/recipe/assembler_generated/quarry/drill/titanium_drill.json +68ddd8000f3e8c71da074562f626ab0e7ddaf00e data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/boiler.json +c586165a5c9cd834c6cfee4e3f745ece951d5d79 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/casing_pipe.json +053b05cf2621a9e8138b33d1d2b191e721cedbe9 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/compressor.json +caf0227eafcfbd263291a31fe811b3bb7d2b1913 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/cutting_machine.json +ea947a2c825ec0d1f3ee33f7f9541f31adcfbef2 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/furnace.json +6d606dab2c611249ed8bf385a79bbbed1fd0f271 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/macerator.json +9ec33a3c216449b381265b486595893617caf16e data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/machine_casing.json +08a52f749d2d29937204083860b9f3045d3f3ed2 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/mixer.json +ca53c08adda69a97f5cf7d275568d6d7bd6c8696 data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/water_pump.json +c4115ecb5a20c718da215b0fa14a2aca8548feb4 data/modern_industrialization/recipe/assembler_generated/steam_age/fluid_pipe.json +3aaa3cdb4ce2f5b9fe5f117a0067caf4c1095655 data/modern_industrialization/recipe/assembler_generated/steam_age/item_pipe.json +024a379304644f74696b1fc1e1a35f78139dd7e6 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/boiler.json +5e653b08a5824db18fedab4ac8df102d1a2d11dd data/modern_industrialization/recipe/assembler_generated/steam_age/steel/casing_pipe.json +65701cdc19c515a61fe31c3f8b4a5011fdfa3f09 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/furnace.json +ca73d0be5ee9ccc3ae4154f643fc0852b187a934 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/machine_casing.json +76bb6f600078652e5e27005160f218cfe40b0906 data/modern_industrialization/recipe/assembler_generated/steam_age/steel/packer.json +958313a79263ef8e26de0a7679803280879263ce data/modern_industrialization/recipe/assembler_generated/steam_age/steel/quarry.json +7ec58e6d06a0528915cd4dfd119322cd4f9c892d data/modern_industrialization/recipe/assembler_generated/steam_age/steel/steel_upgrade.json +65ccd59af0899afeb0c3f9aeb13db8ae3660bb3d data/modern_industrialization/recipe/assembler_generated/steam_age/steel/unpacker.json +a9e2d046db835bbfef8987a877094f21c3bc4d2b data/modern_industrialization/recipe/assembler_generated/steam_age/steel/wiremill.json +111f264769311661400a6e83741595322cb8f186 data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/blast_furnace.json +6526d745656b8e0c68c97f1f9cd62cb23c1a4979 data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_anvil.json +dcc784720afb0e4667e5125bd88a0db003013621 data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_forge_hammer.json +d037d28fa69398954da72f5ca6da9846ce291d4c data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_hopper.json +19da7059edd7eac7dd5289d5f4bc814f8e502d45 data/modern_industrialization/recipe/cutting_machine/planks/acacia.json +2f8137ea42d1fe6709ec4c2bccf971169af27929 data/modern_industrialization/recipe/cutting_machine/planks/birch.json +cfa12b577d3009a9690ddef3c390b0453ef8abc2 data/modern_industrialization/recipe/cutting_machine/planks/cherry.json +ae2b75d28508c5e8552a5a7dbfc3cb435e0c3191 data/modern_industrialization/recipe/cutting_machine/planks/crimson.json +d9cb00868909d40293f815090eba6a3d3d436f55 data/modern_industrialization/recipe/cutting_machine/planks/dark_oak.json +dcc14f067bcd5a39e28c269ae7f118796f02210e data/modern_industrialization/recipe/cutting_machine/planks/jungle.json +6eb9daff203818d0b77be205ddcdc7e66e12aab2 data/modern_industrialization/recipe/cutting_machine/planks/mangrove.json +b57a05dc297bc4813cb458c74b0ff4b069c62f7d data/modern_industrialization/recipe/cutting_machine/planks/oak.json +ea6fff2af9bcd5ba2892de31130c3cb4fc507f08 data/modern_industrialization/recipe/cutting_machine/planks/spruce.json +37a4335e8fc174c10e14878dbcb6eb0dfffdf76e data/modern_industrialization/recipe/cutting_machine/planks/warped.json +00ccea94de18d0c9ef5ce10dd6a608f20517bda0 data/modern_industrialization/recipe/cutting_machine/slabs/acacia.json +e0e6d92d708203c4c43e1352edcf2801f2d1e45d data/modern_industrialization/recipe/cutting_machine/slabs/birch.json +6ce158452c2237dc9a28bf6930cef7a390cf56d3 data/modern_industrialization/recipe/cutting_machine/slabs/cherry.json +90760bdd06710541e0d75a5b88cb0ead313a3db3 data/modern_industrialization/recipe/cutting_machine/slabs/crimson.json +bdf7f3bfaf9e20b5c3a1a1b8887fb025f35991a9 data/modern_industrialization/recipe/cutting_machine/slabs/dark_oak.json +0139eba6dadd43387b327f41125095a43e0bc410 data/modern_industrialization/recipe/cutting_machine/slabs/jungle.json +8171251db12e64fbb0ff4a34605be3676afe65a1 data/modern_industrialization/recipe/cutting_machine/slabs/mangrove.json +92539ee26b99a6103b8bd04fd30b58858422786f data/modern_industrialization/recipe/cutting_machine/slabs/oak.json +2ef2f62b5c098591638d047fe3534aafbea0ba09 data/modern_industrialization/recipe/cutting_machine/slabs/spruce.json +ecb7a9c43adc033ea639e695f9dce45b5088dcff data/modern_industrialization/recipe/cutting_machine/slabs/warped.json +2da97e7e8282c7a90afbb40ec46983627c8a4de1 data/modern_industrialization/recipe/cutting_machine/stripped/acacia.json +5351e3c1658745c2ce949e2cac308a886594f383 data/modern_industrialization/recipe/cutting_machine/stripped/birch.json +06bfefb975eb4e0c11c7696a872adec74321a204 data/modern_industrialization/recipe/cutting_machine/stripped/cherry.json +13f91a73b30ac789981c6dc00716b5647ca63d52 data/modern_industrialization/recipe/cutting_machine/stripped/crimson.json +363dee18e09a060d5f9a8f17807431a9858dab18 data/modern_industrialization/recipe/cutting_machine/stripped/dark_oak.json +75e3f866098d97af4232e03a1127a8a78b16ba24 data/modern_industrialization/recipe/cutting_machine/stripped/jungle.json +f851ae4414cd8b9a6f10e915a5e7cfb870d474c1 data/modern_industrialization/recipe/cutting_machine/stripped/mangrove.json +6ffb554e342f3317bc19b4e8baf6f832b34edd6e data/modern_industrialization/recipe/cutting_machine/stripped/oak.json +9290a385a023448323b1bc0f052f7e0973f57a32 data/modern_industrialization/recipe/cutting_machine/stripped/spruce.json +170c98b02d478459ba6ac1cfbe885923a5458c17 data/modern_industrialization/recipe/cutting_machine/stripped/warped.json +88068bcad362920560633c0a23187dda4afffe4f data/modern_industrialization/recipe/cutting_machine/stripped_wood/acacia.json +e67ee3910ca6685dde748036f28032d18504b60a data/modern_industrialization/recipe/cutting_machine/stripped_wood/birch.json +c7a79ffb1ef261f69e083219bf7327ee5ae95b1c data/modern_industrialization/recipe/cutting_machine/stripped_wood/cherry.json +6d2b3471a3d0afdf5b50a3246fc3a0fafd93c837 data/modern_industrialization/recipe/cutting_machine/stripped_wood/crimson.json +5f3923452549dbb993da1adfbec9a2ac4bb5ce40 data/modern_industrialization/recipe/cutting_machine/stripped_wood/dark_oak.json +f3db31900cd57d9ebad0bff32a5bfe924fc10424 data/modern_industrialization/recipe/cutting_machine/stripped_wood/jungle.json +b88078828f76d5bd162a9b177ee884b7021e1c2c data/modern_industrialization/recipe/cutting_machine/stripped_wood/mangrove.json +1f46cb37bc58d373a29b07555b05e49f429e7f35 data/modern_industrialization/recipe/cutting_machine/stripped_wood/oak.json +94de38c5ca9626357f7c8603878273d4ba21ebb3 data/modern_industrialization/recipe/cutting_machine/stripped_wood/spruce.json +ede94105981bb8c40e2219a99a877fa0f49da2d8 data/modern_industrialization/recipe/cutting_machine/stripped_wood/warped.json +e36384bd9754565f1aa3ef57d8f59d7cf8a3285f data/modern_industrialization/recipe/dyes/black/assembler/fluid_pipe_stained_glass.json +934e7b7a526cbdf631e86cad5bf5441f314eb208 data/modern_industrialization/recipe/dyes/black/assembler/item_pipe_direct.json +e1775bb5c13c1b0aadf9d92dddb2c7734bc9a476 data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_1.json +1719c4f5f97c4beda03432718a75e67b680cff33 data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_8.json +0a74f847a1d0e161c93ff16370981e401ff2ff13 data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_stained_glass.json +5e3e675924d027271d6d3387ba734ceb572c7132 data/modern_industrialization/recipe/dyes/black/craft/item_pipe_1.json +3643a0aadcc3f535dae7988c9319d4ca57474093 data/modern_industrialization/recipe/dyes/black/craft/item_pipe_8.json +f20b81081379301c0ef2cd6dc47b819d8affb5cd data/modern_industrialization/recipe/dyes/black/craft/item_pipe_direct.json +5fe201d4ac4e5498ef5740bbce03547511892fad data/modern_industrialization/recipe/dyes/black/cutting_machine/carpet.json +b0c1075a67f902a701e191c1ff0812a66ea0b406 data/modern_industrialization/recipe/dyes/black/cutting_machine/glass_pane.json +ac874c3c0e0d431c911136cccd74215e2db00238 data/modern_industrialization/recipe/dyes/black/mixer/bed.json +1ecdfaa14f7b96ce7b7f81b4ff2b772165f8affb data/modern_industrialization/recipe/dyes/black/mixer/benzene.json +2a3ed083269272a354104437b9223568d6af95c6 data/modern_industrialization/recipe/dyes/black/mixer/candle.json +f420e01fb8fe1d731e358ed3a604eab15d901448 data/modern_industrialization/recipe/dyes/black/mixer/carpet.json +8f68fc18655d2b52ebe830ce3223215e68300180 data/modern_industrialization/recipe/dyes/black/mixer/fluid_pipe_8.json +b3d3a1847928255feb38d5b41452a034080fc63c data/modern_industrialization/recipe/dyes/black/mixer/glass.json +0382e9390454bdeca8d8ee3134146497709e7bc4 data/modern_industrialization/recipe/dyes/black/mixer/glass_pane.json +9fcff05df05d6bd3ed2b954316e4b11ee6957546 data/modern_industrialization/recipe/dyes/black/mixer/item_pipe_8.json +98a45649bea5a6eb60340ff795887937fac17466 data/modern_industrialization/recipe/dyes/black/mixer/shulker_box.json +444c05ccc407de3ee4a4b300985b73b47446298d data/modern_industrialization/recipe/dyes/black/mixer/synthetic_oil.json +e3d1918ce46065ad62a5d0b9057f58232ab4444f data/modern_industrialization/recipe/dyes/black/mixer/terracotta.json +e1768c1a542c2fab709c7ee0d96b01f519f648b0 data/modern_industrialization/recipe/dyes/black/mixer/wool.json +25a5da70f7a69ca734bd25fe873e421e9161a949 data/modern_industrialization/recipe/dyes/blue/assembler/fluid_pipe_stained_glass.json +9952d7f0e3a6dc5addaaf1503b19af4746b4d35f data/modern_industrialization/recipe/dyes/blue/assembler/item_pipe_direct.json +5c4827a0c9f1bc3669fb2f75b21d16b4182caa10 data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_1.json +67ec56df75302acce9cb2d40094937c800c63871 data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_8.json +e9797025d6a10ac4faefe748548b6785f274d087 data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_stained_glass.json +8dfde218f0d86812cb28b147d71475d284bb8372 data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_1.json +b1ebc8180045798c2cb8d126050916d7b6968826 data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_8.json +1699bc23a45ead445e07f1fab7ff98cc4d91485d data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_direct.json +0e4437d609e65b5a03d2edf34aaafe79280ae381 data/modern_industrialization/recipe/dyes/blue/cutting_machine/carpet.json +210faf16b6aa9b3d11181c43769305ef2d870166 data/modern_industrialization/recipe/dyes/blue/cutting_machine/glass_pane.json +d2114e1746fed2a4befecaca80ab7744ffc9af39 data/modern_industrialization/recipe/dyes/blue/mixer/bed.json +2a7cdcd159f68e8cfd04a6244ff9ca1526842027 data/modern_industrialization/recipe/dyes/blue/mixer/benzene.json +75a956ce0c2d658a378f11396a1ba8c22d433182 data/modern_industrialization/recipe/dyes/blue/mixer/candle.json +740e642176b706eaaaf1030d7715f9fd63445e59 data/modern_industrialization/recipe/dyes/blue/mixer/carpet.json +877510f6ca64f029d067b4b2d2c807c5cf15d389 data/modern_industrialization/recipe/dyes/blue/mixer/fluid_pipe_8.json +1165225e49c34047b018394b0a18c3b0c729107a data/modern_industrialization/recipe/dyes/blue/mixer/glass.json +eb97ebacb6d65eec3a1ef5386d41e57f7c6ba9cb data/modern_industrialization/recipe/dyes/blue/mixer/glass_pane.json +35a23d4fb33327a54c5f17dddc74bc5d3ab2b3f5 data/modern_industrialization/recipe/dyes/blue/mixer/item_pipe_8.json +c32014c52253d9e9ad8832a4e3f0642463882068 data/modern_industrialization/recipe/dyes/blue/mixer/shulker_box.json +a2f4198c820ffed1034f497a29675792e271e020 data/modern_industrialization/recipe/dyes/blue/mixer/synthetic_oil.json +368d9c8efc25ed25c236b2f12ff5a9ee29fbd777 data/modern_industrialization/recipe/dyes/blue/mixer/terracotta.json +086726330dcc3ffd441952a0589ac4b73b0c48c9 data/modern_industrialization/recipe/dyes/blue/mixer/wool.json +67e13f3b4b9d5b1b58082087ca0c2ddab4234f49 data/modern_industrialization/recipe/dyes/brown/assembler/fluid_pipe_stained_glass.json +2c3cec9ac03991c5d96bb10f858431c233f4b22d data/modern_industrialization/recipe/dyes/brown/assembler/item_pipe_direct.json +3dae328d23c76ab902f99d9d039b2ee4e30d43ef data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_1.json +ef46cb5c23d77805dc38964ed9ca37a6f9341e79 data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_8.json +61d8bdba005c8bf2545c79a6ac9883be7738ac46 data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_stained_glass.json +0865a66f72ef6445da155dce3781eb5555d748e6 data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_1.json +ad18ff2ede98aa15216e8c20ac4a12806f8ac5a7 data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_8.json +382e2da54df2e04c70d90f069ed6f4dcf84b200e data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_direct.json +405adda434a16453d2c6353f444acce0c0dadb31 data/modern_industrialization/recipe/dyes/brown/cutting_machine/carpet.json +76622ddf0876e3f2108be808fb5738f856cbec7e data/modern_industrialization/recipe/dyes/brown/cutting_machine/glass_pane.json +c5d99225ff44555cd712f102216bd00ed19ce9b5 data/modern_industrialization/recipe/dyes/brown/mixer/bed.json +a9071aeae6246024f541d3917a9e266606f112ed data/modern_industrialization/recipe/dyes/brown/mixer/benzene.json +06794bb1aef5ae7113a7b2274389eddec4bf31c5 data/modern_industrialization/recipe/dyes/brown/mixer/candle.json +cbcd8c8b3bdcd273f0a585f652db85bf79d9bd17 data/modern_industrialization/recipe/dyes/brown/mixer/carpet.json +26f16a588b095456d0899b06fbec24fae8291b93 data/modern_industrialization/recipe/dyes/brown/mixer/fluid_pipe_8.json +66a8c10720fa35262ff136b60856b7af28a0ce2e data/modern_industrialization/recipe/dyes/brown/mixer/glass.json +52fc426c503a7c9c0f1555caf8e80f8fcf44dae8 data/modern_industrialization/recipe/dyes/brown/mixer/glass_pane.json +26edd3f7acd1d75f889cd95328a4fd8254b2679e data/modern_industrialization/recipe/dyes/brown/mixer/item_pipe_8.json +e841b3136b175b81c1fde7a65100bdfc9dbb02a6 data/modern_industrialization/recipe/dyes/brown/mixer/shulker_box.json +5f7ee832be028e4e37725afa6397a4611c7a41d8 data/modern_industrialization/recipe/dyes/brown/mixer/synthetic_oil.json +c201620d602eabe2b4f7a47de65e5fb9fd1fc20e data/modern_industrialization/recipe/dyes/brown/mixer/terracotta.json +ef954ab2eb780761ce815097767208703bed8410 data/modern_industrialization/recipe/dyes/brown/mixer/wool.json +5cc59453c4a9a2cb2ad5f9a04e49beef46d30878 data/modern_industrialization/recipe/dyes/cyan/assembler/fluid_pipe_stained_glass.json +866386d585b55c7911daeee211317ff2494c85ce data/modern_industrialization/recipe/dyes/cyan/assembler/item_pipe_direct.json +8147ee016777d82d1233539dd7905593305815d2 data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_1.json +f94d96a1dc09ea215a81bf959e3c308f785e0628 data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_8.json +e9be5b8e06daf7390a454cc58a607285a53c95f4 data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_stained_glass.json +c9219e30c623248675f3cfe585395f72bacdf241 data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_1.json +bdea3a6d8cbeac5a5224cbdce4dc62f3eca847e8 data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_8.json +e63c85280b323ebd36d7fab560295f1320c35a97 data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_direct.json +d5d5323c4295d578dbdd661cbfab97d87dfc922a data/modern_industrialization/recipe/dyes/cyan/cutting_machine/carpet.json +50a602eba7bc39a839d8d3bc9a07177f178df415 data/modern_industrialization/recipe/dyes/cyan/cutting_machine/glass_pane.json +8d4d4589c52d7e4d7df5a7b9bcc51f7b7c55a5a6 data/modern_industrialization/recipe/dyes/cyan/mixer/bed.json +6377b311f41bfa1600008a6818ff5867efd11948 data/modern_industrialization/recipe/dyes/cyan/mixer/benzene.json +0ef6707b673a2801b766be52ebcbfaf7970e9b6c data/modern_industrialization/recipe/dyes/cyan/mixer/candle.json +a3e851e3a9ae40a95662d528d86b5facdabc3744 data/modern_industrialization/recipe/dyes/cyan/mixer/carpet.json +f9fa8d398549277301d8f379e9224f134ab2c75c data/modern_industrialization/recipe/dyes/cyan/mixer/fluid_pipe_8.json +288fbe7b2c2c5f414999b461339922ee1a4dade2 data/modern_industrialization/recipe/dyes/cyan/mixer/glass.json +aab66366bcc9c9a81ba15746c403e4b618512eb9 data/modern_industrialization/recipe/dyes/cyan/mixer/glass_pane.json +b36f37f3483530aa65217f6b895fa7354772a5e0 data/modern_industrialization/recipe/dyes/cyan/mixer/item_pipe_8.json +f01849444bcec7b10a5229c5bebe9d7754ee268a data/modern_industrialization/recipe/dyes/cyan/mixer/shulker_box.json +2256540e474ae9f7415f044673059f06bfe85884 data/modern_industrialization/recipe/dyes/cyan/mixer/synthetic_oil.json +898f04c01fa567d0ac7991e440e6626fb7f4e3fe data/modern_industrialization/recipe/dyes/cyan/mixer/terracotta.json +99d58bf49817a296afc579402157c03516407783 data/modern_industrialization/recipe/dyes/cyan/mixer/wool.json +a5a74a2c8a0db3be309c5a8b2bbfacc471f5d3c9 data/modern_industrialization/recipe/dyes/gray/assembler/fluid_pipe_stained_glass.json +6f01d1a1305f97838ca8d072755fd770be0c242b data/modern_industrialization/recipe/dyes/gray/assembler/item_pipe_direct.json +b6f99a1a180e43c8e7c2e7d6075b9c0d046eb4bd data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_1.json +d9c400dfe22b94ea9fc88007109a73b77f159807 data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_8.json +e9cf208144b6f41e938edbc0d249433cf7e089ec data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_stained_glass.json +128ad87b8cf0ae2f0e0ff99aec965fe13b5d7515 data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_1.json +064a56ba75222ba6f073b2f45c991ee746bfb154 data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_8.json +264104510b3226cf55ac2212683e36971d131de5 data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_direct.json +647c5910a4678ec65870938e223a085610d0f1ac data/modern_industrialization/recipe/dyes/gray/cutting_machine/carpet.json +b7f5e1ce4313791c7cfd89d190553b5b8691ca4a data/modern_industrialization/recipe/dyes/gray/cutting_machine/glass_pane.json +e876139b6165d68efe32e98191448a50d55d078d data/modern_industrialization/recipe/dyes/gray/mixer/bed.json +8d8f54448a5f9b12f4a05eae4c94c4a8e4b8feb5 data/modern_industrialization/recipe/dyes/gray/mixer/benzene.json +c846c87cb6b848d8892f5904996442c4fc5a7303 data/modern_industrialization/recipe/dyes/gray/mixer/candle.json +27153d26d598e2a7991a5109ab3766b423464ac2 data/modern_industrialization/recipe/dyes/gray/mixer/carpet.json +7da192086e2d752bfe23560cdeee0387c99f8bce data/modern_industrialization/recipe/dyes/gray/mixer/fluid_pipe_8.json +985f78795746bc66df82ed6e31b9629750537d7c data/modern_industrialization/recipe/dyes/gray/mixer/glass.json +469883c61e17d90bde24adf68cfb7cc63b8d6b3d data/modern_industrialization/recipe/dyes/gray/mixer/glass_pane.json +9224f984861d0a7aaeacc3c749cfef8f3295e00b data/modern_industrialization/recipe/dyes/gray/mixer/item_pipe_8.json +f1bd83016f365926a17b6bbba0c522d4eeae9125 data/modern_industrialization/recipe/dyes/gray/mixer/shulker_box.json +d7391e9a3306b5509d600f869c87132c4918f22b data/modern_industrialization/recipe/dyes/gray/mixer/synthetic_oil.json +c5dafe880e9c9bc20931d5975daa86f098d7143d data/modern_industrialization/recipe/dyes/gray/mixer/terracotta.json +091245b24093b89b14e98dddbba897df2bf3a44c data/modern_industrialization/recipe/dyes/gray/mixer/wool.json +3e4c78ba287227d95509d8e5f7381359486cac5c data/modern_industrialization/recipe/dyes/green/assembler/fluid_pipe_stained_glass.json +e39f38996e034ad04f3da708f966094cdc7ecaf6 data/modern_industrialization/recipe/dyes/green/assembler/item_pipe_direct.json +3542917699cd3d5c3d78b5b72fe05e4bbe1088a4 data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_1.json +81fce84d29e8f66653bcb815097987f6701953ca data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_8.json +605a4d5d744ebe0f6b3c5caa06fc188a790bc1f9 data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_stained_glass.json +48476914dbecfe5b247fbcb7648008631a8088df data/modern_industrialization/recipe/dyes/green/craft/item_pipe_1.json +76655d662897cd34b9578ae4174d06e4c6bfb400 data/modern_industrialization/recipe/dyes/green/craft/item_pipe_8.json +99798b70bc3784d4ae3eba13b6ffd483fb12e73f data/modern_industrialization/recipe/dyes/green/craft/item_pipe_direct.json +612a49c08e269a1ae1c01f3501d2c49e02ae5801 data/modern_industrialization/recipe/dyes/green/cutting_machine/carpet.json +3a264732cb0f8a2bb84b12975e6c994005318570 data/modern_industrialization/recipe/dyes/green/cutting_machine/glass_pane.json +6ed251f6f3463ffbb80d93cc3a20a12efb7935f8 data/modern_industrialization/recipe/dyes/green/mixer/bed.json +7a35255278d56d968e3e8895eef92a21db7ad253 data/modern_industrialization/recipe/dyes/green/mixer/benzene.json +59858db78a23ffb7fcbda8a4cb5cce16f32c30bb data/modern_industrialization/recipe/dyes/green/mixer/candle.json +2ec1da60aef562264eddb123bad47d9554420fbb data/modern_industrialization/recipe/dyes/green/mixer/carpet.json +d0a03d169ead76ec9e97f32e726dc23c72c99534 data/modern_industrialization/recipe/dyes/green/mixer/fluid_pipe_8.json +1cb736db28ca8fb81906d0c671a681dfc1d40b60 data/modern_industrialization/recipe/dyes/green/mixer/glass.json +6650484c43228271389c89e1cbd932e9e204e3f0 data/modern_industrialization/recipe/dyes/green/mixer/glass_pane.json +bbd644acaf7cf30385eebfb8bea3292de575ff20 data/modern_industrialization/recipe/dyes/green/mixer/item_pipe_8.json +75acbf3fff7ef994599903bf87bf8cdf11ab8bdd data/modern_industrialization/recipe/dyes/green/mixer/shulker_box.json +c40b3cb6b71ccf3502532a82a4ee453c44da95f3 data/modern_industrialization/recipe/dyes/green/mixer/synthetic_oil.json +306c14b8c55742c5e54ac0eca7e2180591a1da67 data/modern_industrialization/recipe/dyes/green/mixer/terracotta.json +62682db7742d270df1730b0c628b4c714d7e82a4 data/modern_industrialization/recipe/dyes/green/mixer/wool.json +8a9959a96b6f19ce67c551c8efe9c9595baff0f9 data/modern_industrialization/recipe/dyes/light_blue/assembler/fluid_pipe_stained_glass.json +6f315a873f983040f7b2e31426b8e972996d4533 data/modern_industrialization/recipe/dyes/light_blue/assembler/item_pipe_direct.json +a2498cc4b1b9d92181db2443d7d69983192470a9 data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_1.json +94b66ede5a466f6f7ff72a2750b685b87dd62e1a data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_8.json +2a957bc39c251b7112f89206ab75ebb082c61f19 data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_stained_glass.json +43e3546817d7790b8d1f27d55b1803e3fd0293f4 data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_1.json +effa1fad46f031594aab3aa30fbfdb76c265cf29 data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_8.json +43689660b9906c2823492c2ab1948ffaf4aeb08c data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_direct.json +9ed16d26ca692eda7af0142f12804dd53d9f2cbd data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/carpet.json +734833cbfab26563ac4089d05c9e503877fbf116 data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/glass_pane.json +9b72e5d6d25269f6dafa998420d9ab2cbca298b1 data/modern_industrialization/recipe/dyes/light_blue/mixer/bed.json +41c718f6686cca86e815ae6caf05790ede2ebfa0 data/modern_industrialization/recipe/dyes/light_blue/mixer/benzene.json +ae600da1b8944fb31c813f8e3dfd195dc01b9c90 data/modern_industrialization/recipe/dyes/light_blue/mixer/candle.json +761bde1eecc4411fecdbb2c7722ccc0dde9c65b4 data/modern_industrialization/recipe/dyes/light_blue/mixer/carpet.json +83d3c63ea82c6c949d19010042ae69f4e4f3be85 data/modern_industrialization/recipe/dyes/light_blue/mixer/fluid_pipe_8.json +095f23b5e7c20dedc2fe8b21324f714fa307dfda data/modern_industrialization/recipe/dyes/light_blue/mixer/glass.json +5f1164998422941db879fed091286e8332b86c77 data/modern_industrialization/recipe/dyes/light_blue/mixer/glass_pane.json +e836aac563861baba1f5005d991391fb4f826a0c data/modern_industrialization/recipe/dyes/light_blue/mixer/item_pipe_8.json +618114936c30c1dcd77a5566dcadf7f7cf6299b1 data/modern_industrialization/recipe/dyes/light_blue/mixer/shulker_box.json +f7d98234c670e8a3ccba9e7a4974ebbc8d9fdc7e data/modern_industrialization/recipe/dyes/light_blue/mixer/synthetic_oil.json +9d30a25bba227624a33225ca29bdc0300a7243cf data/modern_industrialization/recipe/dyes/light_blue/mixer/terracotta.json +f683b24e7afb816a93110382f32947211332fc2b data/modern_industrialization/recipe/dyes/light_blue/mixer/wool.json +3bdfd13417195506a587aae97ea0409c269506d1 data/modern_industrialization/recipe/dyes/light_gray/assembler/fluid_pipe_stained_glass.json +8337c0c8229ca6c8a9561b9f6733611b65e8c28d data/modern_industrialization/recipe/dyes/light_gray/assembler/item_pipe_direct.json +3074e82b43db96b976e4c320e67186a08b2844f3 data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_1.json +800cbf5b013b22355a7d5f77ebc80af7c2bb4e73 data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_8.json +665e4b431e6a40ad0d4132bb3660801fb2383e61 data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_stained_glass.json +200a6443b03319956b4b2174b7b57525e7342592 data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_1.json +1ebed185880f6ebd93f0de80c2c87acd69a6dafa data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_8.json +977a99a6de9e7532c2ebb37df7fba0bd0d80632a data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_direct.json +2e1121a6ff50161587862b1a85422afc0b92d5b9 data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/carpet.json +cd04690e908c2b1a98b924c59f3eacdf192a30d0 data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/glass_pane.json +348812f5d71d41e10045043101a3e74607d287b5 data/modern_industrialization/recipe/dyes/light_gray/mixer/bed.json +a7ff95de3633ad79c71563a16d48bec6406ff5b3 data/modern_industrialization/recipe/dyes/light_gray/mixer/benzene.json +c9478d2c16b51bae356d4bc641e6a2d91e067a21 data/modern_industrialization/recipe/dyes/light_gray/mixer/candle.json +e164a48459424c8409da97dec609f0bdac9cb2a4 data/modern_industrialization/recipe/dyes/light_gray/mixer/carpet.json +94728e04ca78d18c210a5ff278e537bd20ebd4ac data/modern_industrialization/recipe/dyes/light_gray/mixer/fluid_pipe_8.json +971db0636f68efde75ed8c70e912548c5be333d0 data/modern_industrialization/recipe/dyes/light_gray/mixer/glass.json +587dc8ca7d2647e4be4090af2919effc0bcf5451 data/modern_industrialization/recipe/dyes/light_gray/mixer/glass_pane.json +93e3abaefc551a3b70609e33b758f87301d3a859 data/modern_industrialization/recipe/dyes/light_gray/mixer/item_pipe_8.json +f632b22ed9f57534aa369bb9893b381e23b71c85 data/modern_industrialization/recipe/dyes/light_gray/mixer/shulker_box.json +69f39bef0ebd81280a4bfe65af95d78bed1069c1 data/modern_industrialization/recipe/dyes/light_gray/mixer/synthetic_oil.json +2f36409a0a31a5757f543728be514390c97b10e9 data/modern_industrialization/recipe/dyes/light_gray/mixer/terracotta.json +949f6b72840413160b42d7f0cd41c369e74aa9fd data/modern_industrialization/recipe/dyes/light_gray/mixer/wool.json +3ba8c05d2169ca1d23e110627c9637fe038185ce data/modern_industrialization/recipe/dyes/lime/assembler/fluid_pipe_stained_glass.json +847c7ad512e1356898aac96416ded1c9f19d4177 data/modern_industrialization/recipe/dyes/lime/assembler/item_pipe_direct.json +da1ce76c8a345037ec374fb0cfb807aa409dd9f2 data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_1.json +cd26f2f641ac7afce30504f7a6bd2771996b6c9a data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_8.json +c0b12d30e7fea9a6ca0876e906296388e682b01f data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_stained_glass.json +5d61160002e592a9f23c80085f59f38ec1cd51bf data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_1.json +f52b4433ea1e6badee3a4b949a5dffed29e95da0 data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_8.json +75fd1c29816f1d78e994b76dcab2d95edbbb0ad4 data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_direct.json +74907b89f2820819f5c92f32b2c9bd42cd6568fc data/modern_industrialization/recipe/dyes/lime/cutting_machine/carpet.json +2e766f1db72a860b47713ba447efaa9b0a28be32 data/modern_industrialization/recipe/dyes/lime/cutting_machine/glass_pane.json +359f22bab3f01b3c811a05cfe95ddca0ee7e3e63 data/modern_industrialization/recipe/dyes/lime/mixer/bed.json +ee08debdc25a5eeb66990c5e25a6ab4e1b29e92a data/modern_industrialization/recipe/dyes/lime/mixer/benzene.json +397226064ddddc22192c7a3073ea57c0fe8a7dcf data/modern_industrialization/recipe/dyes/lime/mixer/candle.json +cbdd5cd6383c6e3281095039d537c13e5dc03c17 data/modern_industrialization/recipe/dyes/lime/mixer/carpet.json +7bab242764e5c798374a5b225662b70269864892 data/modern_industrialization/recipe/dyes/lime/mixer/fluid_pipe_8.json +943de6db04b6bfdaf700a6c846934b61f5f62b5d data/modern_industrialization/recipe/dyes/lime/mixer/glass.json +6415c85ff2679028aaee874b205715d8e5a08a75 data/modern_industrialization/recipe/dyes/lime/mixer/glass_pane.json +fe29319be548763d62f6fe371be935748ace9a7c data/modern_industrialization/recipe/dyes/lime/mixer/item_pipe_8.json +ea4077389b5aab3fc52747c578a4275d06255daf data/modern_industrialization/recipe/dyes/lime/mixer/shulker_box.json +ae7f0d24a259cef68eeef573324fb0034e3e4686 data/modern_industrialization/recipe/dyes/lime/mixer/synthetic_oil.json +946768844d55464972f7d4fa7d4a935f7634f24e data/modern_industrialization/recipe/dyes/lime/mixer/terracotta.json +057618937c75bc69af9ab5c4377d1c38e60a079f data/modern_industrialization/recipe/dyes/lime/mixer/wool.json +0b74c96169d9b80787288ca6261b00c9199a272f data/modern_industrialization/recipe/dyes/magenta/assembler/fluid_pipe_stained_glass.json +a1e11f58045d23ea113dfa9853b349a1df42b0d1 data/modern_industrialization/recipe/dyes/magenta/assembler/item_pipe_direct.json +d9e1b33be0205ee333d0002e6d1e5fbc0146704f data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_1.json +5aed8774c9e99ce1f6dea9aa2d20a0389a8a9eff data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_8.json +44a00132b49327396582b5890c7952453eda7aaf data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_stained_glass.json +68f0cac60b3181fac259030672790fba4b77d5a7 data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_1.json +462df9e145a0cdc137153df705daa65418281b66 data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_8.json +8c08c1558d4b599c4dbf56ab8902b7df52e8c3fb data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_direct.json +b6d6735bc0230ce3ebe3fa406133c1a4350d9100 data/modern_industrialization/recipe/dyes/magenta/cutting_machine/carpet.json +619c3a4efd8b24bcfaeef194da6b59ea1532802a data/modern_industrialization/recipe/dyes/magenta/cutting_machine/glass_pane.json +207b158942791c56b1c7fd2457a9fdc8a52ef072 data/modern_industrialization/recipe/dyes/magenta/mixer/bed.json +2ceacdd74665f0410de926900b6c4cedfb7d300f data/modern_industrialization/recipe/dyes/magenta/mixer/benzene.json +66eb9cfbef57eed3936f4d40de7fe1a56b6d145f data/modern_industrialization/recipe/dyes/magenta/mixer/candle.json +fdd6a541b28a16c025683d1e26ff301993704898 data/modern_industrialization/recipe/dyes/magenta/mixer/carpet.json +ae9e36bf74f190b984fabd7363728db0ea141ee3 data/modern_industrialization/recipe/dyes/magenta/mixer/fluid_pipe_8.json +cc4a200bf2f136037aaeef24d0baa335563ca384 data/modern_industrialization/recipe/dyes/magenta/mixer/glass.json +c2f3eb8cd924b5442ee3b37399ff38cf45e1f29b data/modern_industrialization/recipe/dyes/magenta/mixer/glass_pane.json +71018055bf7093ffeef47a576c2992340f4514fe data/modern_industrialization/recipe/dyes/magenta/mixer/item_pipe_8.json +ba101349898a4ac470b6d1803b57a7d509fd8b73 data/modern_industrialization/recipe/dyes/magenta/mixer/shulker_box.json +0da4c79711e7b8a00f4e13fe3eae9cf041b0b1fa data/modern_industrialization/recipe/dyes/magenta/mixer/synthetic_oil.json +8116aa414052cca815ecc6a6d5da5885c18b63e8 data/modern_industrialization/recipe/dyes/magenta/mixer/terracotta.json +b157c34962895b38ba279a163215c8816094da74 data/modern_industrialization/recipe/dyes/magenta/mixer/wool.json +cf0f504680077e30327c129a7e966dcdd8adea62 data/modern_industrialization/recipe/dyes/orange/assembler/fluid_pipe_stained_glass.json +6b1ddc1bc5b8b4e513a7007c6ac94275a7bc0e7a data/modern_industrialization/recipe/dyes/orange/assembler/item_pipe_direct.json +eb546894e730af0d3ae72c123bef2037548ec106 data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_1.json +c969b2d008081e8aadee0275cb752a9db00aa5ff data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_8.json +3644241b695b8d95692216c31edd8d608106cc00 data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_stained_glass.json +33f2c842bd910310e97a340a806c32d1c4c9d86e data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_1.json +29272649345593af7ef31ea443c08c4aa50ef245 data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_8.json +9ad8d64b26afaefda173557a6553f046f666294c data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_direct.json +22870b21a1fbcd18486f5392fb84654f1edaa474 data/modern_industrialization/recipe/dyes/orange/cutting_machine/carpet.json +01ea87636dec5caece4cee9b45801bac8ff2b234 data/modern_industrialization/recipe/dyes/orange/cutting_machine/glass_pane.json +8080d86524e8f774c0ca7aed8c09e2472e306f01 data/modern_industrialization/recipe/dyes/orange/mixer/bed.json +6fd1d565899ce73da4c6d0549602bda7ab9576f2 data/modern_industrialization/recipe/dyes/orange/mixer/benzene.json +cf3588bf3d0570a2606e00f09067ec877aba186a data/modern_industrialization/recipe/dyes/orange/mixer/candle.json +311c2ed9cd68172cf444d9da072bc3319814a763 data/modern_industrialization/recipe/dyes/orange/mixer/carpet.json +87738e8bf2c863ef5ecb31fac2be633fb239d93f data/modern_industrialization/recipe/dyes/orange/mixer/fluid_pipe_8.json +829dbf4247e828b361d6ac31147e5eb307795826 data/modern_industrialization/recipe/dyes/orange/mixer/glass.json +103536eaebe4891c59c4c055f8bfe088317223ed data/modern_industrialization/recipe/dyes/orange/mixer/glass_pane.json +676a7352821bf3d88bbdb1371922f6798c5e70ba data/modern_industrialization/recipe/dyes/orange/mixer/item_pipe_8.json +ccef08453cd3ec25bbe17a8825ef95d86a783337 data/modern_industrialization/recipe/dyes/orange/mixer/shulker_box.json +eea555c040a81d37606464246179ede532388742 data/modern_industrialization/recipe/dyes/orange/mixer/synthetic_oil.json +911d5ea1e116017b13bec8ccb5aecb668ba08309 data/modern_industrialization/recipe/dyes/orange/mixer/terracotta.json +affecec9403da134a91a159b3194e93c639b4af7 data/modern_industrialization/recipe/dyes/orange/mixer/wool.json +1e092585708c6402b729e314d9a9a3d8d789709a data/modern_industrialization/recipe/dyes/pink/assembler/fluid_pipe_stained_glass.json +0d7ea8b6061d861c141f1efd2c4dc02266c19648 data/modern_industrialization/recipe/dyes/pink/assembler/item_pipe_direct.json +f7cbe4344bacca45c81aec4db63404e1220e9827 data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_1.json +1c4469999bd14b6f54a005ef2c5259965d34ec90 data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_8.json +6e6cc021c8821283413609ad940bd2b84ad4f550 data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_stained_glass.json +bf8f69d04894b189ecd06a85924c88d047c944a9 data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_1.json +e79ef68e44c5750c1115da0ffa7216065deec1c0 data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_8.json +c8542670e46aad3078a6409ca6b8a3a437a272c5 data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_direct.json +05a9a962a5d10bd2527621c639139f92e3552543 data/modern_industrialization/recipe/dyes/pink/cutting_machine/carpet.json +d93f8e477776f4e5f70de134f7b506a92218c59b data/modern_industrialization/recipe/dyes/pink/cutting_machine/glass_pane.json +1b1e36f87576028ad220a9ed3fd9a6adc0b60237 data/modern_industrialization/recipe/dyes/pink/mixer/bed.json +79ce2bb4eb2c06eef0735080c8825720e98bada7 data/modern_industrialization/recipe/dyes/pink/mixer/benzene.json +db962a70faae8295e6b179c6aedb31553aaf6be5 data/modern_industrialization/recipe/dyes/pink/mixer/candle.json +cdebd3e95c69bff34416e0372d38e3f351f74f0f data/modern_industrialization/recipe/dyes/pink/mixer/carpet.json +227ba26be0856645d119617a537940236056b36e data/modern_industrialization/recipe/dyes/pink/mixer/fluid_pipe_8.json +04f2c31ce7320cebe1b39ca50786b893e4d58126 data/modern_industrialization/recipe/dyes/pink/mixer/glass.json +4db58a1709b51ebead99e1df00f3320c7bb8b11a data/modern_industrialization/recipe/dyes/pink/mixer/glass_pane.json +7a1e6d016bec73a1000f8db2f46f90555b81708a data/modern_industrialization/recipe/dyes/pink/mixer/item_pipe_8.json +903d3093f270daddc45595f8148bb9f8c02ce38c data/modern_industrialization/recipe/dyes/pink/mixer/shulker_box.json +56ff6ad18f31de3a4dd2e107bd6b6b76e106e9a0 data/modern_industrialization/recipe/dyes/pink/mixer/synthetic_oil.json +29ec7026178c15affc88e9a31879e53e790c81f2 data/modern_industrialization/recipe/dyes/pink/mixer/terracotta.json +00d293e2221c8c62f4e5a419ffed0e15b689356d data/modern_industrialization/recipe/dyes/pink/mixer/wool.json +1d2be7ce4d9503db111f9bbc887bd71269830b6c data/modern_industrialization/recipe/dyes/purple/assembler/fluid_pipe_stained_glass.json +8d9e3d7f9383077c37fc5ac7de966b1d8b94b613 data/modern_industrialization/recipe/dyes/purple/assembler/item_pipe_direct.json +5eaee2d77759ed48c1c824bb888489bcfaf19d00 data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_1.json +2a0bcd8fe011d295ae668dee8239f0d59c6c4de7 data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_8.json +0ba808641df6c9cc13045aa8752c4a29dfd16746 data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_stained_glass.json +98b796b7b12ffa305a0975d76b233055283cc8b3 data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_1.json +4578a8b3589bb7e8d9e36653ac05320975c760e4 data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_8.json +37173f0fd47b453a41ae5c4f80c5696d9b0efc29 data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_direct.json +79ec3e26d10ceb3ad53d20dd44997eebf027b195 data/modern_industrialization/recipe/dyes/purple/cutting_machine/carpet.json +a62c0b0d795386cba6b0cf899f1bf432d38e40f1 data/modern_industrialization/recipe/dyes/purple/cutting_machine/glass_pane.json +fad35dd289525231ee5058ad31f991b6941d9698 data/modern_industrialization/recipe/dyes/purple/mixer/bed.json +cb39ed5c2a22fb01a8bfd87ce5ded5ce61af0c5c data/modern_industrialization/recipe/dyes/purple/mixer/benzene.json +a5340b2d67441b37e9d78f1c0df184ace9cfb947 data/modern_industrialization/recipe/dyes/purple/mixer/candle.json +d9a1e85ace110d0e8c75f0acc6b29d52ced0ce50 data/modern_industrialization/recipe/dyes/purple/mixer/carpet.json +d7a6f27b915939d861941e31677a9efbfb064126 data/modern_industrialization/recipe/dyes/purple/mixer/fluid_pipe_8.json +343b242d36a2f6e3a838269a4333e450e06ee954 data/modern_industrialization/recipe/dyes/purple/mixer/glass.json +9d3e712c61c5d58fa44502b42cbdaa8e3680b8c3 data/modern_industrialization/recipe/dyes/purple/mixer/glass_pane.json +ce95abf2a3c73722f6e5f5bbab9890d803a3963d data/modern_industrialization/recipe/dyes/purple/mixer/item_pipe_8.json +8007d5d340ebd3b6fd40881184384fac6e618b1d data/modern_industrialization/recipe/dyes/purple/mixer/shulker_box.json +e963ba24125a5ecd821e0245c1bbfc515b35dd33 data/modern_industrialization/recipe/dyes/purple/mixer/synthetic_oil.json +dec3b497d9c74d311be46333cc9d3c26a0da7937 data/modern_industrialization/recipe/dyes/purple/mixer/terracotta.json +1bb579431f334557f61fb37ef69efb6eed13489e data/modern_industrialization/recipe/dyes/purple/mixer/wool.json +1244f086b8b333224faf595e8e11318e3d36c90e data/modern_industrialization/recipe/dyes/red/assembler/fluid_pipe_stained_glass.json +94f6e3fbb051a3756a518c2f29c10db9b5195763 data/modern_industrialization/recipe/dyes/red/assembler/item_pipe_direct.json +33e73c2799195adfddd4a155f89d4b57d0989165 data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_1.json +74c93ec026f94615b668ac26aceaa58f2d5e825b data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_8.json +d62c7ab6f2b73a40534b7ca1f67a72008f965e3d data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_stained_glass.json +8c8d36b60a98a3856fb38e69869c886c4497c509 data/modern_industrialization/recipe/dyes/red/craft/item_pipe_1.json +55ce3a3ef5415ac5b1a50a4a7cbcd0280252154b data/modern_industrialization/recipe/dyes/red/craft/item_pipe_8.json +14d631405936c36c493b01ce3f92b2b9a9858e98 data/modern_industrialization/recipe/dyes/red/craft/item_pipe_direct.json +040a85aaabc5b71054700a1f6621b80f927cb70e data/modern_industrialization/recipe/dyes/red/cutting_machine/carpet.json +992cc9834f344500a84c70bb91a179fce226cbe2 data/modern_industrialization/recipe/dyes/red/cutting_machine/glass_pane.json +827c9ed078ab40bd1b25a7dc3fe7f88bfcbe7155 data/modern_industrialization/recipe/dyes/red/mixer/bed.json +afe201b930f11b90e904031a21f59be42b3f94be data/modern_industrialization/recipe/dyes/red/mixer/benzene.json +d3c4211e5cd5db853c686e3ce857e48ff6a92d5c data/modern_industrialization/recipe/dyes/red/mixer/candle.json +820d066d96a8909ed4e1c3a8eb5b6ef084701bc9 data/modern_industrialization/recipe/dyes/red/mixer/carpet.json +0e562bdb3a53726d3410d5e7d7c926c1a7ff58e9 data/modern_industrialization/recipe/dyes/red/mixer/fluid_pipe_8.json +b6cb3ccffc541c4a5a692c0b8add8bfb61dbc2a8 data/modern_industrialization/recipe/dyes/red/mixer/glass.json +346e5d05350aeaa19b3d89ccc285c8dc0060915e data/modern_industrialization/recipe/dyes/red/mixer/glass_pane.json +964a2b3667700e1d677d5e74c2123cb659f3fc6f data/modern_industrialization/recipe/dyes/red/mixer/item_pipe_8.json +4bafef931a5272b0b9753f52a566ae8137256ee6 data/modern_industrialization/recipe/dyes/red/mixer/shulker_box.json +98b9ac3f523d07b1c9dc98f4f895a70ed9b7d1ef data/modern_industrialization/recipe/dyes/red/mixer/synthetic_oil.json +702e67a048b4088995ebc6d40db0a7ca14e18516 data/modern_industrialization/recipe/dyes/red/mixer/terracotta.json +1c5e729735f99acfe374fdb459914c864a78f7c2 data/modern_industrialization/recipe/dyes/red/mixer/wool.json +e6c41c32949163acafa45815445fac60c2827828 data/modern_industrialization/recipe/dyes/white/assembler/fluid_pipe_stained_glass.json +6f25c34d6e04bf10b7cedd4b1d11586fca92127f data/modern_industrialization/recipe/dyes/white/assembler/item_pipe_direct.json +a2b248b127b5eaf9a4adca5263b193a02f459f3e data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_1.json +f7ab2568891e8bf921372626cbe059ae41071537 data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_8.json +f2b8e0bed9e0e40db4108fcf2d8f5205874f9db1 data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_stained_glass.json +7666878c00b5d1db255fcd668d302b19b40ea5b2 data/modern_industrialization/recipe/dyes/white/craft/item_pipe_1.json +aed25b073911aaa42ac199c43eac5227206d8806 data/modern_industrialization/recipe/dyes/white/craft/item_pipe_8.json +10cf75a8271c43bfb545e670c6a64cb7d9838b75 data/modern_industrialization/recipe/dyes/white/craft/item_pipe_direct.json +8a40fa00425ca5ea180656c7c6e7278f1b1d02a3 data/modern_industrialization/recipe/dyes/white/cutting_machine/carpet.json +a5b7ec709b51bb1062fe95c09537b918fc407522 data/modern_industrialization/recipe/dyes/white/cutting_machine/glass_pane.json +4e88a5b5353972191eb535caf3708c192c015f03 data/modern_industrialization/recipe/dyes/white/mixer/bed.json +e1861cc095a4a0805c9b9cb06306e8db9a2ba98e data/modern_industrialization/recipe/dyes/white/mixer/benzene.json +91114e7e9e58bd1139a1200ee8226c6ae26a47e2 data/modern_industrialization/recipe/dyes/white/mixer/candle.json +da551e53672cd98960209ebc5a1ae7201a886fc9 data/modern_industrialization/recipe/dyes/white/mixer/carpet.json +e3bc23fc8a85cef1d759aaae6a276eb8af7f70fa data/modern_industrialization/recipe/dyes/white/mixer/fluid_pipe_8.json +1425f2fd4c4b52aca73d493007bed8de981cd226 data/modern_industrialization/recipe/dyes/white/mixer/glass.json +ae6e1806b9c5e6892f9ac96d62da20e965314f3e data/modern_industrialization/recipe/dyes/white/mixer/glass_pane.json +d3dad470cbbb9233a6140e2d30195c23e4f4137f data/modern_industrialization/recipe/dyes/white/mixer/item_pipe_8.json +511f7d182c2936af49b3637f9bfa647eb34aab25 data/modern_industrialization/recipe/dyes/white/mixer/shulker_box.json +a9d4ebaa11868e16c2a2bb929c265d499133eff5 data/modern_industrialization/recipe/dyes/white/mixer/synthetic_oil.json +89b6b8f0306f4e2a3e33609a627f37da039c3e05 data/modern_industrialization/recipe/dyes/white/mixer/terracotta.json +f4a227d5c8404cc8636bece98944edc6c048d37e data/modern_industrialization/recipe/dyes/white/mixer/wool.json +acfd4839b830b01a0c313b583809f3de65fb2612 data/modern_industrialization/recipe/dyes/yellow/assembler/fluid_pipe_stained_glass.json +f6b4c32ccee18b732ac3ca9a1bacd0b165a6f899 data/modern_industrialization/recipe/dyes/yellow/assembler/item_pipe_direct.json +7703d9f8a8403ad95ac589384176084cc5f8ed23 data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_1.json +e1c7001a5c000947c0179f660a2ec8fe17fd0e5f data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_8.json +3a44dbb3db581b3c0ee11b37abdb82206e0fb2b8 data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_stained_glass.json +fd830f342240f5d15f3312590a9215481b98bd4e data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_1.json +4c898eb611989d92025b41962904dda3dedaf678 data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_8.json +eacce1137813c07b30ab2295ac62ddd567859c84 data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_direct.json +63108532e292d1a0d282079d722c707889224413 data/modern_industrialization/recipe/dyes/yellow/cutting_machine/carpet.json +81acedb9c6783c30e9b6dabe5b549ea3edef0395 data/modern_industrialization/recipe/dyes/yellow/cutting_machine/glass_pane.json +152daf79048cd07e9d22787dbf33006dc4332668 data/modern_industrialization/recipe/dyes/yellow/mixer/bed.json +636baac699a14223529ed9e17ab36ec3958d1f25 data/modern_industrialization/recipe/dyes/yellow/mixer/benzene.json +eb5610877f0682bd293516a32fd914eed6bcb0ff data/modern_industrialization/recipe/dyes/yellow/mixer/candle.json +f27c6c4a6b9b582bf26bd36b12a0253e975fc65d data/modern_industrialization/recipe/dyes/yellow/mixer/carpet.json +5048d8d6d2c739c27561b590a7ad63a182acd6a1 data/modern_industrialization/recipe/dyes/yellow/mixer/fluid_pipe_8.json +baef531ad15ab58ccbbc78eec1cde767dabd4632 data/modern_industrialization/recipe/dyes/yellow/mixer/glass.json +9862436526fe312ebda89e06c23254719f69c132 data/modern_industrialization/recipe/dyes/yellow/mixer/glass_pane.json +933fa4daf21c7c513061a31095f580d96c5693e8 data/modern_industrialization/recipe/dyes/yellow/mixer/item_pipe_8.json +2422b33a8df31541a2713944532dbbf1b8e713e4 data/modern_industrialization/recipe/dyes/yellow/mixer/shulker_box.json +4b8731484492c25207f55a8d67028ff77f6b23b0 data/modern_industrialization/recipe/dyes/yellow/mixer/synthetic_oil.json +6c17d710d252672aa137627ae9e78fb90c06ad7e data/modern_industrialization/recipe/dyes/yellow/mixer/terracotta.json +57171450fde92bfd258e7c0b205239c63afb2794 data/modern_industrialization/recipe/dyes/yellow/mixer/wool.json +5779ced3a444616f350b1fddb6f5229618809eba data/modern_industrialization/recipe/electric_age/battery/cadmium_battery.json +15591ba9779bf7f9626a1cee431ef426ed464343 data/modern_industrialization/recipe/electric_age/battery/lv_battery.json +80dc4896f386845696c5e08fe8f263c89e7f500e data/modern_industrialization/recipe/electric_age/battery/plutonium_battery.json +712abbe1d508f159ea4526789590d3d722aa7a96 data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit.json +9259b219676f90c282770f99bfdf51740a77ea26 data/modern_industrialization/recipe/electric_age/battery/silicon_battery.json +1665a26edbc1f7bcddb6a03b1690ffe9625a2ba7 data/modern_industrialization/recipe/electric_age/battery/sodium_battery.json +b5a770c3ad903c5f25332618bf3312f2c478109e data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json +d37d4a127f485d4668540704d4f8412c4adf4835 data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json +0fc529d40bcacf66820f6a0f9568de1b14c7c6aa data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber.json +5c95fd7edf2bd023b8cad47f971a6711f662333a data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing.json +cae6eb156b52b8313ace94d667fe41650de46d5f data/modern_industrialization/recipe/electric_age/casing/blastproof_casing.json +0ff756f800421447726edada85571b80f2c64eff data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks.json +362dd089eabba43b5b7a172f03fe2ed590f1ccc3 data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing.json +3b415f0900b35c405f1b12af9cc360fccd2a52b9 data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing.json +44407bbcc924ad8046ca1d7a26d2d8650ea5a347 data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing.json +d8ba50e6d50de04328195096ce1908d2634a8213 data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing.json +1f5917282618780196d2725885e35810f4b808da data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe.json +3715751ee97d463210e78b6f3dd20f20ca9022bb data/modern_industrialization/recipe/electric_age/casing/nuclear_casing.json +bdca1132c47a97c45747be4e02f2c46b19600b17 data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch.json +32a9c1da4d7472e6a8cb76064183f53795705e8c data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch.json +3969754fca25985480e0001bcae88d8105a23166 data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing.json +bbf0af79cbe9a32e4bb5ce9037ca4d9a20b51574 data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing.json +e9ef3dcade3a661ac4d1cc118ce78b7146514097 data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing.json +bdf37ad3e0bb3f5e55f45452fe3b5bf228b1f6dd data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing.json +12ec4f434383e111bc38d80c2690d32fa4ea5e3c data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe.json +d4cd1a190ae4fdcc744b30dca7b7d926a17bbccd data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe.json +2db10ed7d8a9ecb7aae6abe312741ae321dfed62 data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing.json +205c0c0382ea063e862356b3bb46d012eb9c7819 data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json +c947d397ccfbde76129e256554c0f0a922192f6a data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json +bc8c30d9741dcafd7cc0ba1680fd81ff6c2a915c data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json +f74a4d0e64394584eb2f67ca1665c6604434e839 data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit.json +e6c6a7ce2dc46f02df28291062d1f4c85b99e0d4 data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit.json +a2a9e604caed71245886b77f5530dfba971e9606 data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board.json +47ced67352f958eafeb6c492534a02096ae829c5 data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit.json +f79487ec88cdcaa3c33dab0c4fa46ead848b6b07 data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board.json +f381a218e86fb3f092c10d2fcdf65aec0ff1f83c data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit.json +439d9555e158058cd950ccb0050ae76eb61c7a09 data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit.json +85981374ecd4c7c5f4f0d71d7f409be75e1c6576 data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json +ebf71f7a644a840d466031ef17b987027649eaae data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json +31c21e5c2995097664c7fd9cc85e16ddd0bdb859 data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json +ac37d8c2f050eed790b01050dc71eba1730b1e43 data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json +2264e7a9332b3f9df745c83257da8ba524fd7bf5 data/modern_industrialization/recipe/electric_age/component/assembler/pump.json +97502467c18a0c1c2014632ea934712027d42469 data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json +52c557ebcaab1fd0eee30f8d4d2d9a84dfc52545 data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json +306a02d3843aedb8c6193cbd5e762bdb13207ef3 data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json +347396f4648a6c4149d71c656d0d0861dc573c2e data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json +425f215c336dbb0c2763cd6deac7e4877d80ce30 data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json +9d8c96ee8e58860dda51540f89c06b955e43f5db data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json +6b703a9c364ab54f07fcb3b631d074540dd1a73a data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor.json +9f1ed2ee0ba5e37e88b6a5042666f75cb8e770c5 data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json +0e0f24bd22097fd5640947351ef3c4198a2f8951 data/modern_industrialization/recipe/electric_age/component/craft/air_intake.json +ef6cfe046930e921fd0d0ced6414d799bc85b3c5 data/modern_industrialization/recipe/electric_age/component/craft/and_gate.json +5e99af18f62daeac4b4d5d89763b52fd37d3dc7e data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit.json +e155197cde99d6bad67b88262ad5c835192564a1 data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json +159d45c692ef630c3e17fcd73d1fe27c754a2f5a data/modern_industrialization/recipe/electric_age/component/craft/conveyor.json +fdf7d554e8ecdba77f176113beb1078e987d05c0 data/modern_industrialization/recipe/electric_age/component/craft/diode.json +a72e6a82587b4059a1161b26ae5ac0d0358a0a02 data/modern_industrialization/recipe/electric_age/component/craft/diode_doped.json +805127eec0f5cdb3c95b496f64fad821960d3cb4 data/modern_industrialization/recipe/electric_age/component/craft/inductor.json +b20d16e1e31355d5e9ede755e21c38701e5833ef data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade.json +043ce5cb1ae07257ca3e949d5a26274824c357bc data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor.json +a455e2f096b01afa442f6aa8ffc85398aff69149 data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump.json +93dfbfe1eba0ceca366d1afd40465ae8fac9767a data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger.json +941023001f55309019444778f77d9395a2647843 data/modern_industrialization/recipe/electric_age/component/craft/large_motor.json +5c2c071e9aba8827dfc812a4171022bfa8f751db data/modern_industrialization/recipe/electric_age/component/craft/large_pump.json +c50eabc1fb4a39dd54bb0f3ded890386bde0c08d data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit.json +f168969763aabfce96edd8850879db82fca56552 data/modern_industrialization/recipe/electric_age/component/craft/motor.json +5393f2672160d7069a4abe28fe210cef4c829bf6 data/modern_industrialization/recipe/electric_age/component/craft/not_gate.json +66817d78401a7a789bf274547d6b7386dd2f7521 data/modern_industrialization/recipe/electric_age/component/craft/op_amp.json +d006a4645061d97a680a17d5a71b892a4a2d7ed0 data/modern_industrialization/recipe/electric_age/component/craft/or_gate.json +3a449a59ade7b28891b9a63128360019575f923d data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module.json +1678c3fa7e8e0b2e176caf91fbe762b2691de0f2 data/modern_industrialization/recipe/electric_age/component/craft/piston.json +af618d645ea9a091eaacfea2bd81c523b4214ac6 data/modern_industrialization/recipe/electric_age/component/craft/pump.json +336edae28839abb6eb0ad74f09b655f5366df128 data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module.json +e7adf517306a3443b40f10ddf02ed753862e0730 data/modern_industrialization/recipe/electric_age/component/craft/resistor.json +ae1683f48e9c61399aa752b06e2c128b08d40e9c data/modern_industrialization/recipe/electric_age/component/craft/robot_arm.json +7ed71921bf41e0849377d4fc722ae2d187494474 data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger.json +31761a9fa180d6f406b1a0a79baab71a83292a68 data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json +60a53062f01994c33a94dfe2f90c174f723a85f9 data/modern_industrialization/recipe/electric_age/component/craft/transistor.json +d8cd2adbb47a095284787d3c23dac4a8c043e046 data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped.json +6336bd677c28f19fdd164d390dff89bed8d1cdd6 data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball.json +979472ba3694278fd8300b44aac24511b91b20e4 data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json +6e42be467b79963fad93d78cf080b80048b6c8a6 data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json +1502a8d32a3c8e2be85bb62b74b716641d8def35 data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json +1a4a713b892394258b86b4d569c3dd9a41869dc7 data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull.json +a093fa759c51e489049a0be84763b62bc02051b7 data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull.json +6add40e0e6ce8abcd12e7e02082931551d0d48db data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull.json +8371c1cd30bacb5080751b68fa258230a74c66f0 data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull.json +7c6318a42f459ed6ee4516ae69d21f78d6e0bc9d data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull.json +4081b8fc8eb1185104649e5da9de472af2dc68e7 data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler.json +395f49b6c1f8d23aeb5ccf89e0647f0d6fafe4c5 data/modern_industrialization/recipe/electric_age/machine/assembler.json +1551cb1b2d5e4148221149bdfb66708ba514c0c2 data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json +5d370ead7a9bf1448c16fef457688adfbb832f01 data/modern_industrialization/recipe/electric_age/machine/centrifuge.json +e02eeb5fa1547c4e69992cc2e1424eb693959482 data/modern_industrialization/recipe/electric_age/machine/chemical_reactor.json +0dcbfb4f4e599a36407cd7489318c1af82cb5466 data/modern_industrialization/recipe/electric_age/machine/compressor.json +5a746096d79a95cf3dc0761dc7b1fbf7b84deaed data/modern_industrialization/recipe/electric_age/machine/configurable_chest.json +7964d8600266d18c12e67898571da761b788697d data/modern_industrialization/recipe/electric_age/machine/configurable_tank.json +f23c50ff3823035ad730db2fafba5cb13f57db8b data/modern_industrialization/recipe/electric_age/machine/cutting_machine.json +241e6d66a88183c598bfa575adb829cf0699f96b data/modern_industrialization/recipe/electric_age/machine/distillation_tower.json +2bcbf892ba4ee472e82122a419a684f0bdcfcf3d data/modern_industrialization/recipe/electric_age/machine/distillery.json +c788acba680cf6c361b4aa791ec0e42b0b9101b6 data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace.json +9bd5b7d345a366eb399ecf8f67f668ac66e5f3c5 data/modern_industrialization/recipe/electric_age/machine/electric_quarry.json +206a82f9f44113ac622980f490684cd586fa18fa data/modern_industrialization/recipe/electric_age/machine/electrolyzer.json +8dcec511dd6ac47b5b16e272c27e77ce3e0c325c data/modern_industrialization/recipe/electric_age/machine/furnace.json +e848175374eb1e69aa5e0d31c02443114cd98473 data/modern_industrialization/recipe/electric_age/machine/fusion_reactor.json +1cbbc703941089a81a8ad90a418f7742c305dfea data/modern_industrialization/recipe/electric_age/machine/heat_exchanger.json +afa7d7b1a0dd96ced558083759a6ede021f28e95 data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler.json +2c8934500cf02feae88d4a5db7906628668a474a data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler.json +b4fdebdaf4267dd69d04689eeb9d8b33b655c238 data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator.json +a300fbdf648fab3c3dabf8ef49f5646ad95e21cd data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine.json +96441c7281e6532641aa54eab4b1cfa311a7ba38 data/modern_industrialization/recipe/electric_age/machine/implosion_compressor.json +5b80455d7408ad7294dcc8c61cec1dd7481d0258 data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator.json +3890117b5ebbfb23a5f56f807ce11db3521fe3a3 data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler.json +266af8a4823495eeacfecf3934eb1ab5253b8f6b data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine.json +e038d792259c73659fe89117698f846bb4f9e058 data/modern_industrialization/recipe/electric_age/machine/large_tank.json +ac41f427662746eca7449ceb86b719a0068edad6 data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch.json +d59f93f644d6d29b67dda98059090792de56fa96 data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator.json +bb0590add5e3e8bf8a95d27e82af480b909fa632 data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine.json +1a41bfb2824fe805d16fdce2740b8fc575c7b5c5 data/modern_industrialization/recipe/electric_age/machine/macerator.json +42c14db16e0cfd067cf3f7535bb5fe6fa43a9658 data/modern_industrialization/recipe/electric_age/machine/mixer.json +e790af44fed9e55b05c7cf7c003132b8c1997e96 data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator.json +e582309b70b1cff0c61a1efc3794fe387b7cde02 data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine.json +212e59917675a14c839d54b56e42103a06f8ee26 data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor.json +f1eadfcd8e6518abad03dd72daceedc6c6266e7f data/modern_industrialization/recipe/electric_age/machine/packer.json +e4e015b127fb4f68a53242eb8dc7e40292bbf6f3 data/modern_industrialization/recipe/electric_age/machine/plasma_turbine.json +98f2b6549e18a4b4f2d681cca07df8b9a65a276f data/modern_industrialization/recipe/electric_age/machine/polarizer.json +99ef04a19e4b5c2c8c74e2aede22508162e22263 data/modern_industrialization/recipe/electric_age/machine/pressurizer.json +6144bb36cd9d81a8e048759ee741c2bc4e643ad8 data/modern_industrialization/recipe/electric_age/machine/unpacker.json +7dadbfc41b5919d528da928c330a46332e48833a data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer.json +031beb480c83dfffb71f51f7529373a92c3c6852 data/modern_industrialization/recipe/electric_age/machine/water_pump.json +c83b06ce1f749106745ace02f682ce0985ddcded data/modern_industrialization/recipe/electric_age/machine/wiremill.json +cda5a4a804cc792b45b90cdcbcd8a3f4dffbb492 data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit.json +3da067de5716bf68716aba9a7d76a109e3302422 data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit.json +28159129dd4dbbcd127a23f37fa9108088e91c6e data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit.json +756cf6021b8774e86e27876cc0ba2f62f1dfe13b data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit.json +db2c855420b93814712d63bc0965161122e209f1 data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit.json +a494c14d8787dedb185e2b8959aa061c4d1ab140 data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down.json +4f0bec6930413b2c550915aa5626b1094e0e96e4 data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json +65c35306fba2c72f8af11a0d75351549526ee45f data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up.json +26a122cc2e61aa297fa6c0318a6556311d830ad9 data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json +0b143d66673347359fde44a5b800b1318f65eaf7 data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down.json +2a8c8b36cf0d9ddfc886aaee32b529e3689d4ee2 data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json +f8b361a10496840946031bc3de95f8777df0a393 data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up.json +e26542cdf0b11f0207f1684fbe5feb9677bfe7d5 data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json +3c4b5c16f8961ad2212b5ec157871b49c3149066 data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down.json +64d5cf42ee7c5521760961319090be03ceefa33f data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json +0611753e8c1d5809b6158fbc8f86e6bcb3a8f65c data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up.json +4b32d7b4094a07365b60dd5966a677019a314422 data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json +4c567ee8293264d495a5e662eea73cef604e8215 data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down.json +6e5b58dc2c5f4231218ab3538f873e4dccdcda29 data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json +2ac942cc3091bc5734e57bd7dfb7537446233d3e data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up.json +bca18d9d56eb100ebad8fb0cc2c1197f01c625b4 data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json +9177c553f929adbad6507799bf1483381450216a data/modern_industrialization/recipe/electric_age/upgrades/advanced.json +2ff49fb24ad99fa92351c39bc2e59c632e4db87a data/modern_industrialization/recipe/electric_age/upgrades/basic.json +fedd97ad26f2ddbc23e8b5a7320352abd683e915 data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json +01f3a1f99dec6945d74609a1eb87e1ec3f8b9138 data/modern_industrialization/recipe/electric_age/upgrades/quantum.json +dd1a6ca287a3836d8db76154d50df3538034bd3f data/modern_industrialization/recipe/electric_age/upgrades/turbo.json +0b4dbfcd74caf9e469e71ba9a80deb5d97465466 data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json +4bc0a7141dfdae4314b0a73267630001173b52bc data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json +f5a6276a34697e530a4113e9c7bdcd90f739d998 data/modern_industrialization/recipe/fusion_reactor/helium_helium.json +90ee51b011fe6fb50e5d5762c061f5cdf4d090fe data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json +e0f3737ece113b87ec904931b1723392485df222 data/modern_industrialization/recipe/hatches/advanced/assembler/energy_input_hatch.json +1ab9ba43fb3e1650a272929f61c1f3323eb75de6 data/modern_industrialization/recipe/hatches/advanced/assembler/energy_output_hatch.json +5fd4f991f54b5eeed9d8fd7c94d3b612401fbffd data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_input_hatch.json +7289124cd80306f2fab60f1d664cfbfe4960076d data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_output_hatch.json +18181f8bfc50d26416d46078bd6aab87c6618314 data/modern_industrialization/recipe/hatches/advanced/assembler/item_input_hatch.json +a15af883596a801d6a7b174d224f0f02c103f1da data/modern_industrialization/recipe/hatches/advanced/assembler/item_output_hatch.json +cbf4d95fbfd14eacc683dc49b5317555e66a07d7 data/modern_industrialization/recipe/hatches/advanced/energy_input_from_output.json +0ce17f73855f8925f4beefdfdbaf0f77e01493aa data/modern_industrialization/recipe/hatches/advanced/energy_input_hatch.json +83972b8a79dde7f81d3f96a5b5a601e2a3d0cb13 data/modern_industrialization/recipe/hatches/advanced/energy_output_from_input.json +5688fa2411a32c891a28e3527ecff26cfdda87a8 data/modern_industrialization/recipe/hatches/advanced/energy_output_hatch.json +d656b971284d8239423b4c9793c38bd73ee64459 data/modern_industrialization/recipe/hatches/advanced/fluid_input_from_output.json +aa31b5af929fa69f9cc1d973ed7ad3abe53a3cf5 data/modern_industrialization/recipe/hatches/advanced/fluid_input_hatch.json +826234a660b03fe3e8993db6d06439e4636bc4a5 data/modern_industrialization/recipe/hatches/advanced/fluid_output_from_input.json +6a08a0e5b8d1055ad548f72f26098c7e4f5deded data/modern_industrialization/recipe/hatches/advanced/fluid_output_hatch.json +81816245af76ed84dafdbd1d39f9b7fc6533b2df data/modern_industrialization/recipe/hatches/advanced/item_input_from_output.json +9e728711a9ebc4fc01e2a7975f7f611a2a5f8f23 data/modern_industrialization/recipe/hatches/advanced/item_input_hatch.json +1216efde8e4cd0924cfcefac7dcbe7b3a1e0f467 data/modern_industrialization/recipe/hatches/advanced/item_output_from_input.json +e3fd8dd989ae4a9e38d08536fa65605a46b38d0d data/modern_industrialization/recipe/hatches/advanced/item_output_hatch.json +7763426ca8373195818dd2137a7f06259e730429 data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_input_hatch.json +7b1e28ddcb115fadb857d58fefabd4c3443a3b2a data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_output_hatch.json +230f20e26122219f0b8ee75b86263c2971ce35f3 data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_input_hatch.json +4287358a0eb8c7089b95d3c030c8b0992849d09a data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_output_hatch.json +0c8d83b3d5090509f5b7016e11041361a0a23dbb data/modern_industrialization/recipe/hatches/advanced/unpacker/item_input_hatch.json +7a59fc8d180ea0d56294aba925dafff8f05b00ed data/modern_industrialization/recipe/hatches/advanced/unpacker/item_output_hatch.json +6b082e6c6a7db904649a1f596ecefff092c02801 data/modern_industrialization/recipe/hatches/basic/assembler/energy_input_hatch.json +c68cd2920258ca559cb46977f9c55bd207456478 data/modern_industrialization/recipe/hatches/basic/assembler/energy_output_hatch.json +f645497cae0995fc940cf137c93440be8e1dbbb4 data/modern_industrialization/recipe/hatches/basic/energy_input_from_output.json +16f48a5a8180eb79eb5205f781a15d2a8f074ba9 data/modern_industrialization/recipe/hatches/basic/energy_input_hatch.json +034ad6d4a2ce8f3bb01224a50c5597f9fb16e828 data/modern_industrialization/recipe/hatches/basic/energy_output_from_input.json +dc72a1d84bb9844a330b83b3e91615497b5e5c15 data/modern_industrialization/recipe/hatches/basic/energy_output_hatch.json +a605c0c04e1c9b6ffd81e94aa5ba53b412a0801e data/modern_industrialization/recipe/hatches/basic/unpacker/energy_input_hatch.json +5c1cc012d03de8c8bff6ed04cd7d8828b68f6988 data/modern_industrialization/recipe/hatches/basic/unpacker/energy_output_hatch.json +402f4f5100b172df3ac8090bf323043f05711878 data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_input_hatch.json +7e3e22b4f5533cf1bdb1707a548e4cbf726060d1 data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_output_hatch.json +95cf4984f017ad4e87c9bcb1232290501f3c326c data/modern_industrialization/recipe/hatches/bronze/assembler/item_input_hatch.json +d19414c9698a1c3467de69491bdd055f2ac124b1 data/modern_industrialization/recipe/hatches/bronze/assembler/item_output_hatch.json +25b23a6c662f2adc43fd7b6fc67d484cc4f47b7f data/modern_industrialization/recipe/hatches/bronze/fluid_input_from_output.json +076433ae95ad17c0423950ccd0d766d274be07d6 data/modern_industrialization/recipe/hatches/bronze/fluid_input_hatch.json +c082e981af138331ded65eb3f4cfccfd7871711a data/modern_industrialization/recipe/hatches/bronze/fluid_output_from_input.json +a6eed22de7c54a2d6fb1111f43911f4aaeae7eff data/modern_industrialization/recipe/hatches/bronze/fluid_output_hatch.json +1c92837ff3f203445653a775b9f8d041e3aa3edc data/modern_industrialization/recipe/hatches/bronze/item_input_from_output.json +d4ecad022f6c7148f2ddce0c74651e28bb5d4c9b data/modern_industrialization/recipe/hatches/bronze/item_input_hatch.json +492df220f5fadfe9a8aa84c4a863e18e0be36c34 data/modern_industrialization/recipe/hatches/bronze/item_output_from_input.json +661e1da7c01d7a112d9c352ddf486c055fcdce8f data/modern_industrialization/recipe/hatches/bronze/item_output_hatch.json +ca5390f827a95e8145acc7965620c4a5388ee9a8 data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_input_hatch.json +6a4be5aa5acad27bb2c3b4a717734c09449d5f58 data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_output_hatch.json +530b410dc51d0559a2ff513f7caa0aee315129c3 data/modern_industrialization/recipe/hatches/bronze/unpacker/item_input_hatch.json +236c0d0a0d8ec89f1ce78e75dceabc3ebea3a612 data/modern_industrialization/recipe/hatches/bronze/unpacker/item_output_hatch.json +4015615a04f8508cc3c5f9202143cc011ed3ec4c data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_input_hatch.json +66dd769e111613335aebb5f21670389f12df5b19 data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_output_hatch.json +867f572a79ae440dbe2916be67be5e32715ce2c0 data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_input_hatch.json +a51ef12f2e3926c19577863939c79c0c371897fd data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_output_hatch.json +01be5bf21557284e4c44942a207e6ac15867886d data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_input_hatch.json +4e4fb30d85f1b846aa1d8ed51d43cabdd75cecee data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_output_hatch.json +06cd3da81f806d28105489ce43677603ee721663 data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_from_output.json +ebb21c0d10d13d6635538f7907f91ac2723f4b02 data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_hatch.json +bb52c8842c8b604f10c47fa8dbb701c799c71c35 data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_from_input.json +e04754f56141dce177a5a71e48fedc60558d254e data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_hatch.json +84bc27dcaea0a60e70dc574fbb291e9ae5ef7ba9 data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_from_output.json +ede55873f76f465e49d34db5cb56c6fdaa1ad9fd data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_hatch.json +2d07e34fdd174775a133fe1e01c91546924763f4 data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_from_input.json +426c112e64b7fb668a83fe9144518a62beb6ed1c data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_hatch.json +f496649da5e9e880f9f55de12a35ba7915ebd1c3 data/modern_industrialization/recipe/hatches/highly_advanced/item_input_from_output.json +33a13c713f7792a845c88a4d80f5f59b849a5b25 data/modern_industrialization/recipe/hatches/highly_advanced/item_input_hatch.json +c2a0eea6d9f8dd59cc0aa9ddc70376f61ec70dbe data/modern_industrialization/recipe/hatches/highly_advanced/item_output_from_input.json +9e3d1686692f2631f72cd65dba18bc4587bdabb4 data/modern_industrialization/recipe/hatches/highly_advanced/item_output_hatch.json +2f6e90ede1ea71868b77c2e2db4ec34dee7a1825 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_input_hatch.json +b4c48f1c85696b429b66d1d2e8eda0496f5e5519 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_output_hatch.json +f26bbb08d5c6d8e33a45513d24cb060ebc140c30 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_input_hatch.json +3bd9244d5be7c297c202e4f7552c266be783fdad data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_output_hatch.json +66e7f202285b743b36a3ca79d111807e9636c005 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_input_hatch.json +bbbb0474b57317de8b240c2dd7c43ad007cf8279 data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_output_hatch.json +c2b60d86d818b21b191f21c90723c7270f120c27 data/modern_industrialization/recipe/hatches/quantum/assembler/energy_input_hatch.json +3c194d582013f55360bf557f4627aa3ac21cbc6a data/modern_industrialization/recipe/hatches/quantum/assembler/energy_output_hatch.json +7eb353572bcd8f46312946f59a0013dcfc40755b data/modern_industrialization/recipe/hatches/quantum/energy_input_from_output.json +a6e9d700605c63638cca63c9417781e869198be9 data/modern_industrialization/recipe/hatches/quantum/energy_input_hatch.json +2217d30deca6d0ddc84086f4e4388444974769d5 data/modern_industrialization/recipe/hatches/quantum/energy_output_from_input.json +c3f12ef41b33444eaa17d86d3c763e1662dca3c2 data/modern_industrialization/recipe/hatches/quantum/energy_output_hatch.json +187ff7af756f23ac8d88a2049045435b86115e1f data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_input_hatch.json +b612cdc20f66b2497130c99894e2754377d744be data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_output_hatch.json +d78a682fa824ea260ea85adc05e7601beaf09081 data/modern_industrialization/recipe/hatches/steel/assembler/fluid_input_hatch.json +20426cc0fa3e698695745a722199e7b8b7377890 data/modern_industrialization/recipe/hatches/steel/assembler/fluid_output_hatch.json +580780dddbd211acbdf81dd5449c25b8ac9a74ba data/modern_industrialization/recipe/hatches/steel/assembler/item_input_hatch.json +94c69cd34142b7a81304d1bc815524c906fa9316 data/modern_industrialization/recipe/hatches/steel/assembler/item_output_hatch.json +08d9f1683fb42d8d5e087384deea7bbf8c36a3f9 data/modern_industrialization/recipe/hatches/steel/fluid_input_from_output.json +3df55e0d910494c6ff8ff311c1a69aa2afebc531 data/modern_industrialization/recipe/hatches/steel/fluid_input_hatch.json +5fbc29f7d197a8143ad7db11c23d96ff9c583601 data/modern_industrialization/recipe/hatches/steel/fluid_output_from_input.json +fb3d363ff20aac6f7885f2ff7f9776ba7f6dcd47 data/modern_industrialization/recipe/hatches/steel/fluid_output_hatch.json +ec9af89659732f26c3639a2864432b7a31f63364 data/modern_industrialization/recipe/hatches/steel/item_input_from_output.json +6824dba674c29bc907d5e6b70529d65e141b8333 data/modern_industrialization/recipe/hatches/steel/item_input_hatch.json +19565d86baf029047a57f35983d883db2415ebf1 data/modern_industrialization/recipe/hatches/steel/item_output_from_input.json +dbb21f4edd28f079ab2c5088d3ec013e68b1fa65 data/modern_industrialization/recipe/hatches/steel/item_output_hatch.json +619242d6f6ddf04ad27b8cde6c67d80edf24f8e1 data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_input_hatch.json +2eae1eac5ae16852bb119faed9431ce4f118ddf6 data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_output_hatch.json +07226a09b84019fa8c0f58cb5884fa3a55c2ad63 data/modern_industrialization/recipe/hatches/steel/unpacker/item_input_hatch.json +6281e079d605764a07e57ba98295b1ae8f25d669 data/modern_industrialization/recipe/hatches/steel/unpacker/item_output_hatch.json +cffee17ccf27a5db5c79760c9c9e5a2e346d4868 data/modern_industrialization/recipe/hatches/turbo/assembler/energy_input_hatch.json +3c5461cb071be6773466fce419ecfc9cce3141c5 data/modern_industrialization/recipe/hatches/turbo/assembler/energy_output_hatch.json +4afac2f5fe01a72afd8ad3385104e79d6fbf94cf data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_input_hatch.json +a9d266f4bc57918247ed9894af2fd581eefaf458 data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_output_hatch.json +43bddc315d305d86bb540c379208d91a364d7f3d data/modern_industrialization/recipe/hatches/turbo/assembler/item_input_hatch.json +2fbe0805271fef4400b14a20b7fd171b380ece4d data/modern_industrialization/recipe/hatches/turbo/assembler/item_output_hatch.json +43daa9479c9ebc50da33ea6163f80e07b559ba4b data/modern_industrialization/recipe/hatches/turbo/energy_input_from_output.json +8c91245b5151239f22233dc5b653f794e592c766 data/modern_industrialization/recipe/hatches/turbo/energy_input_hatch.json +d0354869c17478c1d863444f2487fb481caa4043 data/modern_industrialization/recipe/hatches/turbo/energy_output_from_input.json +8089c891e03339b1d573fbe83b5100c92ff8945e data/modern_industrialization/recipe/hatches/turbo/energy_output_hatch.json +0047b405e218e1eb89ce5c145b2960c3ec1c60b7 data/modern_industrialization/recipe/hatches/turbo/fluid_input_from_output.json +6f3b09826d5051cf192cb69b2bd6a929cc6375ad data/modern_industrialization/recipe/hatches/turbo/fluid_input_hatch.json +f9ca3d779eff43b14498abb6b26e31c28df98fa4 data/modern_industrialization/recipe/hatches/turbo/fluid_output_from_input.json +33cfce079262dc74f8aad07f1f00d82d9ba94f9b data/modern_industrialization/recipe/hatches/turbo/fluid_output_hatch.json +d11766c27da05c7a86ae689c25a72b85b3d65e76 data/modern_industrialization/recipe/hatches/turbo/item_input_from_output.json +fb9575070191a631c92f71582e7bda26f7450b21 data/modern_industrialization/recipe/hatches/turbo/item_input_hatch.json +27aeff59057782f3053504b1ffcc94eb18875131 data/modern_industrialization/recipe/hatches/turbo/item_output_from_input.json +157ef024cfd8c98d71fca99a2cdb876ede1c72c3 data/modern_industrialization/recipe/hatches/turbo/item_output_hatch.json +020b43860c5bbea2afac8419c2e7cae1fef7c1f5 data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_input_hatch.json +1d53966ecc99723c7a49fc10ed283451f197335e data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_output_hatch.json +9af115fac7c228d985062a50ee31ca4c8b9d66ba data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_input_hatch.json +36fd2570b6f1e4a2843a2b15b793af33c858d645 data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_output_hatch.json +f97e88c30330a1a7dda0d749d754d6f0e0cf4493 data/modern_industrialization/recipe/hatches/turbo/unpacker/item_input_hatch.json +251f009eaa0aaa045e1fbcaa2a843a30020a13c6 data/modern_industrialization/recipe/hatches/turbo/unpacker/item_output_hatch.json +0601190e3cc1d0d7a533f81485335b59ce8ac828 data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_heavy_water.json +b0d49a7384506b6d1780a0a1d9dcc2e7d66330a7 data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_water.json +79a7eb82296795905974f0d16b181b1324eb77da data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_water.json +958fec3f493d72ebc752902891b2bd4020428c34 data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_heavy_water.json +dee43c432901f316ad07f327c3c8f841e9d0f639 data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_high_pressure_water.json +00e120e6420e8d1b1cf72b43da633d34ecda4d21 data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_water.json +e0db3855b3c5c47e8692a8a4fc41d1c54a80f5ae data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_heavy_water.json +76e546fc03609895ca1bfbfd5e6c2187dd897618 data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_high_pressure_heavy_water.json +b7b3b3e88570c1900bd548b2e8a8083a8da0bcfd data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_water.json +23f16e8d4f51baea5f214a2716355fc9a6a9d66e data/modern_industrialization/recipe/heat_exchanger/steam_with_heavy_water.json +f8ff443fd9409a339db21e35c2c7d5a0499b3907 data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_heavy_water.json +61c7adbfeeb790d026aa60d5f78b36ce8bd9bc8c data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_water.json +c1f4a283ab375f8f75eace7a77a046212254a9a4 data/modern_industrialization/recipe/materials/aluminum/assembler/barrel.json +e6207421cfaac184f5f4a4d40ee09585c967905e data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json +673dd4b9c242cceeec5dd9338e6e6b398f990c71 data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json +de280c59b8492640a44ea3e1d34ad0d01b25f344 data/modern_industrialization/recipe/materials/aluminum/assembler/drill_head.json +4c57f3e602a06c11a2da16696d9128bb12072a51 data/modern_industrialization/recipe/materials/aluminum/assembler/gear.json +a4c2b7d75b57ededac7d17b2fbf9e1c742ca4ccd data/modern_industrialization/recipe/materials/aluminum/assembler/rotor.json +a8f19a635fd8a6162c35c87341999302baad4c8c data/modern_industrialization/recipe/materials/aluminum/assembler/tank.json +666207e9293265d82d545aa003d2e01bea576254 data/modern_industrialization/recipe/materials/aluminum/blast_furnace/dust.json +bc73e8458d657be223ac95b8ca183377318f266b data/modern_industrialization/recipe/materials/aluminum/blast_furnace/tiny_dust.json +b87c680d7c9cecf5ad96410fd1e506ebb9048482 data/modern_industrialization/recipe/materials/aluminum/compressor/double_ingot.json +417b3f844d42d4b5d92e98b3e116c3c31233970a data/modern_industrialization/recipe/materials/aluminum/compressor/main.json +61240f48475f7da1654076aa69d581e40d23361f data/modern_industrialization/recipe/materials/aluminum/compressor/plate.json +a056c12495ac8a06cc0491530ad9c6600e041bbc data/modern_industrialization/recipe/materials/aluminum/compressor/ring.json +8a789fdcc2733ded935d7af34a6561349f04b934 data/modern_industrialization/recipe/materials/aluminum/craft/barrel.json +af92008d9e269cc8a99d8b13fdd878a63cf1b029 data/modern_industrialization/recipe/materials/aluminum/craft/blade.json +ed8bf134bc973a10a12be778dcb12dcc0e8e20c6 data/modern_industrialization/recipe/materials/aluminum/craft/block_from_ingot.json +d5ca0924d251298475847176db4edcbd2db02709 data/modern_industrialization/recipe/materials/aluminum/craft/cable.json +5556f7c266e15d38d316ba3cd796854504161d1b data/modern_industrialization/recipe/materials/aluminum/craft/drill_head.json +92b980511955dc2f02e1ece6e7373dfd60dc8e6f data/modern_industrialization/recipe/materials/aluminum/craft/dust_from_tiny_dust.json +b432a1f4ba5b5e046a6f7e92be84872daf3461f5 data/modern_industrialization/recipe/materials/aluminum/craft/gear.json +7bfd74cc2b08d6154e9075971df63c8721f02cbb data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_block.json +1f85527263ec92840ad927ab1e60fdd9dc61c9ca data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_nugget.json +738cd1e8fa1dc11c2a0507fa61ade3ee2ff0c70c data/modern_industrialization/recipe/materials/aluminum/craft/large_plate.json +eecb5f21d8b651fb7d4030fb9804e3fffcb95abe data/modern_industrialization/recipe/materials/aluminum/craft/nugget_from_ingot.json +9f3f637005988f40896f3fd4183b0519d596f8a3 data/modern_industrialization/recipe/materials/aluminum/craft/ring.json +cff1b73c34a969ac5ca26746100a237b42317228 data/modern_industrialization/recipe/materials/aluminum/craft/rotor.json +fabb1d99d63d2fa5c7feb4c122d48b70c056bbfe data/modern_industrialization/recipe/materials/aluminum/craft/tank.json +5d389038a91d21b6c56380e10e25586b846f813d data/modern_industrialization/recipe/materials/aluminum/craft/tiny_dust_from_dust.json +fe0befde27c304005385d8763bef8fbe9058993a data/modern_industrialization/recipe/materials/aluminum/cutting_machine/double_ingot.json +94da83cb743162ac12e9e9cbff152cc8425d50ef data/modern_industrialization/recipe/materials/aluminum/cutting_machine/main.json +d1b19b47a2d888221308f3ed6543efbb49b48e55 data/modern_industrialization/recipe/materials/aluminum/cutting_machine/rod.json +55e0d6813e17089477aff90545689c8868904694 data/modern_industrialization/recipe/materials/aluminum/macerator/blade.json +3090991eec10ac177e703ecbb398ae415ecbc8f8 data/modern_industrialization/recipe/materials/aluminum/macerator/bolt.json +2db3083bf3d1d4261dcbdd0aa4979432b9a00e09 data/modern_industrialization/recipe/materials/aluminum/macerator/curved_plate.json +10d8fcf9fba643ed67233eb52389f324eba7e5f2 data/modern_industrialization/recipe/materials/aluminum/macerator/double_ingot.json +4fc67fc1edb48e690f4fc1d14938d0eaf2690ff1 data/modern_industrialization/recipe/materials/aluminum/macerator/drill_head.json +ea0b9e3e7db85aa81d97a6e57b0144ed2f87d4cb data/modern_industrialization/recipe/materials/aluminum/macerator/gear.json +3c34fa36decb2df6286979d71d7fe18cebeb8866 data/modern_industrialization/recipe/materials/aluminum/macerator/ingot.json +8341cc2cfcb6d9a8ce7f1c9bfe07e9c2e83d93a9 data/modern_industrialization/recipe/materials/aluminum/macerator/large_plate.json +1086102b469c389fdae3ad4f52347748e38d73e9 data/modern_industrialization/recipe/materials/aluminum/macerator/nugget.json +77fd3acc0ce7f984d41eca38ee333d09b45f227a data/modern_industrialization/recipe/materials/aluminum/macerator/plate.json +e7c973613e1cd175015bbe00e9d3515f8f14ae3a data/modern_industrialization/recipe/materials/aluminum/macerator/ring.json +19bf155b84cbe00dd765ffec056bcc3fe7c588af data/modern_industrialization/recipe/materials/aluminum/macerator/rod.json +6d1bcc6bcf4cb855f76d74da766040975c452e19 data/modern_industrialization/recipe/materials/aluminum/macerator/rotor.json +b0920ff40204cb75b4f1abf8247a48f73fcfddbd data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json +eb52523bd1943cd1b3be7f9dc0bdf1d9cf2137db data/modern_industrialization/recipe/materials/aluminum/packer/blade.json +0d17deec2aa93dee5ed29fa830c34bf7bbc21f9c data/modern_industrialization/recipe/materials/aluminum/packer/block.json +808ae05749566bda0a0b0940927f1d37d14865d0 data/modern_industrialization/recipe/materials/aluminum/packer/cable.json +1a52865474ac7adf5b528fbcd5b77691f4348992 data/modern_industrialization/recipe/materials/aluminum/packer/double_ingot.json +ce9609fd168fa682da794072f9ac6fa638bb3752 data/modern_industrialization/recipe/materials/aluminum/packer/dust.json +42840b80833e32aebcb7996ffe609d1e542d1dda data/modern_industrialization/recipe/materials/aluminum/packer/ingot.json +eac4c9c2688caa54049a7900ebf921cf3e477221 data/modern_industrialization/recipe/materials/aluminum/packer/large_plate.json +87c6cd5a05571185fc7eda1cc4ce6bb5d83270fd data/modern_industrialization/recipe/materials/aluminum/unpacker/ingot.json +f469d5c99d088a45dc4bf8f5bbdf1dcb0ec189d0 data/modern_industrialization/recipe/materials/aluminum/unpacker/nugget.json +3974398b5a756025b7ad6b655f686bb545110317 data/modern_industrialization/recipe/materials/aluminum/unpacker/tiny_dust.json +2ba22c04b4548b200ed52a3e8e9d28438c9c8e4a data/modern_industrialization/recipe/materials/aluminum/wiremill/wire.json +fb386e8153a15cefa48e10f05389a94a4a6a05b2 data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json +82bb8145bf457e068e13acaeecf85cd0a94b8181 data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json +e137b601e53ccb57e49376d25fc5e05b818a7f06 data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/dust.json +6bc5601763922c549630743a0093329cf4136cc2 data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/tiny_dust.json +09b2de2197bdb3aef1a0bc3595a1692a33555ebf data/modern_industrialization/recipe/materials/annealed_copper/compressor/double_ingot.json +dc213252d6047b9ee2ceed92db068ee2138ec5ea data/modern_industrialization/recipe/materials/annealed_copper/compressor/main.json +0aa3e8d3f87642236bbdf6ae218318d9068d3330 data/modern_industrialization/recipe/materials/annealed_copper/craft/block_from_ingot.json +a95a058e9a51ffa112531724fea30c8f96b864ce data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json +07592842816eff491d4205a9e4cc607b8ec747e2 data/modern_industrialization/recipe/materials/annealed_copper/craft/dust_from_tiny_dust.json +726292357ae6837d969ec3f128daf95f47d0b90c data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_block.json +d2473e109b7ed9a218c1d683c94b94282cbf9594 data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_nugget.json +4e280b4d67f76309f9a5fb80f1289244b7a8e2b8 data/modern_industrialization/recipe/materials/annealed_copper/craft/nugget_from_ingot.json +3f4d0f58b8238c4b63ad7ec4f23d274938924abb data/modern_industrialization/recipe/materials/annealed_copper/craft/tiny_dust_from_dust.json +5e6d2eda33078a8da83970244220564d4e9c92da data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json +8bd4867a02f6a56d0128b3d1f82d57515925dfbc data/modern_industrialization/recipe/materials/annealed_copper/macerator/double_ingot.json +cdbb53a434c73ac5fd3f3d0b7f129d3d07adc840 data/modern_industrialization/recipe/materials/annealed_copper/macerator/ingot.json +9bcf923bb7c7cc2c2f598174b7f76c9de16ca71e data/modern_industrialization/recipe/materials/annealed_copper/macerator/nugget.json +f73c6b3dd193edfdb492f8d97f037404060fa16e data/modern_industrialization/recipe/materials/annealed_copper/macerator/plate.json +f1b0e432c88b55b2a2576cbbc0d8375f2d1fa61e data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json +7889e063eb90dd12c09d422ac706b40b8b48467d data/modern_industrialization/recipe/materials/annealed_copper/packer/block.json +4258459371fa22750d6c1df809732a0344090d69 data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json +5acfd34e3ceddce604022d668119eae93ca4c96a data/modern_industrialization/recipe/materials/annealed_copper/packer/double_ingot.json +47fd2d11a0e6ea11a980d48c396b044f72002802 data/modern_industrialization/recipe/materials/annealed_copper/packer/dust.json +f812463300fdba36a38fc88ddb3b0f1ffbb527fc data/modern_industrialization/recipe/materials/annealed_copper/packer/ingot.json +619dd0ae1f7b23e71801580b61ce68a09c603e44 data/modern_industrialization/recipe/materials/annealed_copper/unpacker/ingot.json +2672602a1b4bfd4a68a486b05df0b7abf6f85da7 data/modern_industrialization/recipe/materials/annealed_copper/unpacker/nugget.json +a39c104c3899ddfd1d094395e34cef79a6562e19 data/modern_industrialization/recipe/materials/annealed_copper/unpacker/tiny_dust.json +636cd6d836b93dab4877b61bb43ad5715d945f4c data/modern_industrialization/recipe/materials/annealed_copper/vacuum_freezer/hot_ingot.json +6c1a67c050024ed00f87a94074c8de538fc485f7 data/modern_industrialization/recipe/materials/annealed_copper/wiremill/wire.json +e8fbb31458dbb8cc5b71948f0c706903586d498b data/modern_industrialization/recipe/materials/antimony/craft/block_from_ingot.json +5ae18ff6a0f1b87a567e473b86d381c33a1a712b data/modern_industrialization/recipe/materials/antimony/craft/deepslate_to_ore.json +92c1c9c5eb56f04bb8f1e1842306d2d884ca2d38 data/modern_industrialization/recipe/materials/antimony/craft/dust_from_tiny_dust.json +736af947da14e7690b2abef802d6923ee506ac00 data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_block.json +4d09b1689a4c72eb131fce600c95606fbc6510a5 data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_nugget.json +8a32562caa1001c214abcb3739f89179e114d504 data/modern_industrialization/recipe/materials/antimony/craft/nugget_from_ingot.json +3f71687e8974f6271407cf36c4024ecd4ea5ba2c data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_block_from_raw_metal.json +fc717f103fc1c992feef0b503567d86532550cd0 data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_from_raw_metal_block.json +f9f2cb7aabdaca60492f2ae4751063c75c8bb683 data/modern_industrialization/recipe/materials/antimony/craft/tiny_dust_from_dust.json +883fa53588dbd6b6534078b021b86fdd8815e24b data/modern_industrialization/recipe/materials/antimony/macerator/ingot.json +608adc3abdfdfbfe267d3a5e0bc7277140d1121f data/modern_industrialization/recipe/materials/antimony/macerator/nugget.json +4eaa7f45563320e13ae967040a096aa70aeeb8ee data/modern_industrialization/recipe/materials/antimony/macerator/ore_to_raw.json +65cafd45dd21bb1bf89ba2bfa87733f3504686fc data/modern_industrialization/recipe/materials/antimony/macerator/raw_metal.json +eb54775de24db9b2bda39abf40cbe3e79fd66074 data/modern_industrialization/recipe/materials/antimony/packer/block.json +b2c84dbe2415eb47b24956491221cae661f9dca0 data/modern_industrialization/recipe/materials/antimony/packer/dust.json +7599acd7b0bdab4b47ce88cdef7877dca43284cd data/modern_industrialization/recipe/materials/antimony/packer/ingot.json +c9544506308f7852566c2a4299aee98b6a3f5d4b data/modern_industrialization/recipe/materials/antimony/packer/raw_metal_block.json +e15a1b8546e9e1fa06a6213f80bf52c81cae7c8f data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_blasting.json +9f29bf94ff19d39d8a4f7e1db1f5d94cc5191b0e data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_smelting.json +de701c96721d380c9ccea512d29a0f32bb274719 data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_blasting.json +f3d65d45535f7f2c018de3172295c5f1a0a0a021 data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_smelting.json +a88b2fe172fb3211949dbb3f5d3f86ff33462315 data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_blasting.json +ab5580e91551febe2e0703a835d7370d0cb5e2de data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_smelting.json +fb3ed45b68d9aeb851afd25be0744bff5624cbdf data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_blasting.json +6f18a46b48f4be0262ee8e73f5ce107320dc07ea data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_smelting.json +394bef4eb3a565f33ebbdd206b63e7d027fe3106 data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_blasting.json +d2f24a82bdb2236b52ca7e2948e57ef9af8740ae data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_smelting.json +ebc3c5587c7a71fd7f2afb9e0aff4a7d27148ba2 data/modern_industrialization/recipe/materials/antimony/unpacker/ingot.json +5607969a8a478b8bf6ccb83706f318ce4936377e data/modern_industrialization/recipe/materials/antimony/unpacker/nugget.json +ba7623c8444dfad8ba0a04701bbe7dbd5f647a48 data/modern_industrialization/recipe/materials/antimony/unpacker/raw_metal.json +c125c9647451017e10b02aab5822a33495620701 data/modern_industrialization/recipe/materials/antimony/unpacker/tiny_dust.json +0c1fbcefd8a220a82fd099f944d994b99cce31d7 data/modern_industrialization/recipe/materials/assembler/nuke.json +c6862f3eb635563356f9eeeb205968996cca6b21 data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json +b2c7212289c374ebea61b3da920cd65259227e5b data/modern_industrialization/recipe/materials/battery_alloy/compressor/double_ingot.json +c64fa138ec6452aa1a39e80e499c4cbab2cc0b0c data/modern_industrialization/recipe/materials/battery_alloy/compressor/main.json +f38a34aefe2d835e2e0b4f4dfe14ef9ebb7106a6 data/modern_industrialization/recipe/materials/battery_alloy/compressor/plate.json +c0a13ecf671c8eba222b3a44be668452df67cc3e data/modern_industrialization/recipe/materials/battery_alloy/craft/block_from_ingot.json +e73044e90e2679e58a95bcde67c990cfa926084e data/modern_industrialization/recipe/materials/battery_alloy/craft/dust_from_tiny_dust.json +52d0370140ea1b8610dae9d00f98ccf93cf56c42 data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_block.json +b3012d2f3a1b694ccef40f54fa6ead4ceda5e90f data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_nugget.json +99b317bcf4571547dd5b9e9d8a8623a3fd1d28ed data/modern_industrialization/recipe/materials/battery_alloy/craft/nugget_from_ingot.json +fe0545331a3fb1f2cbac5d0906f2a0ddc20b39a4 data/modern_industrialization/recipe/materials/battery_alloy/craft/tiny_dust_from_dust.json +8530751ee0834ec3ead20560257e01a3d8150562 data/modern_industrialization/recipe/materials/battery_alloy/macerator/curved_plate.json +59852de226ff94f932da01904b07d4a7b56ce5e8 data/modern_industrialization/recipe/materials/battery_alloy/macerator/double_ingot.json +91168af5250a59b2445fec5cc22ee7b5a7dbe885 data/modern_industrialization/recipe/materials/battery_alloy/macerator/ingot.json +cef96e08b136ddd65208104042fc8a04aa420b5e data/modern_industrialization/recipe/materials/battery_alloy/macerator/nugget.json +9837a3e4f920abbdbc6cd044951b58da0f2db493 data/modern_industrialization/recipe/materials/battery_alloy/macerator/plate.json +0653b34d1bb4c53a764e68bb23ae0a7b1d90226d data/modern_industrialization/recipe/materials/battery_alloy/packer/block.json +08031721152598383ef0a48e0f37c03bd4ba06e4 data/modern_industrialization/recipe/materials/battery_alloy/packer/double_ingot.json +19c0d0794fa58fc00b9985e643afc13af3d940d1 data/modern_industrialization/recipe/materials/battery_alloy/packer/dust.json +21edd304ee1c0948f66f9ba8757e90dff952ad30 data/modern_industrialization/recipe/materials/battery_alloy/packer/ingot.json +7ac137fc2b5e6d3e6988ca660e571255b402b9c1 data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_blasting.json +999d27f1a8862c2a6e1428b49a410df577a4e737 data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_smelting.json +ec18f753440a33f380b227ed6c726e6e66a7df57 data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_blasting.json +79f7808db40cf8cc07992977df21327a2bd4d2ec data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_smelting.json +12e2a6861bc25363447c5cfb05e4843cc0d292b3 data/modern_industrialization/recipe/materials/battery_alloy/unpacker/ingot.json +0bb84772b81bedf422e4b3778679cb543c64a694 data/modern_industrialization/recipe/materials/battery_alloy/unpacker/nugget.json +c8e79b85ce67d857ece67a0297a4e9ff3b313885 data/modern_industrialization/recipe/materials/battery_alloy/unpacker/tiny_dust.json +0b84de595c5a661f5c0e8f7fba121fc559437015 data/modern_industrialization/recipe/materials/bauxite/craft/block_from_dust.json +abb91d42dd31e89f4a216ca3e5dc92800cb6e1de data/modern_industrialization/recipe/materials/bauxite/craft/deepslate_to_ore.json +2091003d66afa48f4dc2c73a4f8bbf320dabc87a data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_block.json +8bf5deccec9eb4405daf866b8d33aa77c60ae4e3 data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_tiny_dust.json +876bdff3bb02c692414f378849d4e0ea2be802df data/modern_industrialization/recipe/materials/bauxite/craft/tiny_dust_from_dust.json +cdb3b4fda84e1622223a7248e2d3a3104088ed02 data/modern_industrialization/recipe/materials/bauxite/macerator/crushed_dust.json +bf677f440eeab25052eeaed90fc6e404058be431 data/modern_industrialization/recipe/materials/bauxite/macerator/ore_to_crushed.json +3c6ba408915fe51e4657bbd588c81c977f74ab84 data/modern_industrialization/recipe/materials/bauxite/packer/block.json +829577e26addf00f0e041c6ce1b8d75701cf2831 data/modern_industrialization/recipe/materials/bauxite/packer/dust.json +5d8906599caf7631be9935645772a8ede36a5d0f data/modern_industrialization/recipe/materials/bauxite/unpacker/dust.json +23cc580162663c1d649edb34efd7aa176fc7341c data/modern_industrialization/recipe/materials/bauxite/unpacker/tiny_dust.json +636c6881bc8e36cc4a309f7f20d44d64b4428291 data/modern_industrialization/recipe/materials/beryllium/compressor/double_ingot.json +fc5004f3734cf617c728414ddfa14e09a264272b data/modern_industrialization/recipe/materials/beryllium/compressor/main.json +578eae2df934c5eb2da3777e3c0e62000097ba40 data/modern_industrialization/recipe/materials/beryllium/craft/block_from_ingot.json +74313379589ac5a4d212c6499326d7574db7f252 data/modern_industrialization/recipe/materials/beryllium/craft/dust_from_tiny_dust.json +a6c6d102d5ffa7f20a46652134ff1ec45dd675c7 data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_block.json +a15ab1575c7f2ca8e418b005174f3064b00bf11b data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_nugget.json +88e99f49096715c1943b7e2b4c4c848dfd07d18f data/modern_industrialization/recipe/materials/beryllium/craft/nugget_from_ingot.json +52fbce0e903e6264158df4babaafa473cba425d9 data/modern_industrialization/recipe/materials/beryllium/craft/tiny_dust_from_dust.json +88c00df27a47afb0dad59a841f3612d1f227045a data/modern_industrialization/recipe/materials/beryllium/macerator/double_ingot.json +d8b5e0e53494e398e307f2c9aa6125391b92a5c7 data/modern_industrialization/recipe/materials/beryllium/macerator/ingot.json +054a0abab72395c9146792236f9705823778f3eb data/modern_industrialization/recipe/materials/beryllium/macerator/nugget.json +8ca1e4a8df91368f372869110fa5c810ee43b714 data/modern_industrialization/recipe/materials/beryllium/macerator/plate.json +0ccc9ea3c0d79c382cd38535a7db98b195794e64 data/modern_industrialization/recipe/materials/beryllium/packer/block.json +9d4bbb3eae75a28ed971b53ced63e16679282405 data/modern_industrialization/recipe/materials/beryllium/packer/double_ingot.json +024d549afb56062fc0cfa682c333522ae0f906ba data/modern_industrialization/recipe/materials/beryllium/packer/dust.json +9c849dfd6cb25b2767fc6716667a2bd5af55e3bc data/modern_industrialization/recipe/materials/beryllium/packer/ingot.json +b82435211c61562ce38c4bb8f310a3b82d3a8fd2 data/modern_industrialization/recipe/materials/beryllium/unpacker/ingot.json +690cbab3b01583381bfd1747b2c6dd630dabbee0 data/modern_industrialization/recipe/materials/beryllium/unpacker/nugget.json +0b17620b9fd6641c6b0c404d50d21016a25859bc data/modern_industrialization/recipe/materials/beryllium/unpacker/tiny_dust.json +1c0044c50a2a69cc26ec9d84a4b35072a1322a5f data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/main.json +0f0701d0a7db4a4477b664fd51f814c70021fed5 data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/plate.json +68d70f9cf0245ec4cccc39d6009620b3f8c9ce59 data/modern_industrialization/recipe/materials/blastproof_alloy/craft/large_plate.json +8d68f369f97c341c7b6688536bfee59881bf3d54 data/modern_industrialization/recipe/materials/blastproof_alloy/packer/large_plate.json +3876d0326c7b037bb5ae809f0bce6da4f0f302ad data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json +5d5ea09cf567a75d10da4a412ffcd072747cbfd9 data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json +29bd3eb5c9312fd3f9b5c9fe77ffde61d030cd1f data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json +0edfd24fdc5672a63d44fdcd3f97f3faf446de43 data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json +cefe7fc69ab322d7b71f611b5020e2beb4f54082 data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json +1b2bf999f872b1048eb4e7aba58885ba48d693cb data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json +996f0f99097d0659855723cc6f721fa1ef3475d4 data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json +ad79bba7fa3892b87f8a3c5e22eeaef93667ebae data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json +ddf4a7939660d7c44d57cff8f1de76a209016b5f data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json +1cc4e61f5aa10947f1b4e3bebba7eeab4060d462 data/modern_industrialization/recipe/materials/blast_furnace/steel.json +3e0976b99da057bbddff27897717e78c4f3b570a data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json +475d79aed3e09bf3461df598ca4d41cbe1a835df data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json +22d8d2bdf6c6e98539b8987848ecb2d8461f4705 data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json +7c42c2191696ffb8bc7c22d6b081ca09e5ca59bb data/modern_industrialization/recipe/materials/brick/craft/dust_from_tiny_dust.json +97474539486d4c594c00b2f542cd74f188de1fcd data/modern_industrialization/recipe/materials/brick/craft/tiny_dust_from_dust.json +3c348509236c77eb310817d18f2f8577dce6d062 data/modern_industrialization/recipe/materials/brick/macerator/ingot.json +3f29ca839b7f1877ae687a58b2bc26379d52bc50 data/modern_industrialization/recipe/materials/brick/packer/dust.json +beb4cb3b505f32c2fa3d415ddf691bf7d131a8ca data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_blasting.json +15e47ca3ad8bb4fc13c13534b597d278dc2ac2b3 data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_smelting.json +a6202a37df8963e595469d57011923dd66b97c68 data/modern_industrialization/recipe/materials/brick/unpacker/tiny_dust.json +105ac64743777c358d41425321bea5038367689f data/modern_industrialization/recipe/materials/bronze/assembler/barrel.json +b7a486b558f6f378245dd02175fcd2bd64249ff5 data/modern_industrialization/recipe/materials/bronze/assembler/drill_head.json +cb07c3ab4dea03c147a006f62b4ab3ff5256532a data/modern_industrialization/recipe/materials/bronze/assembler/gear.json +c0c1c7828e3995c27362e9bcc78b24429490512f data/modern_industrialization/recipe/materials/bronze/assembler/rotor.json +794f09a49d9f351b8c3ec423217bc0559d26f358 data/modern_industrialization/recipe/materials/bronze/assembler/tank.json +5f4acbbbf758c1fb93fe8603b57ec32e305b34e9 data/modern_industrialization/recipe/materials/bronze/compressor/double_ingot.json +efc294ada244ea52327fa66e6655c2d782d730e4 data/modern_industrialization/recipe/materials/bronze/compressor/main.json +2376778bba1d922cccada335e72e2980e159cd6f data/modern_industrialization/recipe/materials/bronze/compressor/plate.json +b2b6c3894fae3b66af7cd2360cf3ee383f83ec87 data/modern_industrialization/recipe/materials/bronze/compressor/ring.json +b005b7971919b9d39bce6f81df68d1739220751b data/modern_industrialization/recipe/materials/bronze/craft/barrel.json +f33d37a447b20cab0e07f3c53d7f0f4ec30ec68c data/modern_industrialization/recipe/materials/bronze/craft/blade.json +5684e8138c20106e1065c019a63eaec472267aa2 data/modern_industrialization/recipe/materials/bronze/craft/block_from_ingot.json +f9bef5ae160d0c5fc8d50b08e2277f8107834885 data/modern_industrialization/recipe/materials/bronze/craft/drill_head.json +1aa54cc31b0fc886cc02c5db2490beee09ae7e28 data/modern_industrialization/recipe/materials/bronze/craft/dust_from_tiny_dust.json +b483c43efe4598fd6b82fe2657b3dbf26920727f data/modern_industrialization/recipe/materials/bronze/craft/gear.json +0e381d5cc161c8bdadfd4416d2ef718502cce74a data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_block.json +67d76560ec966e7aa17599f29add67987788fdd7 data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_nugget.json +f36b2daecee16340f33c051ecbc41abcb42009e7 data/modern_industrialization/recipe/materials/bronze/craft/nugget_from_ingot.json +5f3be542e0f6d6aa788b91d45b0594cd2102dfdb data/modern_industrialization/recipe/materials/bronze/craft/ring.json +bac52d55b6496aa69b7e1c4fc385395d3a8e0d84 data/modern_industrialization/recipe/materials/bronze/craft/rotor.json +fa694b9454545383e3b13f6b46dd9bbb4edb7a3c data/modern_industrialization/recipe/materials/bronze/craft/tank.json +89c92af56990967176bd3be247072037c78f3920 data/modern_industrialization/recipe/materials/bronze/craft/tiny_dust_from_dust.json +0332e8d3fa0ac62fca358b66ab96603e9c02fb89 data/modern_industrialization/recipe/materials/bronze/cutting_machine/double_ingot.json +ed311445399599dfe3dbdcf5ab473ec1889e88dc data/modern_industrialization/recipe/materials/bronze/cutting_machine/main.json +47c6c046d5bdaab62f0da4437053ec1afc992ace data/modern_industrialization/recipe/materials/bronze/cutting_machine/rod.json +bf5d98edab6c27c11d51e3bb5379c3fa663a5aa9 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt.json +1d2fb125438a81acf1fd1ce0aead3514ca50f597 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt_with_tool.json +1f1647fba2a25d9ec20521d6318ed53005c2e550 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate.json +85b6cda7ed7b5802eb5629497289ff2aba630e13 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate_with_tool.json +ed0b4b7ba867fc7d06e71eecfb91c2cc6eb32be5 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate.json +52168ad2488aad570d01d709bd4fcd7991298dd8 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate_with_tool.json +6a2aa9cea0c714039793dbb09167dac8d067ce12 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring.json +0e5fdd86d5edbc2cde55bbcb4e47e18ab4b67175 data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring_with_tool.json +df13d0cc20e2c5b47a1022e43177e635c86389fd data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod.json +6490c596ff243f9ae3351c11541a941c8cadf05a data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod_with_tool.json +c86ff1859b13c1a3dd105385dba70050803f1217 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt.json +9050845e15ad32ee7450a85779d7e7cb9812a3bf data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt_with_tool.json +ae842c5b64d7ec346285d67d82e82fc3d19bf6f9 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate.json +f2c9d141fa369cd12b091246b1b937261df0a672 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate_with_tool.json +aa232d1f5b96a3ab0dc70c259f400c67e2c4bf05 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_double_ingot.json +8abb5637e8814864e87f4326fe35c1d5d39a617d data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_dust.json +02c3f2711583acbac9bd1ac6646d3bb423ba42cf data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate.json +a58176bff6c9152d797dc2175f72d91590a83da9 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate_with_tool.json +20cf3fddd1257b7077dc65244512de69127f9a4c data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring.json +3621bd5e6cc2f54a8e0cfacb1c6e0a3739941286 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring_with_tool.json +2f89957f013d1646b1856487ae50f0695980b44d data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod.json +685ad637d6fcec729ad730d2d3713c36805c3fa3 data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod_with_tool.json +7b260dda75e6e1818cfa004a0acee16945c3d657 data/modern_industrialization/recipe/materials/bronze/forge_hammer/nugget_to_tiny_dust.json +444831534644570d0f6271b2d7b76fd1d99d6566 data/modern_industrialization/recipe/materials/bronze/forge_hammer/plate_to_curved_plate_with_tool.json +8cdbd372b5bfa349198be14a4e8a198d82a15ad9 data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_bolt_with_tool.json +92ba54d6321e7ac97c7a5979c41dd7c1cfe85583 data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_ring_with_tool.json +109cb3c6582d1aa03829f172004632b998622d4c data/modern_industrialization/recipe/materials/bronze/macerator/blade.json +0fee4b88fd38ee8f5a5a83fae17a9176772f007c data/modern_industrialization/recipe/materials/bronze/macerator/bolt.json +ee74dc1c1b29bce1daeedad9523fa6708713f7ac data/modern_industrialization/recipe/materials/bronze/macerator/curved_plate.json +5801f30e69c7eac146ba4c56edac0b8e14be2047 data/modern_industrialization/recipe/materials/bronze/macerator/double_ingot.json +ae1c2025998ce606c99162b09e9efdac281bd0ce data/modern_industrialization/recipe/materials/bronze/macerator/drill_head.json +b96ba5d63d02012a5e8b3c22b6a044c4fc55588b data/modern_industrialization/recipe/materials/bronze/macerator/gear.json +d9a3b3b456f42e2360a5f559a59e9dc003a5618b data/modern_industrialization/recipe/materials/bronze/macerator/ingot.json +c22b835e4f61282b77a1557fed5f179e742c7a2d data/modern_industrialization/recipe/materials/bronze/macerator/nugget.json +8f623ae84034d43422e26a56d26482d081a04739 data/modern_industrialization/recipe/materials/bronze/macerator/plate.json +12fa90680ef54f3128d813b785aea892147b7576 data/modern_industrialization/recipe/materials/bronze/macerator/ring.json +958e9a42eeba2c878cbc7d2c8aaf1749864f148d data/modern_industrialization/recipe/materials/bronze/macerator/rod.json +155e0faf837916e0235475e8b0bf21373985cb9a data/modern_industrialization/recipe/materials/bronze/macerator/rotor.json +b5cb75a6325e9d1329ad9936df852c0e51cccba3 data/modern_industrialization/recipe/materials/bronze/packer/blade.json +efeb4283bc33a92581555f38eea3c627f15bd466 data/modern_industrialization/recipe/materials/bronze/packer/block.json +8073c79720ca4b9458f41758fa49c9593ca4b648 data/modern_industrialization/recipe/materials/bronze/packer/double_ingot.json +a46c3affd6e1a4d6d30b34cea4d541bcc61da0d7 data/modern_industrialization/recipe/materials/bronze/packer/dust.json +bf752e6253c47a388f71093e5783bb5307ec1819 data/modern_industrialization/recipe/materials/bronze/packer/ingot.json +d8e4e424d702cef47de9c3caee84a37352d002e6 data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_blasting.json +31e0c4d935054025b61d562f84a6d8c8f68dab45 data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_smelting.json +b5e7024a92e859af2d615e4a217a3cd63e1815c7 data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_blasting.json +b5f0dcdc7c3a07491e9d970a67a81a13ef92180e data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_smelting.json +e07a8755292430096366cee45da2545198646a56 data/modern_industrialization/recipe/materials/bronze/unpacker/ingot.json +7c356811edacd2df8f237e7b31754c4c39c43aef data/modern_industrialization/recipe/materials/bronze/unpacker/nugget.json +7eef5bfbfbf78e1832dc0d31fd1a89d6d739434c data/modern_industrialization/recipe/materials/bronze/unpacker/tiny_dust.json +b26e6eebc3f0641aef71a42f3e5704a7a5c19f4e data/modern_industrialization/recipe/materials/bronze_dust.json +637226e6c9e737f57865166a6bfd703392ea6397 data/modern_industrialization/recipe/materials/bronze_tiny_dust.json +d1c6c4d9c3f75aeb6d320a248a4efe182fe7d3a5 data/modern_industrialization/recipe/materials/cadmium/assembler/fuel_rod.json +08a43ad545bc4a3fc53a7aa2133fc17b1d6c9952 data/modern_industrialization/recipe/materials/cadmium/compressor/double_ingot.json +71d2bb1662db6edc6ba53eab9af335cc68a797a6 data/modern_industrialization/recipe/materials/cadmium/compressor/main.json +679ca7c474203396e302acf451498317c6c1138c data/modern_industrialization/recipe/materials/cadmium/craft/dust_from_tiny_dust.json +fdbe7c66d0e12ba7251181c1c20f47a974a8d21b data/modern_industrialization/recipe/materials/cadmium/craft/tiny_dust_from_dust.json +0202b0b745d53898c554f161418f601108854e67 data/modern_industrialization/recipe/materials/cadmium/cutting_machine/double_ingot.json +1730554c10a071d5435ee4dcd5d32ef38aed9ffc data/modern_industrialization/recipe/materials/cadmium/cutting_machine/main.json +134ecbf894395f92bb519e230e13be25c205c5c2 data/modern_industrialization/recipe/materials/cadmium/macerator/double_ingot.json +1ff201c94ac8964b9a475e57d9ceb51ca504b9f4 data/modern_industrialization/recipe/materials/cadmium/macerator/ingot.json +9d012fc834cfafbd0f68703cd61bbc3257be20a0 data/modern_industrialization/recipe/materials/cadmium/macerator/plate.json +9289b0f5825bdecccda31ea6d912f1cb90fc7dc9 data/modern_industrialization/recipe/materials/cadmium/macerator/rod.json +4e01acb015b4242e8ab85408b87ea15fcd476ef9 data/modern_industrialization/recipe/materials/cadmium/packer/double_ingot.json +5b2b9693b6f88a5fd10ef9b742787ccdd451aa88 data/modern_industrialization/recipe/materials/cadmium/packer/dust.json +2489425f683da2252414b997bd6cd9d0486e9232 data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_blasting.json +893939dab48bf5552cbf33babab077d23712e4d2 data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_smelting.json +98449b02c0a4d7cd9fabc982b6311a5d56e6b556 data/modern_industrialization/recipe/materials/cadmium/unpacker/tiny_dust.json +349fd9e0ae313cab97833d5b2aafafc453e7eaaf data/modern_industrialization/recipe/materials/carbon/compressor/dust.json +6d98874a5b1e518115ef181f5e218825bc674121 data/modern_industrialization/recipe/materials/carbon/craft/dust_from_tiny_dust.json +592dc8b13061df32b10415126db939f77e247486 data/modern_industrialization/recipe/materials/carbon/craft/large_plate.json +3bdba418519f493200f6948824a90dd66d2670d0 data/modern_industrialization/recipe/materials/carbon/craft/tiny_dust_from_dust.json +54ed1d26c150b6457fc6ddcc6baf731d17928f67 data/modern_industrialization/recipe/materials/carbon/macerator/large_plate.json +131806216abb9fdb78ff408f1ed2bc97286ef6a3 data/modern_industrialization/recipe/materials/carbon/macerator/plate.json +752e124422ea026e1ebb5dfe535f70d9c51b852b data/modern_industrialization/recipe/materials/carbon/packer/dust.json +b4a6e9f6dd182edd4b35fa354650ecbff87aeb13 data/modern_industrialization/recipe/materials/carbon/packer/large_plate.json +5413e56184560fb640f643ef663e94b5b5780371 data/modern_industrialization/recipe/materials/carbon/unpacker/tiny_dust.json +7d0786751db038c42c1de1f72d652ceb0ae5189d data/modern_industrialization/recipe/materials/centrifuge/carbon.json +22bf302f35edb6c22ae041132dc3da73ee6c8e06 data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json +542c97d37a44c7516a562edbc6b647b95e15f518 data/modern_industrialization/recipe/materials/centrifuge/deuterium.json +27371aca6512be0d4b8791f3c33cac68a49a10a7 data/modern_industrialization/recipe/materials/centrifuge/flint.json +4c76ef962cef1c127906f8be336e9124adb957c2 data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json +1b574d845b28a021b1749fe4e3374e01276f9169 data/modern_industrialization/recipe/materials/centrifuge/helium_3.json +47aa201263b85664ea955fe233d8cf26125bf323 data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json +025d033ff60c2fc16799bc146d5e649532a094be data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json +b29c688d2bbbfedf89b051ce40343cb17f6aa4d2 data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json +289622180d01d9e1b3e574d5b7d043d2892868b5 data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json +b5e3bdd73032270c15b78894d2601c17bf8f24bf data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json +17212bb4255c3164b122a46f3600bf63b91a36eb data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json +de2a252a56cecab6bc9ad01bb0b0d397cfe9e52e data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json +fcb1079a0e5dde3fee5a5e3151468e688f5388c9 data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json +24664cb44dfd7fff991efe413654861f08e65565 data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json +ec3f2b3bdc86a21ae25fcbcef7b4c71955ea0828 data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json +588d4aa36afe2b136054c3ece37b45fc630a49fb data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json +86cbbaefa2d0a4bba8956cb36229e78e37491712 data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json +d2520511ffc2d36018e11c3df19c9e8a6c380bb3 data/modern_industrialization/recipe/materials/centrifuge/uranium.json +e3127f7276cbefd703e09096e32834ac6e9c76cc data/modern_industrialization/recipe/materials/centrifuge/wax.json +8fd1d4ef5caac1964911fcf69c6b095d689238ac data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json +dcf01ad94fabd316e50fd102d39a11451793ed0d data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json +47b82633712378229609457644ac35f665c5aa2d data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json +3b83851622701f433e88193a28ba627f329f8816 data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json +e2aa20f506ebd7f8361c0ed1aaabda322897e663 data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json +ca7c382574bec1b0bd98a141bc7096c604ff4a9e data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json +677fc38e24c080d4f94d62c5818f4efcccdff69b data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json +98c77c3f39b9c33de1250e391eeb85d08fd29fb5 data/modern_industrialization/recipe/materials/chemical_reactor/water.json +55c75daea2f8634badd13f3aeae57fe4f8881dcd data/modern_industrialization/recipe/materials/chromium/blast_furnace/dust.json +e02684fcae414abe3c151f277f4a1f2695ff53ad data/modern_industrialization/recipe/materials/chromium/compressor/double_ingot.json +35a16bf9f157dd2c154833a84e73f59988904ebf data/modern_industrialization/recipe/materials/chromium/compressor/main.json +c85d6e59f3e5576a26c7ccaf87b4c57514f508fa data/modern_industrialization/recipe/materials/chromium/craft/block_from_ingot.json +1b91e1e69d1b78617e16a2a8df89537e21cbfd8b data/modern_industrialization/recipe/materials/chromium/craft/dust_from_tiny_dust.json +ee571b71fb225fb11f7bb0b38c7d8ad21173eb88 data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_block.json +e751dae0249505ba1fd1c7c93e43e744933beea9 data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_nugget.json +6c91480c1ce4558d7e2d73d2f9d63cfe1ef2b1d6 data/modern_industrialization/recipe/materials/chromium/craft/nugget_from_ingot.json +0aa36766ff52624f05e6fc79d489d9d812e825a9 data/modern_industrialization/recipe/materials/chromium/craft/tiny_dust_from_dust.json +0e2d61d86a9f3f47c651c575ed8dca69e7e12f26 data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json +a8dfd815458526c595e3ee62c3ff700b6c6e1370 data/modern_industrialization/recipe/materials/chromium/macerator/double_ingot.json +b19068c31d97bedbe9c5b280cdc8719ae88c58e2 data/modern_industrialization/recipe/materials/chromium/macerator/ingot.json +e8661f89cd4e45fc79ced1c5ccaa08b3f2900dc8 data/modern_industrialization/recipe/materials/chromium/macerator/nugget.json +eefade9b94c369034fd5b3fe9c327e515fdc1a5f data/modern_industrialization/recipe/materials/chromium/macerator/plate.json +051666f13d1690bcc5f0448c05cbb43ade6f4150 data/modern_industrialization/recipe/materials/chromium/packer/block.json +1fe6b07e2340b549849847d53934dd76b1d3f867 data/modern_industrialization/recipe/materials/chromium/packer/double_ingot.json +155346449768a4cbc9df651b83b29b5bfba32801 data/modern_industrialization/recipe/materials/chromium/packer/dust.json +2cc645f7d53d430f1e97a6839b2845320a78ac3d data/modern_industrialization/recipe/materials/chromium/packer/ingot.json +2b1573a2c177898a91a07c42629eea2d249bf8eb data/modern_industrialization/recipe/materials/chromium/unpacker/ingot.json +fb4ebb89f55a9d0c1f2672904b1fd34de6c1c3cc data/modern_industrialization/recipe/materials/chromium/unpacker/nugget.json +b586d457158ab5de7f90d85cf4befcbbff760c31 data/modern_industrialization/recipe/materials/chromium/unpacker/tiny_dust.json +f4371dab6e3059c69d282bca73c24c522a269a8b data/modern_industrialization/recipe/materials/chromium/vacuum_freezer/hot_ingot.json +3e22fada12ed84a6ead4712b59b030862e1fdbba data/modern_industrialization/recipe/materials/coal/compressor/coal.json +48b968aed96329a6672a880ea46e468c0f8ae5e4 data/modern_industrialization/recipe/materials/coal/craft/deepslate_to_ore.json +557dff3175ebec49d434916c16e85743270b580b data/modern_industrialization/recipe/materials/coal/craft/dust_from_tiny_dust.json +4c1662df932ba16a827047e299857e38673187ac data/modern_industrialization/recipe/materials/coal/craft/tiny_dust_from_dust.json +f326e8cf1de5c4bc92ea046ab62b617e9866de15 data/modern_industrialization/recipe/materials/coal/forge_hammer/crushed_dust_to_dust_with_tool.json +28f0cdfc0e69f3e6e72a060853afe13caa39cd2b data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust.json +6700850bdf8c62fce38757c99800d18ce84f3883 data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust_with_tool.json +882dbc55b1b9363bb60db7d324424961efd9a60d data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_dust_with_tool.json +4846ab6ac0e0df88ffd32ebb98e893e19ea1aff7 data/modern_industrialization/recipe/materials/coal/macerator/crushed_dust.json +2b2e98a3fad19e9834d0153b3f2d7e2798f9c10a data/modern_industrialization/recipe/materials/coal/macerator/gem.json +acbb1e25c8c090b348bfa3e7628ea6bbf95dbce8 data/modern_industrialization/recipe/materials/coal/macerator/ore_to_crushed.json +ec3fa0d39f19f6cfd557aad387a3e5822755a78f data/modern_industrialization/recipe/materials/coal/packer/block.json +d3d12d6826bb993120fe1c832a8968d4c2755272 data/modern_industrialization/recipe/materials/coal/packer/dust.json +37a0c4ef648984d13ff6e44b8ae8d3ff09338476 data/modern_industrialization/recipe/materials/coal/unpacker/gem.json +c32a18e6db4ec7ebcce966c156942f4ae612b75f data/modern_industrialization/recipe/materials/coal/unpacker/tiny_dust.json +db9b0ce179611f719aaa8194345f7416c33eb774 data/modern_industrialization/recipe/materials/coke/compressor/dust.json +86c5f0057a40302c768fbdfbe5b45296420593ca data/modern_industrialization/recipe/materials/coke/craft/block_from_gem.json +a78479e14f116f2f7b731c9544f288a350de43c9 data/modern_industrialization/recipe/materials/coke/craft/gem_from_block.json +4ba6796d3c49b737c73e60575b2afe0978f17e2c data/modern_industrialization/recipe/materials/coke/macerator/gem.json +99e69a70715a4a40ea91eb553be171646e3fb288 data/modern_industrialization/recipe/materials/coke/packer/block.json +26d01db78394f5fb04749f361f866ff8ca94f78a data/modern_industrialization/recipe/materials/coke/unpacker/gem.json +e43c30c60409486cfaa6aaaaa76b86de6f1ac663 data/modern_industrialization/recipe/materials/coke_oven/coke.json +699e9488aba6968ea100140e4910d40ea3f0fd04 data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json +46d533a7684f32b71169c828ea06db981df91108 data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json +16734a7ed20934b86263a6e876f273a5bf3e1fbe data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json +b1a221ff4c0bc25c43354fd463e1e17e816338c4 data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json +1d7d6cc6a3ebec93874b55589cdade2ab0a3b4c0 data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json +521db27f706832414f07ce2c6e918a3e01ad5aca data/modern_industrialization/recipe/materials/copper/assembler/drill_head.json +55b026c41fe73b52b6e0a43088db841059264eb0 data/modern_industrialization/recipe/materials/copper/assembler/gear.json +4229bbdafc7c6b77039e196e1c5d3ea322a16d2b data/modern_industrialization/recipe/materials/copper/assembler/rotor.json +ba262dd2ab5d674c8624f8f75dd7074298ae9b2a data/modern_industrialization/recipe/materials/copper/compressor/double_ingot.json +3c8e8e3c745da3fe5595dc5a1d384391da57dc13 data/modern_industrialization/recipe/materials/copper/compressor/main.json +77441f232f7c62a20d24161267d5328ce76d45f3 data/modern_industrialization/recipe/materials/copper/compressor/plate.json +ddaacbdbce9373025c8799a76277124e9cb94503 data/modern_industrialization/recipe/materials/copper/compressor/ring.json +eb72681ad5c5a0c24f0536461cc6678bdec1ff74 data/modern_industrialization/recipe/materials/copper/craft/blade.json +2269bae1275e35463344eaca0dffb8649fc3dac4 data/modern_industrialization/recipe/materials/copper/craft/cable.json +7ea6640d862764f3dad16c138b25306a35c8372d data/modern_industrialization/recipe/materials/copper/craft/deepslate_to_ore.json +b327ede94d56739c5fda5a28b4a6f899fed19896 data/modern_industrialization/recipe/materials/copper/craft/drill_head.json +b29a4955f33ca6ca619be6b8bc68325c936f1821 data/modern_industrialization/recipe/materials/copper/craft/dust_from_tiny_dust.json +568d75bb379dd5d64386609b22359ee6dfaecef3 data/modern_industrialization/recipe/materials/copper/craft/gear.json +b6d9a07ec3641d5b1a6883abe1644c25cbe8c10d data/modern_industrialization/recipe/materials/copper/craft/ingot_from_nugget.json +3114cd3ba8918f53e5afe58c46d7b776ffaf6146 data/modern_industrialization/recipe/materials/copper/craft/nugget_from_ingot.json +c2c035c2f0e2360934a5f22dcc1204990b4a3a75 data/modern_industrialization/recipe/materials/copper/craft/ring.json +a76419b45e3b4dbf0232ced6cb431611ae8a5b35 data/modern_industrialization/recipe/materials/copper/craft/rotor.json +7b5bfd135c7d8c4169391330c6b2d2fc68a7b4ea data/modern_industrialization/recipe/materials/copper/craft/tiny_dust_from_dust.json +6d3ccb0dc846ff0653385aff84c920833a714a32 data/modern_industrialization/recipe/materials/copper/cutting_machine/double_ingot.json +692508290ab2e34b2548c48c1f493479097172ed data/modern_industrialization/recipe/materials/copper/cutting_machine/main.json +61c4cfece744ebafd4a2761d500059171ca91953 data/modern_industrialization/recipe/materials/copper/cutting_machine/rod.json +d6623702b2e46c26da25d126ab83b07e94402f11 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt.json +86da822f457702d6e94acd4757ea7a3fc6e80e69 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt_with_tool.json +a412bce693f1793979454b9d686374b895a0d588 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate.json +ab136fe1fcbd0e176ee6764fa65307bae9c671b0 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate_with_tool.json +ef9b640520ef391c5938a11936753aacc6bd2d81 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate.json +43924db2cdd44dd27982142524b4adcf96cc98cf data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate_with_tool.json +d988320a0c47d67c74055deff04a369172632d2b data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring.json +74cebb70d778effd76a5ebd06d095fa0efe33707 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring_with_tool.json +a8c7769fc49cda31fdbc90fcf000155dd4e36a61 data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod.json +8e0438aa29acf1e40fba7bd70f73c7f22837b46c data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod_with_tool.json +3a12f9a6c4894bc6c3df017925117d2c88584b45 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt.json +578c31ce3628e8a388d9d9c0b9dfe4e22fc1ee25 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt_with_tool.json +64b0a872d8379ff3509c32f548cdf99877d37584 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate.json +07977b1b47b04e7bbdfab5250007497fe68eac16 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate_with_tool.json +20e7ff1808259fb8346e7671810ba1d41c458ea3 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_double_ingot.json +5b5efcf38aa3bb5274117d7ce6dc1374ad6939a8 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_dust.json +72e5730dc2688313eb8d23c8459fadd00e922dc6 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate.json +87640895f2a2a9e65af421e8532403342b3936d1 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate_with_tool.json +2e77c7f313bbe010c5a88a4a1d4f0a62c59d9255 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring.json +768b9fdd2685ffc4cb34c4c58b7ea7d5e0447f80 data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring_with_tool.json +408d25fbb46924e642e27ec137bd781f8cdc453e data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod.json +daf6157c2b8fcbf308dfe33d5c0fe6c249d8089d data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod_with_tool.json +530744af0cbfce43ca831501f1bab2f7c613d4ae data/modern_industrialization/recipe/materials/copper/forge_hammer/nugget_to_tiny_dust.json +b6ae519fa0bfdaa31548c9a85b3f308a295e7657 data/modern_industrialization/recipe/materials/copper/forge_hammer/plate_to_curved_plate_with_tool.json +014ce0c1cf8c9587dc4f8beb635b715d2d635590 data/modern_industrialization/recipe/materials/copper/forge_hammer/raw_metal_to_dust_with_tool.json +d9db68e287148dd92e9ab5b13713988e69a5ddd9 data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_bolt_with_tool.json +36a8f58b625eed5ae8439dbdbf8a4ed723cd6b24 data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_ring_with_tool.json +585994113277192555f701fdc5a32d72892d20b1 data/modern_industrialization/recipe/materials/copper/macerator/blade.json +2fbe64fb04c973182e860db94cd7640b96504c57 data/modern_industrialization/recipe/materials/copper/macerator/bolt.json +ab6ed20d95ac348c675a232d12cf876504c01730 data/modern_industrialization/recipe/materials/copper/macerator/curved_plate.json +3eecf6fa907ddf277643eb4a707eaa1137971a18 data/modern_industrialization/recipe/materials/copper/macerator/double_ingot.json +e9fec1e36903247a1c7a7ac6e0b802d80d13fa3b data/modern_industrialization/recipe/materials/copper/macerator/drill_head.json +51ae04f49bdf60bbfd99d51936cb70bec207b163 data/modern_industrialization/recipe/materials/copper/macerator/gear.json +7737ea2f9bf783a223b6c581fc39cc7df2ec5cad data/modern_industrialization/recipe/materials/copper/macerator/ingot.json +c875a753eca3b6cbcfb7df05ad965d6a10cfc194 data/modern_industrialization/recipe/materials/copper/macerator/nugget.json +c0ca282f916cfd352344bf9dc37d62673aa743e4 data/modern_industrialization/recipe/materials/copper/macerator/plate.json +af57805fae7e5c518e80e657d415fc77a55ff409 data/modern_industrialization/recipe/materials/copper/macerator/raw_metal.json +fdf7841e13b4224306093752f7cc164481a30aaa data/modern_industrialization/recipe/materials/copper/macerator/ring.json +5bf0e308851646b3a83c5525912954624d72724d data/modern_industrialization/recipe/materials/copper/macerator/rod.json +d266dd85811c1505dc1db6b209de437d9c7d7082 data/modern_industrialization/recipe/materials/copper/macerator/rotor.json +59cde3822dce32080583655cef6402678ab20434 data/modern_industrialization/recipe/materials/copper/macerator/wire.json +78f55c93ba8b239c22829e27bfb685193813f08c data/modern_industrialization/recipe/materials/copper/packer/blade.json +ff620957d041890a31c8b95011e09b84d9b76918 data/modern_industrialization/recipe/materials/copper/packer/block.json +189399c82ff3903f462718f0366bed91ad750da5 data/modern_industrialization/recipe/materials/copper/packer/cable.json +febb668ab06b803aa89fd5d7da86ebe01d141d59 data/modern_industrialization/recipe/materials/copper/packer/double_ingot.json +0f4caea0ef884610ef16ccab272e12d407c446d0 data/modern_industrialization/recipe/materials/copper/packer/dust.json +2db836ba05c2901a4586aac74b57ab4678b0da8c data/modern_industrialization/recipe/materials/copper/packer/ingot.json +0419a6d32c5143cad14362dc41f31539794ad641 data/modern_industrialization/recipe/materials/copper/packer/raw_metal_block.json +4ccc76bf5e58a02d760761629096b5153ca9bebb data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_blasting.json +345490ee273688460ecbb71a0f32f8e91c03fbcd data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_smelting.json +d1a2f724b651b40090bcc4fe09721b3b003e54c3 data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_blasting.json +1c4f4d614570874b92d8a86076c77a35d26f37e1 data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_smelting.json +d59614971f058b13ed29ba0005a5a895c304bccc data/modern_industrialization/recipe/materials/copper/unpacker/ingot.json +00e47d6f57525a4477134c20ed325ec3c7663d61 data/modern_industrialization/recipe/materials/copper/unpacker/nugget.json +1e4882596539c93e809882991a3fc934a0162da5 data/modern_industrialization/recipe/materials/copper/unpacker/raw_metal.json +aa5e3248f85fd83e2742bada1aa2f25995951a18 data/modern_industrialization/recipe/materials/copper/unpacker/tiny_dust.json +35353c5861ecfc122f4c93993b4bbd2682dfe67d data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json +e4cf57bfb2904a3e266de4d0a04b4924eec51332 data/modern_industrialization/recipe/materials/copper/wiremill/wire.json +e97c7b392f12e28dc764d96753e8e10f03e6bb07 data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json +4a65c6e2a4a3287187092d6d1bbe7da983c242f6 data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json +2a77f3112a21d309a66bf4cbe9098627e9bedb69 data/modern_industrialization/recipe/materials/cupronickel/assembler/coil.json +01ab770e605f84ecb5d5c5731b95405f5356475d data/modern_industrialization/recipe/materials/cupronickel/compressor/double_ingot.json +3409620740cc4995f4a0c2ce0a3f3ff4ab7fbffc data/modern_industrialization/recipe/materials/cupronickel/compressor/main.json +442ffeeaca0d1a9f6126b88647a38c02952c32fc data/modern_industrialization/recipe/materials/cupronickel/craft/block_from_ingot.json +53f27f21ad669475201e8142f07c1b0b23f8b088 data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json +053abdd424f15971f31855d05c62d27e9431674c data/modern_industrialization/recipe/materials/cupronickel/craft/coil.json +e2c0e448a20c52c7af33ef49200f3a4e4b3d0e5f data/modern_industrialization/recipe/materials/cupronickel/craft/dust_from_tiny_dust.json +61bee68c2cc9e78730a1d5c4bc0e5c9a9a8e5835 data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_block.json +5d87ab7d0fbc6a6e0a4c26b546a459bf5b22ce1e data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_nugget.json +9bf73f515a69477ff0e0b7f440952403e01dac23 data/modern_industrialization/recipe/materials/cupronickel/craft/nugget_from_ingot.json +ae15e5bccd9c0fab808c76ff3aa9559be8713862 data/modern_industrialization/recipe/materials/cupronickel/craft/tiny_dust_from_dust.json +04e18898a82dc13ae116bcbefe90a9ec21560c52 data/modern_industrialization/recipe/materials/cupronickel/macerator/double_ingot.json +725f4510f3f3277419d524925fc83e604287fa25 data/modern_industrialization/recipe/materials/cupronickel/macerator/ingot.json +6d420d8e1c595f7543d29d11e68738c7a3a1f217 data/modern_industrialization/recipe/materials/cupronickel/macerator/nugget.json +9775baa0c89f4d2b589fa80498a42b0b2689321e data/modern_industrialization/recipe/materials/cupronickel/macerator/plate.json +fdcb0b235aa7456c60efed87c39f4466fdddfe24 data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json +a2fc6ad141b8a69b958ddf3694ad18cf85db0678 data/modern_industrialization/recipe/materials/cupronickel/packer/block.json +0d7bf65c640a4f96f1cfe4a1a91593ebe49e965b data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json +66fd5ee738ea485f7bbff18aaff9850ae68f036c data/modern_industrialization/recipe/materials/cupronickel/packer/double_ingot.json +1c4ac1a617fd77769de38d451a7c6fbce581b9e5 data/modern_industrialization/recipe/materials/cupronickel/packer/dust.json +f543d3412a50deef84814508651fbd06adb82eb8 data/modern_industrialization/recipe/materials/cupronickel/packer/ingot.json +fb969bbff6b928cb8a35f062fb4e405cb8d34e96 data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json +eb5b9d98d4419fc8d47e816a259b3402b943927e data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_blasting.json +f5ebf67412687d9301cc735f7879ba6288b7c548 data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_smelting.json +657ebbb99deeda830aa0d09c9f965e1269e23aa1 data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_blasting.json +ac0567b36e7786c268853a216dae59223d0a2d9c data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_smelting.json +b0ae585e910a2f35f0d87699a5bdaeac52276af5 data/modern_industrialization/recipe/materials/cupronickel/smelting/wire_magnetic_to_wire_smelting.json +36d7a6bdf7de195fdbbf198c2018743f213d3e15 data/modern_industrialization/recipe/materials/cupronickel/unpacker/coil.json +e53950d8aa5b57ae53f077f3e9c1085203406382 data/modern_industrialization/recipe/materials/cupronickel/unpacker/ingot.json +34bc304e53b9e73edf73498ce35500592300e0ed data/modern_industrialization/recipe/materials/cupronickel/unpacker/nugget.json +7617f1d950c65dd3f5e32113d7bdf275b68ec36d data/modern_industrialization/recipe/materials/cupronickel/unpacker/tiny_dust.json +cfbd7dead68d55d02a30d4fde1f4dd39e68f0d4b data/modern_industrialization/recipe/materials/cupronickel/wiremill/wire.json +e648340aa20b5df8a884eab72e840dae8afbc2d1 data/modern_industrialization/recipe/materials/diamond/compressor/main.json +700cf229cb81dba7a1699d5cd0405300d2aca1c3 data/modern_industrialization/recipe/materials/diamond/craft/deepslate_to_ore.json +8464da09ba22d7ec3005167033842ba6fdabb237 data/modern_industrialization/recipe/materials/diamond/craft/dust_from_tiny_dust.json +4e5b5bbfd8c55a839172de7c7a66c4d61c080387 data/modern_industrialization/recipe/materials/diamond/craft/hammer.json +2c232b207c6911621275b5ed276fce713b63d00a data/modern_industrialization/recipe/materials/diamond/craft/large_plate.json +e1281abd30a4f840fcd23c2206a2a0780142326c data/modern_industrialization/recipe/materials/diamond/craft/tiny_dust_from_dust.json +56619d27e9b192af0e3f9cc49eb21def96617aef data/modern_industrialization/recipe/materials/diamond/macerator/crushed_dust.json +b2937b7a90ebc32070d85e867322474f6821e9b6 data/modern_industrialization/recipe/materials/diamond/macerator/gem.json +fee0247361cf727bbb10d1b66480ff0b452a8315 data/modern_industrialization/recipe/materials/diamond/macerator/large_plate.json +ca08836687f6f6745f4f4263832decd302f05deb data/modern_industrialization/recipe/materials/diamond/macerator/ore_to_crushed.json +bd91fae7a01c5747b75ef5b202cfc4cf984564c4 data/modern_industrialization/recipe/materials/diamond/macerator/plate.json +5b6b4aa6ba6003ab52e1afdaf7a33c05f9ad7bab data/modern_industrialization/recipe/materials/diamond/packer/block.json +86389dee1b4dd4f5b276a97833eaa206b05285ba data/modern_industrialization/recipe/materials/diamond/packer/dust.json +99b26dbf314c150dd362e6685f5f57d5b7ba280f data/modern_industrialization/recipe/materials/diamond/packer/large_plate.json +2785f0cea5ef7ccfc7d88a41fbc39c13a1ab7eed data/modern_industrialization/recipe/materials/diamond/unpacker/gem.json +fa91da5363a29f1e3c264991c8a7a355626c5e41 data/modern_industrialization/recipe/materials/diamond/unpacker/tiny_dust.json +b4ec1049cd56d4e3095839a8f3f9aa4d3cb2fdcb data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json +c585f02205f48d1baae81b0377e3bda69d4a3106 data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json +e77a4ace611f3608d74f68ed9fd7f217212f4814 data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json +fe3f1b7dd54d607ef54842fa06a87fdc36aee752 data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json +f74c3b46747dad2d3bd52f143651c105f49752c7 data/modern_industrialization/recipe/materials/electrolyzer/lapis.json +2bf93c90840ed747e5fc95e28def174d80a86b8b data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json +fd445de3dbab0b783f8e57a571286ab41dd670eb data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json +15dd9e5350c3eb2f17e9dc6980b6e7639e7587cd data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json +cf6afa47d585caf81ff014e15549969fab7bb210 data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json +37ab35a3f84c016026c5594310450ed8b0750aa8 data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json +b010e830560eb44abcbe73980b97d6c1a8ebc030 data/modern_industrialization/recipe/materials/electrolyzer/water.json +b14072c6fc2e061b6f585647037efe0348238e6a data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json +d72114ca7cbbb321965f9113caf0b328fe66653f data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json +8628055df67f68d7a1d7835a5439dabdd0f44c0f data/modern_industrialization/recipe/materials/electrum/compressor/double_ingot.json +fa5e073c9106838adba08e495f7a8fdb4fe025f8 data/modern_industrialization/recipe/materials/electrum/compressor/main.json +e83ea16eb06d86312316fe9ae62c1827aef7cded data/modern_industrialization/recipe/materials/electrum/craft/block_from_ingot.json +9410dce546f126919dce7a70045e10bbf3d5e8fd data/modern_industrialization/recipe/materials/electrum/craft/cable.json +2e680f9d5145272e5bd4b33fb0a67c217eeae418 data/modern_industrialization/recipe/materials/electrum/craft/dust_from_tiny_dust.json +3ede65a9127354670c05f11b376ca2ff96c4c3bb data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_block.json +1d184d5eea04cbcbd4b2ce2850c1077d04fe65db data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_nugget.json +eebb17ea43acc36bae8c9e4b393bad1a5f856af9 data/modern_industrialization/recipe/materials/electrum/craft/nugget_from_ingot.json +a90133ea2efdba0141c03b481506c97dd84148b8 data/modern_industrialization/recipe/materials/electrum/craft/tiny_dust_from_dust.json +8fa67b01383dcec0861757a56e2c849988b57e68 data/modern_industrialization/recipe/materials/electrum/macerator/double_ingot.json +ea22a3e486133684831a18b822b78dee54c0f3b9 data/modern_industrialization/recipe/materials/electrum/macerator/ingot.json +7fe34456c8446b93db77c7d02190cf990adf9f19 data/modern_industrialization/recipe/materials/electrum/macerator/nugget.json +43160cb8970b312c7f21bcb8bbe56fadd372753d data/modern_industrialization/recipe/materials/electrum/macerator/plate.json +15b7a177b706173dfcd0c7e34553a1313090b74e data/modern_industrialization/recipe/materials/electrum/macerator/wire.json +445b9351fa49145454e704d1c0939eebded7f5aa data/modern_industrialization/recipe/materials/electrum/packer/block.json +c1878c5a70a37a5e160f6040e0543f8ae7f6c48d data/modern_industrialization/recipe/materials/electrum/packer/cable.json +64bb246e8613b71b46fed108d372613952dd6484 data/modern_industrialization/recipe/materials/electrum/packer/double_ingot.json +15203af1283b6b3b83fd1a9ae37935c4cbdd5a0f data/modern_industrialization/recipe/materials/electrum/packer/dust.json +f55f7b5c657aeb321215817c84d75659c21565b9 data/modern_industrialization/recipe/materials/electrum/packer/ingot.json +1d1c69c8f31a565dfff47e879a011d7dae21edd9 data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_blasting.json +1ec42e702b386ac7529ac5baa0bf7f735dc6c0ea data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_smelting.json +0ee57750dbdd3135ed40a43b1e2eafac83936d15 data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_blasting.json +4dc3a9e0bb6fa4d73c0d6d892d9180ca27accda9 data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_smelting.json +650539aef8c1a6863925de3b58ac2ae53a765716 data/modern_industrialization/recipe/materials/electrum/unpacker/ingot.json +c2a405cfcd24e98a324f2dae01ffdf7c64898cc0 data/modern_industrialization/recipe/materials/electrum/unpacker/nugget.json +198a0b76509a51c38ba79cae4b6145cffb735f3b data/modern_industrialization/recipe/materials/electrum/unpacker/tiny_dust.json +707ff08c30092716ee7957cf083b6c46321ae18c data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json +9f2d6beaab986c74629cefbe2f50c925fbc629f8 data/modern_industrialization/recipe/materials/electrum/wiremill/wire.json +92fcf606613fd0b8d554cf2920827f5ef0ceab6b data/modern_industrialization/recipe/materials/emerald/compressor/main.json +38f8ad31e3c5695d99c8bbe4397c568b0ccbbd2c data/modern_industrialization/recipe/materials/emerald/craft/deepslate_to_ore.json +6300efc0fa263adb1ffc2438dccc1d964c37e8d9 data/modern_industrialization/recipe/materials/emerald/craft/dust_from_tiny_dust.json +5f32ec4a0b2b3f4b6463e6b50b08696a548e77b9 data/modern_industrialization/recipe/materials/emerald/craft/tiny_dust_from_dust.json +e80e28558f652512ba5a95f345ffa4049c7c2876 data/modern_industrialization/recipe/materials/emerald/macerator/crushed_dust.json +ffe6b8a98891f32ffee144d1c08b478be45a5987 data/modern_industrialization/recipe/materials/emerald/macerator/gem.json +c6f95dc3f0498a4d18b0187883686eb75ba420ba data/modern_industrialization/recipe/materials/emerald/macerator/ore_to_crushed.json +00c8510409bfd9848719661d2ff6d6a3e6701f62 data/modern_industrialization/recipe/materials/emerald/macerator/plate.json +8dae0cbd381e094d0987c83ccf259e5ff89989ff data/modern_industrialization/recipe/materials/emerald/packer/block.json +9fbd13734a7b85ccb368755e6fa0f5144b7608de data/modern_industrialization/recipe/materials/emerald/packer/dust.json +30dcec3cf3b5f72b0bf81202a9fe71c9872117d1 data/modern_industrialization/recipe/materials/emerald/unpacker/gem.json +4676bafecf2b2325a8df0b070f5c6f31a28de463 data/modern_industrialization/recipe/materials/emerald/unpacker/tiny_dust.json +0ba6cf958ab3b764e494753a1a5ed396623b9c3d data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_blasting.json +a9488f18a2ae6d210ef09b562d97c76885db17ab data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_smelting.json +6dafb2bf47d48724845bcaed963e0408452238e7 data/modern_industrialization/recipe/materials/fire_clay_bricks.json +c325d9cf531ae03125f79bc73c0959814c778d2d data/modern_industrialization/recipe/materials/fire_clay_dust.json +3e4b360e7eb9f460e8fbe02262a9b4f23475350a data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json +96fbb36baed036f391bede41b20737d0d3de576b data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json +c6e02b8e3b4727e37ac1758c3511868cd4337cab data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json +02ba1e1fde0ae9ce915088cb731e1cb601284120 data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json +2fc5694447f777be851f70551bb5dc325e49378d data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json +d627f32e6459014d4c256440dd29fd00690bc4ee data/modern_industrialization/recipe/materials/gold/assembler/drill_head.json +8792275b4a810ed0019ab3d866a3c3e2aba19a54 data/modern_industrialization/recipe/materials/gold/assembler/gear.json +efe021fc06a7655b6f0f840a36968503b2c9322d data/modern_industrialization/recipe/materials/gold/compressor/double_ingot.json +3570058783f7553bb899c035c39e168f0a2b79eb data/modern_industrialization/recipe/materials/gold/compressor/main.json +55dcd971e7a9e1c67bfea7f30e8b2674da6cea39 data/modern_industrialization/recipe/materials/gold/compressor/plate.json +20d014ca338d009bd9fcea7787fef5ad7ed8951c data/modern_industrialization/recipe/materials/gold/compressor/ring.json +46e44902426ee08e716d615007c160406b79c71f data/modern_industrialization/recipe/materials/gold/craft/deepslate_to_ore.json +f71872deddddf7dca7d6f0d9327881c01151316c data/modern_industrialization/recipe/materials/gold/craft/drill_head.json +f9517d8dfedeb54c3ad358970c2ba1263e4a42a7 data/modern_industrialization/recipe/materials/gold/craft/dust_from_tiny_dust.json +6026b087b6e67fec18fcc1581daf142e18aaf01f data/modern_industrialization/recipe/materials/gold/craft/gear.json +fe5b0ecd17dd7d57c06a697d13343f55ec2ed17c data/modern_industrialization/recipe/materials/gold/craft/ring.json +f1e58d794863e47c726a72bdab185b2b81f0983d data/modern_industrialization/recipe/materials/gold/craft/tiny_dust_from_dust.json +1b0913052a694fa5dae14d29b763d902185846d2 data/modern_industrialization/recipe/materials/gold/cutting_machine/double_ingot.json +e5bb913d71712d07c93f0fc7578b2f83625b3760 data/modern_industrialization/recipe/materials/gold/cutting_machine/main.json +655afd215ee2314f5c63c0906e11ef49b45a68bf data/modern_industrialization/recipe/materials/gold/cutting_machine/rod.json +06aca8257c47a9a8a829d721cbc30e75f071018d data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt.json +afe1c5ac45ea8b513001680195dc718dbd37c829 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt_with_tool.json +7c740fc3561456aa337476d8537a3c5189a393ef data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate.json +32255946e780fe757ecda725d5fadc2e693ba1f1 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate_with_tool.json +102ea222025cea83673f387e18e2f5ba644e645f data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate.json +ad213abac00ca4ad6c636c4f3f82c75db59626ca data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate_with_tool.json +ad0cf86e91875bc73de801e852d74694f3ef5cf5 data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring.json +468805e2fbd2952e864e0f5168d7bbf56544601b data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring_with_tool.json +8115363d3a3ddd21077a964da4bc60d614f9475a data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod.json +69b288bebb33f0e3f8be3276a3f2c2f0e3f210dd data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod_with_tool.json +f33bb86440ffa8032f28b3444a1e520a2763bc79 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt.json +d1002b9e2c34aa2c2699b40a5cc65d90afe4a388 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt_with_tool.json +d40aaaeaa939e5cfaed27ed55bf9d423ad13c715 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate.json +dc7adbc3803da83aafe7f0708ba72cf42c8e97c8 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate_with_tool.json +6b549f95905ff1df805cd64eb56e8bb9e6fc8981 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_double_ingot.json +7b4f910e59302ce6a862cf210820fa5487879b2a data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_dust.json +d93a352a687e46b7465fa9b22c08e820f1a62b86 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate.json +3e253d59264ff08e275e062e2a02a7bc47f27ec3 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate_with_tool.json +1cb72aab990cafee110c50fb01ce74086dc416f0 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring.json +3bce0af0c1103a025dd16302832e81ed89bdaf5a data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring_with_tool.json +12a4736ddc0f55d27a47eee5cfc414b8844d19c5 data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod.json +9a0e00681bccf4da43a21621bf30c5bca45d61fe data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod_with_tool.json +13900a76952a882b3d7ab52aa718b1ff1b68ca81 data/modern_industrialization/recipe/materials/gold/forge_hammer/nugget_to_tiny_dust.json +2215f1128e32820d4bc6ac8d1a05875429b7013c data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_dust_with_tool.json +a83af16e0e62990670c14c92013e18887e6b6703 data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal.json +e976d871b3ef526683daa00240151b35eb0c637a data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal_with_tool.json +7ce14c40df5fe98dd96e676b8fc9711a94c91502 data/modern_industrialization/recipe/materials/gold/forge_hammer/plate_to_curved_plate_with_tool.json +b53bffc69051a3263fb9c553bb1b23bea8b6e379 data/modern_industrialization/recipe/materials/gold/forge_hammer/raw_metal_to_dust_with_tool.json +ae85088b20252336b834b3c3e2c52d1ccf7f4ac0 data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_bolt_with_tool.json +48098efb5e7cb809774e207edbb3ba1126fbb9dc data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_ring_with_tool.json +579985e8ae8406334f6844e8224a08bc10bea17a data/modern_industrialization/recipe/materials/gold/macerator/bolt.json +0705f5aadf0f1b0c37fbabcfc3234494022c51e7 data/modern_industrialization/recipe/materials/gold/macerator/curved_plate.json +981b15af13e2e903d809eb32bf0d7a46cbfd8107 data/modern_industrialization/recipe/materials/gold/macerator/double_ingot.json +cf6e27c1e7e8ec109a62e45c82842162aa2eb563 data/modern_industrialization/recipe/materials/gold/macerator/drill_head.json +0cc5475613aef2b3814006edff2c45be2b138511 data/modern_industrialization/recipe/materials/gold/macerator/gear.json +4e575191834ffeb1e6955898d1e7b9dbbca09e5f data/modern_industrialization/recipe/materials/gold/macerator/ingot.json +657e74960955a553f930c352006c6131058e9ed1 data/modern_industrialization/recipe/materials/gold/macerator/nugget.json +ae2aaadcc709e4ed926394d75db0e8c39f532cb5 data/modern_industrialization/recipe/materials/gold/macerator/ore_to_raw.json +ea27de77b0a2c303a9ca6cc9c0be8d2db4acff53 data/modern_industrialization/recipe/materials/gold/macerator/plate.json +e8a01cd69f58dff3517d0d980c4be5d5431d47ca data/modern_industrialization/recipe/materials/gold/macerator/raw_metal.json +fdd91706b3d25ab58b565ffb6abed4446773339d data/modern_industrialization/recipe/materials/gold/macerator/ring.json +ca1da88e287ef3acca2ce8e15d4cb3dd9cb324c9 data/modern_industrialization/recipe/materials/gold/macerator/rod.json +9ad40e06b69db668681caf0017fc34c42df1323b data/modern_industrialization/recipe/materials/gold/packer/block.json +635331f0ace48b00a971eb8ee456ff63d67e10b2 data/modern_industrialization/recipe/materials/gold/packer/double_ingot.json +cdf656547d77238f66e230fbe3d47e1ff03fa895 data/modern_industrialization/recipe/materials/gold/packer/dust.json +cc90d42ac45d58a947f91031973d16e17ed98373 data/modern_industrialization/recipe/materials/gold/packer/ingot.json +ec34e3b4ee0bedf914c41776a1e10e1fb62acec7 data/modern_industrialization/recipe/materials/gold/packer/raw_metal_block.json +6d3a3d60f827585ac61fac19f1550ffa2f617e83 data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_blasting.json +c88f91c1e0d115a33be0d8aeaf9adb2bac999424 data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_smelting.json +534f79774e19dd5e382e8a4caaccc03aa7cbb39c data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_blasting.json +79564854db71789580362fc5fe57a43e055f0216 data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_smelting.json +88df6404c8a1c6262aa4fdb169a3bd0a4a3193c6 data/modern_industrialization/recipe/materials/gold/unpacker/ingot.json +095bcebb68af78142f29c305c87e199eb1797563 data/modern_industrialization/recipe/materials/gold/unpacker/nugget.json +c0c1d60bf34169289bacecb5b827807af646d45b data/modern_industrialization/recipe/materials/gold/unpacker/raw_metal.json +d4ca875358ae10f7692ca3ed2304feb97d698daa data/modern_industrialization/recipe/materials/gold/unpacker/tiny_dust.json +253c78fc907847ac27df227e3c0878ce28038d84 data/modern_industrialization/recipe/materials/heat_exchanger/lava.json +136b63fea626a2c2b8f7f85c512cc4dffac1d2ce data/modern_industrialization/recipe/materials/he_mox/assembler/fuel_rod.json +ccf7762cbd25ee002eed5a0df6690dfc1a451122 data/modern_industrialization/recipe/materials/he_mox/blast_furnace/dust.json +ea8ed989d985da37a754434f83e8e93f2a01478d data/modern_industrialization/recipe/materials/he_mox/blast_furnace/tiny_dust.json +304fc6f4cb537844671c606be7c7ec5a81dc0258 data/modern_industrialization/recipe/materials/he_mox/craft/block_from_ingot.json +f668478c52c6f6ab403253cab3b4001be06e91a6 data/modern_industrialization/recipe/materials/he_mox/craft/dust_from_tiny_dust.json +d42a2419195d6516f1559c2ffe87fd028f2ad8d8 data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_block.json +fb60b68d5c37eee204e398140deb08505c75e82e data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_nugget.json +968c5bca7c9bf12e5d3698da34e76f82fce4d070 data/modern_industrialization/recipe/materials/he_mox/craft/nugget_from_ingot.json +8b976c4cbae92f546fca58f38530e3f2c3363bbe data/modern_industrialization/recipe/materials/he_mox/craft/tiny_dust_from_dust.json +4643fbe73f9e83f9ee7fcf78880e0564d39a4490 data/modern_industrialization/recipe/materials/he_mox/cutting_machine/main.json +27e58d8d4361076b727b958737daa8c5431e0bc8 data/modern_industrialization/recipe/materials/he_mox/macerator/ingot.json +95c402db849d555935c1052560168ad8d482c579 data/modern_industrialization/recipe/materials/he_mox/macerator/nugget.json +d96396f51de9db1c14e4a7fd021c02dfc7bc9592 data/modern_industrialization/recipe/materials/he_mox/macerator/rod.json +36152d974d05e2c8ac997e6fccd782ebf279dff6 data/modern_industrialization/recipe/materials/he_mox/packer/block.json +6a265359850f87de0b2cdaceda06a8014661afed data/modern_industrialization/recipe/materials/he_mox/packer/dust.json +3b84b750f7d119c11a39920ea1a908e632be1bc9 data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_double.json +afaace195fd6020710989b579da3bd4edde1b7cd data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_quad.json +18f07a872f9c45e5dc532d02628b9264e9aae568 data/modern_industrialization/recipe/materials/he_mox/packer/ingot.json +2c37dcdde2238512211616664cfbfc01f6954b49 data/modern_industrialization/recipe/materials/he_mox/unpacker/ingot.json +9a6c483dddf51fbb4a23472befe5d202434a6cdb data/modern_industrialization/recipe/materials/he_mox/unpacker/nugget.json +35b17fd89bfe3c48b68e8a81fadab51631e27b01 data/modern_industrialization/recipe/materials/he_mox/unpacker/tiny_dust.json +8ed13554ce26f9310bb0bfff64827e5f872aefb2 data/modern_industrialization/recipe/materials/he_uranium/assembler/fuel_rod.json +e7a15637643c042a46af7a2405ddfe5d555c220d data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/dust.json +b21d836c97a01674243a0e9ee641e112344650da data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/tiny_dust.json +b67e16866937f40238b7458b576a999b26822a6d data/modern_industrialization/recipe/materials/he_uranium/craft/block_from_ingot.json +7d06ccad9a28d0a9cdb834a8614eba297af05cdf data/modern_industrialization/recipe/materials/he_uranium/craft/dust_from_tiny_dust.json +641be8e062710b3303092da6a7de1061c252e8b0 data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_block.json +fe64ca1d7351e7dcaecf24e9c944eb87d87b7ea9 data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_nugget.json +5c851b7573b08306de07d9125c8112bac6201966 data/modern_industrialization/recipe/materials/he_uranium/craft/nugget_from_ingot.json +f256604110b8a38797f9efa38d42d420e748befd data/modern_industrialization/recipe/materials/he_uranium/craft/tiny_dust_from_dust.json +2cce04192b69e1a7d930ac4013be5a0907c486eb data/modern_industrialization/recipe/materials/he_uranium/cutting_machine/main.json +350ae50e9d047ddbcf53c1e268ab8238fd9f78ea data/modern_industrialization/recipe/materials/he_uranium/macerator/ingot.json +21cd41ed58c123e86b7a9b48d1620fb9b532c0b2 data/modern_industrialization/recipe/materials/he_uranium/macerator/nugget.json +5b9a6cb4c59e4da889e71f8010223581556a85c1 data/modern_industrialization/recipe/materials/he_uranium/macerator/rod.json +c4b469b31e16bdcab79bf47d4a7a678ab7b16aa7 data/modern_industrialization/recipe/materials/he_uranium/packer/block.json +2ac98b3ec58d2b66e788961cec22020c71a48d35 data/modern_industrialization/recipe/materials/he_uranium/packer/dust.json +ac6d5936875fae465b7d5e72ef9b4ad5e5108870 data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_double.json +a6a6775e8782dcdcba2649221fc03611ee93413d data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_quad.json +747015ec92ff5ad7554b2b87aa7403079e644339 data/modern_industrialization/recipe/materials/he_uranium/packer/ingot.json +3a12352e05c7b6fb6240f8ab827c74d04d030ebe data/modern_industrialization/recipe/materials/he_uranium/unpacker/ingot.json +b63b1390746caf6cb40dd2f7a1e1fe790b5a126e data/modern_industrialization/recipe/materials/he_uranium/unpacker/nugget.json +1166123b231cf981d1c4f8cdbe5d16d1b74a6416 data/modern_industrialization/recipe/materials/he_uranium/unpacker/tiny_dust.json +34cd99abb712565d7c80566fe7be4aa23719841b data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json +eb20b4609fd0410f9717d61c5e4448f82ba2b11b data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json +a4e40fca8423b01e5e362e32d7f72bbf3b02ba66 data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json +5e8487703289b8f6c5a084a87785e22ad8cedc78 data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json +abf3b0a66a6e460467234b8520aafa15478e327b data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json +45eaad6c900000f96d9b22fb7e46032deb950c5b data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json +238b45a2bf2996d3e7d5265dbe7859d931ff5fa5 data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json +21d5cf946d22341e58037297896a60714a099502 data/modern_industrialization/recipe/materials/invar/assembler/gear.json +588521a916121c5743f25469674403a6efad414d data/modern_industrialization/recipe/materials/invar/compressor/double_ingot.json +1d8e729af7ce3ecba8106ec5e36a713795e2fe7d data/modern_industrialization/recipe/materials/invar/compressor/main.json +7e152414d475d2828731979b5e6b448c68f0f117 data/modern_industrialization/recipe/materials/invar/compressor/ring.json +dc6f5b9844278edc67130f583c44d1d2504fee0b data/modern_industrialization/recipe/materials/invar/craft/block_from_ingot.json +c86babe619b5ddb993df15c31bcd33cc8299c70f data/modern_industrialization/recipe/materials/invar/craft/dust_from_tiny_dust.json +a0059cc6fafa9b192e50315400b52053daaedbf4 data/modern_industrialization/recipe/materials/invar/craft/gear.json +c94c8330e0decebf727a98822bea285dcd34a702 data/modern_industrialization/recipe/materials/invar/craft/ingot_from_block.json +d72ba29448a8a5d6876db14d8406d670ba9163d0 data/modern_industrialization/recipe/materials/invar/craft/ingot_from_nugget.json +137dcc7cd7450329c85206c966927d2a18b90d38 data/modern_industrialization/recipe/materials/invar/craft/large_plate.json +aef6de66f5ea494a2d6f8bde9d2a2448b0687089 data/modern_industrialization/recipe/materials/invar/craft/nugget_from_ingot.json +0474307bf34e3c22190eb0e391d933e4a68075f6 data/modern_industrialization/recipe/materials/invar/craft/ring.json +fb5f3f14bee227038580e302c052179c34ead5ad data/modern_industrialization/recipe/materials/invar/craft/tiny_dust_from_dust.json +5bfcd8eeed87b7c8d6a863f4aceb58591379af2e data/modern_industrialization/recipe/materials/invar/cutting_machine/double_ingot.json +8ee2a0085bf9bcb0ef2fbfd46f341dcd421b6e58 data/modern_industrialization/recipe/materials/invar/cutting_machine/main.json +c65cab1f0f29d597119c8a1463bb9a434b9ce08f data/modern_industrialization/recipe/materials/invar/cutting_machine/rod.json +fa94cd4dc94e8a6eebcc35a0dd9643a651aa823d data/modern_industrialization/recipe/materials/invar/macerator/bolt.json +925f20b7faf3813dcd6c81183e98b636c542299e data/modern_industrialization/recipe/materials/invar/macerator/double_ingot.json +e30adc4532a1872f7995031353de53d6bc164781 data/modern_industrialization/recipe/materials/invar/macerator/gear.json +9e449108bcc7c59f8c96fec14e3919d41b3957b4 data/modern_industrialization/recipe/materials/invar/macerator/ingot.json +3be8258d6b4e1e81c79f03533fe6c448fe9ee8eb data/modern_industrialization/recipe/materials/invar/macerator/large_plate.json +2ad443c0c28acac7e9ce341c2d61530103e3a40a data/modern_industrialization/recipe/materials/invar/macerator/nugget.json +178f1b95ad3c65ec3abaeac196bd7a9a82c5e383 data/modern_industrialization/recipe/materials/invar/macerator/plate.json +1d6971a2ab89ce6c8f4db3cb05733acc9da65230 data/modern_industrialization/recipe/materials/invar/macerator/ring.json +96fc810961d19b3a4f7a6650166237af5ca9e418 data/modern_industrialization/recipe/materials/invar/macerator/rod.json +46552747a867461f359aa14c2b69c84dc84c008e data/modern_industrialization/recipe/materials/invar/packer/block.json +5f26aa02f5668887c61d13b7da3c3a6e6905df14 data/modern_industrialization/recipe/materials/invar/packer/double_ingot.json +0575073b22036fec962b8fc68a1b1ef153ee56b6 data/modern_industrialization/recipe/materials/invar/packer/dust.json +54240655396d4aa49d7bf63148951bb5e9974a8c data/modern_industrialization/recipe/materials/invar/packer/ingot.json +207b39d9eae356bac1192174800e5b1c5ff6fc9f data/modern_industrialization/recipe/materials/invar/packer/large_plate.json +cb343956e3ee82aca0496e0e90240a138a3c45c2 data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_blasting.json +ff87754debbe4b64a1d0df2cffb5457491fa2127 data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_smelting.json +46aee74c79e2ab528b011236dd4bd732fc6f92f1 data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_blasting.json +7857706bd4ccee07f692c3ab4775c1eefa9057ad data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_smelting.json +fda837b66276e226f327e955ff2b874cf83efbdd data/modern_industrialization/recipe/materials/invar/unpacker/ingot.json +7641cae0c29a6140b538344a7977d93394ba5a7d data/modern_industrialization/recipe/materials/invar/unpacker/nugget.json +061ef404642711c2ae543062f64891fb87eb928d data/modern_industrialization/recipe/materials/invar/unpacker/tiny_dust.json +fe6f3f029fc320f9a2f44e876fdaf04a85530bf2 data/modern_industrialization/recipe/materials/iridium/compressor/plate.json +26da5ac7ab181e2e4215542bc6a8ade86b2b660d data/modern_industrialization/recipe/materials/iridium/craft/block_from_ingot.json +5954b5a393ff96a4a87abe2e7cdb0597f4245369 data/modern_industrialization/recipe/materials/iridium/craft/dust_from_tiny_dust.json +4ce71f302651049034da998e611db3c3005758b7 data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_block.json +62613e9d86ab1433d6739a4b9c987f501c7a1fe6 data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_nugget.json +f99bc709785c1325c1f2b0a769ba894f62e44fcf data/modern_industrialization/recipe/materials/iridium/craft/nugget_from_ingot.json +6cd5205c9431c5bbf5cbe36bdb210cd47eb1792c data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_block_from_raw_metal.json +b92a20d0a84cec58148adbdca574da36816c19d9 data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_from_raw_metal_block.json +89ed1e45fe858ff2a58bd48c9af95b805e39ccd7 data/modern_industrialization/recipe/materials/iridium/craft/tiny_dust_from_dust.json +f9b4a132816dbe8394498d3d5127a8fd7e45a683 data/modern_industrialization/recipe/materials/iridium/macerator/curved_plate.json +92c2c1ae2bfa2bb1311d7f4181df49f2d1989046 data/modern_industrialization/recipe/materials/iridium/macerator/ingot.json +da5452b80fb3bfba90e557861fad65913cb73614 data/modern_industrialization/recipe/materials/iridium/macerator/nugget.json +d5dea432ea55b15687532b2cab507b1570c5fb14 data/modern_industrialization/recipe/materials/iridium/macerator/ore_to_raw.json +5f0c2769077a8e1019c6ae92be016adcdb98036a data/modern_industrialization/recipe/materials/iridium/macerator/plate.json +2761ce608b36a8e4f479353a2e764257414caee7 data/modern_industrialization/recipe/materials/iridium/macerator/raw_metal.json +786a475db72d5540457e092d9d0aa05fea62ed44 data/modern_industrialization/recipe/materials/iridium/packer/block.json +013caea46e29b236a880cd2ed2c5fec196187597 data/modern_industrialization/recipe/materials/iridium/packer/dust.json +4384ee5e3e607a4b8bf272760decb2ed095acb9e data/modern_industrialization/recipe/materials/iridium/packer/ingot.json +c0df5175e505274ab74532b041f59fa16f8e0ab0 data/modern_industrialization/recipe/materials/iridium/packer/raw_metal_block.json +40ebe1a67bd178c947fd512064f28c90aebea59a data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_blasting.json +035adbefc94d375cc060bba693a5fe243639b9be data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_smelting.json +ee0c0a461e666a881a43e17e18c313f792b0f4f9 data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_blasting.json +0f404ab7456e9baf01461fa680ec38fdb0009bf2 data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_smelting.json +5a87d3dd5e0200ceaee9993eca47650f563c9dfb data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_blasting.json +75de326aa5ff4e4cd2afc0b7ee1913cfef4b7107 data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_smelting.json +a74b4fe4ceec772a520ebb560f45d6f62d5fce86 data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_blasting.json +3d87511355ecbd2cc6346ea660ecbf4b39b7b108 data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_smelting.json +4b991921abfd36bce6b8c3411ee22a2f2c5b96fa data/modern_industrialization/recipe/materials/iridium/unpacker/ingot.json +2caeff0e47e3cd128a342846299b37156f9c5867 data/modern_industrialization/recipe/materials/iridium/unpacker/nugget.json +70ed0e65bb9a3a968514687a2c1438127591eaa2 data/modern_industrialization/recipe/materials/iridium/unpacker/raw_metal.json +46c0b6f4bc834ba1451967ab4301958d61b5576e data/modern_industrialization/recipe/materials/iridium/unpacker/tiny_dust.json +a777601766def1099aeac7a8bbd30d61283b6e9e data/modern_industrialization/recipe/materials/iron/assembler/barrel.json +c008d8268d4ace25b23b500b9471028ff4f4b3fb data/modern_industrialization/recipe/materials/iron/assembler/gear.json +78f9daa10eb0c8dbd74a5489ecb9a437343ddb44 data/modern_industrialization/recipe/materials/iron/assembler/tank.json +4b8ea227961308106a47532268c058af7cffd0f4 data/modern_industrialization/recipe/materials/iron/compressor/double_ingot.json +68a11472ca93d23bafed48299d8ad22a055b4cef data/modern_industrialization/recipe/materials/iron/compressor/main.json +78554b9c479fd3501061b019a95a38fbd4d5c8ed data/modern_industrialization/recipe/materials/iron/compressor/ring.json +13a316e08dee835a64b46627d73f90b005bee7f8 data/modern_industrialization/recipe/materials/iron/craft/barrel.json +8ddc15c5e0d5ea23d73e7123ef43fb1c3081e7ef data/modern_industrialization/recipe/materials/iron/craft/deepslate_to_ore.json +1c50e5e8627820ad4d4f41c14ef595385257b46e data/modern_industrialization/recipe/materials/iron/craft/dust_from_tiny_dust.json +da73e333b51f5399cf15b57019373f1cef805ab7 data/modern_industrialization/recipe/materials/iron/craft/gear.json +e40026a85faa1fbdb439b302c3adc43b232b3abe data/modern_industrialization/recipe/materials/iron/craft/hammer.json +311c20df1decb1005c7a9d9dec45d9a9211373d8 data/modern_industrialization/recipe/materials/iron/craft/large_plate.json +733bca7e0efc83bc33adb5feeeafa7dc16ce1f9d data/modern_industrialization/recipe/materials/iron/craft/ring.json +dcb70d59077c0cf2e7932a875762f69e58663314 data/modern_industrialization/recipe/materials/iron/craft/tank.json +8e12292f8f4cf3f40f470e2612b28e6af1012473 data/modern_industrialization/recipe/materials/iron/craft/tiny_dust_from_dust.json +d1b352fa359453d5bc5e6655e6541a1cad696e92 data/modern_industrialization/recipe/materials/iron/cutting_machine/double_ingot.json +53bfc32e50adbcdfc7852abe76496c693e8969a8 data/modern_industrialization/recipe/materials/iron/cutting_machine/main.json +944c988dfdab00262c90d0eb7c816865b97ad4c2 data/modern_industrialization/recipe/materials/iron/cutting_machine/rod.json +1f109bdbf8dd9d9b1d3979e7040577a6901c56ec data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt.json +cb1814b51dbac9b8273e0a8bbb4b3f4c528470dd data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt_with_tool.json +d8638cdf3ca2768125da0902e7d1852399443862 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate.json +23dde0e19db10ef7dd9de8df185ed7f2e952588d data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate_with_tool.json +013e058d02863025162470441b205045c7421e87 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring.json +a7aef26157711d6d4c1802669273268efa8004d4 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring_with_tool.json +9a2fa3506085480fc04d9510af60a610189996a8 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod.json +4aa61128931fd8ce51deb7e9f8b0304578b5ce03 data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod_with_tool.json +f040ba661c82d8826fd7e62f4bf9b9f5339e6e9f data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt.json +d8db4bad104797917fdd12f2145d4bdc2dde64b8 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt_with_tool.json +a22f6d57ff8ca165475642121de9a00c23aba429 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_double_ingot.json +00acbf58173ebeffebf1e91915cd8deca32efacc data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_dust.json +0aa0132750469cb493802eee1497d9eea6278098 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate.json +bdae6963881fe94156eb00de38607dfa8f62dd73 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate_with_tool.json +50298cfb3a68f0cbe9c26a1b74729bd56a16a36f data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring.json +c01b71d1b06cdb65e65dcb6945b6efc2542ef96e data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring_with_tool.json +e5ac71154b31d8b1f91a78e2b6e95ae7d61c4de3 data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod.json +7c8bbd511b5ed03300bd0c1151c2c3036dda9a5a data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod_with_tool.json +e68b659171aa30ff6e0a339bc81d3356dea35a75 data/modern_industrialization/recipe/materials/iron/forge_hammer/nugget_to_tiny_dust.json +7c418a12fffc4f3cc29bca5ec8a9ca892115b21f data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_dust_with_tool.json +82556bb113642c5010c81ed8635d1eaef4935958 data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal.json +a7f8952072c7058805fa9869c2c597c331a73a30 data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal_with_tool.json +868207a291a8223617b303fe7f70477abed66b91 data/modern_industrialization/recipe/materials/iron/forge_hammer/raw_metal_to_dust_with_tool.json +fb700a0641a1b9bc2c042ed16f61e7ccf00d0dcf data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_bolt_with_tool.json +37c4303c350d3f33b15958b1f906d5333909b2c1 data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_ring_with_tool.json +0eefa3f6c3614ca9f209d6345e33c1501e420073 data/modern_industrialization/recipe/materials/iron/macerator/bolt.json +5eb900128a1c00e07120a0b2caeba38feef61d9e data/modern_industrialization/recipe/materials/iron/macerator/double_ingot.json +13f7f276be5e2dd1a01b9b3b80cea79fb3d74376 data/modern_industrialization/recipe/materials/iron/macerator/gear.json +05842279cc7b28306091a5b69dd2b2382a24ec47 data/modern_industrialization/recipe/materials/iron/macerator/ingot.json +35534e71913977a0d29559c18342ab3937fda65c data/modern_industrialization/recipe/materials/iron/macerator/large_plate.json +22cae14d504c76eab3d607ae2a1ab40c1f2ecb25 data/modern_industrialization/recipe/materials/iron/macerator/nugget.json +73e4a1e738f892c58c133d815e46ddb9bbc6dffa data/modern_industrialization/recipe/materials/iron/macerator/ore_to_raw.json +15657ff22e82ddb381e34e841f0986fb434c603e data/modern_industrialization/recipe/materials/iron/macerator/plate.json +7f0cfc622325b3b4b2b9e20f7d946e07e48ba547 data/modern_industrialization/recipe/materials/iron/macerator/raw_metal.json +82a33cf1c54826309c6d8c34a0542dd46793a4fd data/modern_industrialization/recipe/materials/iron/macerator/ring.json +d4bc9c7ac379232bff110cc2c0d8a99e2bbc77d3 data/modern_industrialization/recipe/materials/iron/macerator/rod.json +2ad72c0a34133ac229445a54b364c5a8d09ecc4e data/modern_industrialization/recipe/materials/iron/packer/block.json +4c9b0980398804b252406fe77ef0bc88b3b3c192 data/modern_industrialization/recipe/materials/iron/packer/double_ingot.json +b482449c701368a17f56a000e3d8d17fb3f3dca7 data/modern_industrialization/recipe/materials/iron/packer/dust.json +8dc20dd11247e776d512be30acd5e44868a4d45c data/modern_industrialization/recipe/materials/iron/packer/ingot.json +d60587b2b5c97cd1dfd798f185b3b3923cb28427 data/modern_industrialization/recipe/materials/iron/packer/large_plate.json +0f4ee514138068a0f3d680a29cedc0850b88d080 data/modern_industrialization/recipe/materials/iron/packer/raw_metal_block.json +ce7504210e087f6ba6d5d24ac6c5b0b3dfe776ba data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_blasting.json +0102d7ef57c811d6d68b90de1163a1d849bcfd50 data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_smelting.json +e5e77fa0d29e095ce335b822ab218148f7066d1c data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_blasting.json +06c390107e3b404fb9c619cf2cc163b909f55ad0 data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_smelting.json +d5008d124d3fe8363999c209fd5a62e920cd0e56 data/modern_industrialization/recipe/materials/iron/unpacker/ingot.json +c513353e46c06032354a7350b78ea1a27606dbbf data/modern_industrialization/recipe/materials/iron/unpacker/nugget.json +7efc0b7ae9970185ffe18c5171cee0056aff0e40 data/modern_industrialization/recipe/materials/iron/unpacker/raw_metal.json +47eaa2905604c55700907c7c533f688ccd6e93ba data/modern_industrialization/recipe/materials/iron/unpacker/tiny_dust.json +2d37034623906a98f6a028e8a40a23bc42468942 data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json +91197a0810e342158a7883c64886544b21605490 data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json +ce44b3a9f1f54d0089d13a170c3823ec2e7f8737 data/modern_industrialization/recipe/materials/kanthal/assembler/coil.json +814ead7eafba1f8b9777326ffccb9e14a6eaa902 data/modern_industrialization/recipe/materials/kanthal/blast_furnace/dust.json +4621bba6aa35293db30c847323e0d2d687eaca78 data/modern_industrialization/recipe/materials/kanthal/compressor/double_ingot.json +b51915251cbcc4c27c3325bba298d3e0435702f9 data/modern_industrialization/recipe/materials/kanthal/compressor/main.json +a8bf918899400129e44056a3d98f3b13cce85c13 data/modern_industrialization/recipe/materials/kanthal/craft/block_from_ingot.json +167e55d7dd0cf005c8eeb729c5726f318f9991c8 data/modern_industrialization/recipe/materials/kanthal/craft/cable.json +de48d4ba14122b88b4c14e36e113fd425f0371b5 data/modern_industrialization/recipe/materials/kanthal/craft/coil.json +867d6064d9d9e72b6cfd9abbef8505de6bcee105 data/modern_industrialization/recipe/materials/kanthal/craft/dust_from_tiny_dust.json +f2160bbf0b8934dd9555d40aeaa83760a1b757f5 data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_block.json +69fd49c5e7bbca35322b2a110485edce6ff51d41 data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_nugget.json +891bcebc4eef0910463cee080dc7d8d725256c1f data/modern_industrialization/recipe/materials/kanthal/craft/nugget_from_ingot.json +6486fa933dbef05e15cd1a97cc3ccb896e2834c6 data/modern_industrialization/recipe/materials/kanthal/craft/tiny_dust_from_dust.json +8349c9a790edef24b6df5e6df39c0d94cba41a5a data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json +1ec7d801d5b169aad706cf6168f181308c19c1a8 data/modern_industrialization/recipe/materials/kanthal/macerator/double_ingot.json +73d80b976e48357b6a5f0f44928938a57d5e9a5f data/modern_industrialization/recipe/materials/kanthal/macerator/ingot.json +2e7f4449f6460d5d3e71779089f693370c03524e data/modern_industrialization/recipe/materials/kanthal/macerator/nugget.json +39c70a86c595e233f2a1bca8f3f123d54c79943c data/modern_industrialization/recipe/materials/kanthal/macerator/plate.json +13091efafade36a49923465d2abe7fd20704dfce data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json +044934a1cda79a012c5932be1024668e43ceebbc data/modern_industrialization/recipe/materials/kanthal/packer/block.json +977da094b657ccd51a7878be907ccffccea04cef data/modern_industrialization/recipe/materials/kanthal/packer/cable.json +465d11f7a5efe6898c3bbc348679d0844360c39d data/modern_industrialization/recipe/materials/kanthal/packer/double_ingot.json +6e65d99bc5c90bde5169e06deb21be30e10b76c9 data/modern_industrialization/recipe/materials/kanthal/packer/dust.json +d919e70ea6b59349c9a21c83684339bc3a674518 data/modern_industrialization/recipe/materials/kanthal/packer/ingot.json +61cabbc23b51ae893ae13c5d591f5a7d028ff352 data/modern_industrialization/recipe/materials/kanthal/unpacker/coil.json +9597d7c14f8ebbc067e114fc25f6a3c29ddd3559 data/modern_industrialization/recipe/materials/kanthal/unpacker/ingot.json +4d4aecd279310d7f2b257335255134ccb7bb974a data/modern_industrialization/recipe/materials/kanthal/unpacker/nugget.json +e522856b3946118d84f13aaaf7fcd936130bceb8 data/modern_industrialization/recipe/materials/kanthal/unpacker/tiny_dust.json +58fbfb29a19c7e9cde6994d71af4e0b643df0f88 data/modern_industrialization/recipe/materials/kanthal/vacuum_freezer/hot_ingot.json +28d4d3c3b5229ed281d82d88656ad7dd090fd1dd data/modern_industrialization/recipe/materials/kanthal/wiremill/wire.json +0eeefe7a477bd644def0673ef1c14481815e9bca data/modern_industrialization/recipe/materials/lapis/compressor/lapis.json +d717f47caf18a35319fe897222df33ec90b04599 data/modern_industrialization/recipe/materials/lapis/craft/deepslate_to_ore.json +ed45b6399ddf918cfb505a1d68358df6a6fcddb3 data/modern_industrialization/recipe/materials/lapis/craft/dust_from_tiny_dust.json +43c834f464b0c22e52617380e998d8a13602deb8 data/modern_industrialization/recipe/materials/lapis/craft/tiny_dust_from_dust.json +3a0789c0b8b6e205620be9a7948882f5f4084b2e data/modern_industrialization/recipe/materials/lapis/macerator/crushed_dust.json +ea79175a7a35e9bf041c346d0565c353df75882b data/modern_industrialization/recipe/materials/lapis/macerator/gem.json +a270e1e6214b2f4aba171af8c551328792b761c0 data/modern_industrialization/recipe/materials/lapis/packer/block.json +cdf25eec26a0d82b27ba943a12877787cd53bd91 data/modern_industrialization/recipe/materials/lapis/packer/dust.json +69d000ed9af4f9661359a5322fa96bcdfa29e890 data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json +752496e33dd9c3971a130a759d31c19f66c28f93 data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json +e1d6c65baa8c7b12d54f105f2b3d79c88a8bf3ec data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json +d306667d08302f83f7569f511ec5b00fc6dc3144 data/modern_industrialization/recipe/materials/lead/compressor/main.json +e85020dff4bffddb501501b24116ee4d58cfb206 data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json +f6de664f62ed001776b1ccec261f8808454742a5 data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json +88d33f38219c77094a056aef9b1ca670b441ca8c data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json +aa1476fcf4d096eff2643cc828681dea61d7d253 data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json +8bda5748c0ceb01eb5c04ad0a07c60ed881b2e9f data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json +27b01da3002071de5b718f66eae8848903f01f86 data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json +28778086bc74042eac9dcfacb599e1b8c362b3f2 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json +6203fd0ebb366065c8a5f9eea6740817fdddaec4 data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json +40bef877997cd42a31359d6fde7532103e7dbe0f data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json +730f75498261e06edf758c70a68f7f1a6611d3b0 data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json +94a073b0cd5c145cda5d946707635e6d2fca567d data/modern_industrialization/recipe/materials/lead/macerator/ingot.json +2564c3b3818f979d6d90e19c6a0f00284dbe58c0 data/modern_industrialization/recipe/materials/lead/macerator/nugget.json +c5f710f2dd38c11bf4d3a361f6a62c5e50c68073 data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json +acde75191657515f0a551cddecdd55879f142edf data/modern_industrialization/recipe/materials/lead/macerator/plate.json +f01c7c41df61a0c17dd03ac6d97d9212cdde7e90 data/modern_industrialization/recipe/materials/lead/packer/block.json +792793bf24aa7077579fffb2d53b548ade26117c data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json +e27f43d2deb3f29df99e30ad2ccaa0a714f78336 data/modern_industrialization/recipe/materials/lead/packer/dust.json +9ffeb02efc961fec2727eb9b5c44eb934ec74066 data/modern_industrialization/recipe/materials/lead/packer/ingot.json +02146de9875ed108f2da3de52868d2ef7464cc3a data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json +e1c675b4653a7e5bac591d38cc5ab82a488026fd data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json +0b55e8242fbf42e8f86a32941dd7975c3305a797 data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json +c695dd448996c06cb1e406ccb594e0aac8017abc data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json +92f38a487ea4e748f30976d465a78075380dbed4 data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json +8cfe3f58c43572ed79a2bd68837ccff82f73eb7d data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json +3b0c407ed4029416902957cce2fca51c8b00070e data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json +b09804d9db1d134e959339830054e6b356d5dfac data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json +16f898eadf4e880976b9009750b797f519b8ddfa data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json +13a4627d5005ec12e7a1b0dfb4b361b2d8991d05 data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json +364cd54b1a3608442d864f548e2c15157fd57260 data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json +d9af50a150a6c6904a273c185c1ca6fffabb4fe7 data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json +4f4929e868a6b1878c8f890e63631ed0722b4433 data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json +71de110ddc670cd710f9010cd7f688a6f307637b data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json +8f4e696e99b8fe87d7d3426ced0c3b24f758b81d data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json +524262a984c8cad371522aebc4a79301fc1a5319 data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json +9b4ed3e8ad98a3312f5fbc7a0fa875929f76c43e data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json +420538e95a2ccb1814fb3347d1c648f51d05c967 data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json +25313edc6c24fa1f930dad6c32800d3a9a1ea012 data/modern_industrialization/recipe/materials/le_mox/craft/block_from_ingot.json +7246eacc8e848c72cced90619af8139ca491b463 data/modern_industrialization/recipe/materials/le_mox/craft/dust_from_tiny_dust.json +bbf958aa6cfe660e5e2a77b6211ca5596a7c1fd4 data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_block.json +c2b79323c24949c0c157e32f948ebc7ee3338890 data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_nugget.json +5a2d2a7f092d7a3b26475c05fa4e56ec7b171d7d data/modern_industrialization/recipe/materials/le_mox/craft/nugget_from_ingot.json +9beee9cd426bc66cb2d6fe018aa93008af146abd data/modern_industrialization/recipe/materials/le_mox/craft/tiny_dust_from_dust.json +2d4df085ecab0b90767e4d114d2f6c1c289532f1 data/modern_industrialization/recipe/materials/le_mox/cutting_machine/main.json +7248b5ef1922ec9a6694498a9a83c3b596f40ee8 data/modern_industrialization/recipe/materials/le_mox/macerator/ingot.json +172ff80919e2412523aa7e85081beca9106e4551 data/modern_industrialization/recipe/materials/le_mox/macerator/nugget.json +fb8a515c8ee03db0c2e5d72d7cfbf39b24cdb99b data/modern_industrialization/recipe/materials/le_mox/macerator/rod.json +9f8fd62ca5ee92ae272d662dfca098370b133f0d data/modern_industrialization/recipe/materials/le_mox/packer/block.json +fe88c3d517cf94ce70affee0cbf7cb219020e919 data/modern_industrialization/recipe/materials/le_mox/packer/dust.json +8508bf07db9e20d413984fcd9f97cb7953acd2d9 data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_double.json +ef795fec0b2aba54236630b73c2f2314489c0305 data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_quad.json +816cc42c22b817e19b9572b375447e5d2067ff87 data/modern_industrialization/recipe/materials/le_mox/packer/ingot.json +b8a7aa3d36af8ab5adcb99b851e2281788cdefac data/modern_industrialization/recipe/materials/le_mox/unpacker/ingot.json +a1ceae2d338fcfa948b8186f5bd1ecf2cb8e261b data/modern_industrialization/recipe/materials/le_mox/unpacker/nugget.json +b6b4e72af0d4921e54e641b19c0b4cb54be544a2 data/modern_industrialization/recipe/materials/le_mox/unpacker/tiny_dust.json +d388eebee439506263f891204b41dfbeb2a49f8f data/modern_industrialization/recipe/materials/le_uranium/assembler/fuel_rod.json +bdd4e136cd20c406514f740783c0a266fdcae355 data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/dust.json +7a863d088c695b2cb42954b0a148f9fba7161661 data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/tiny_dust.json +7c32d903870e4515a6c0a6613abdb70a803af859 data/modern_industrialization/recipe/materials/le_uranium/craft/block_from_ingot.json +8dae4df7ae71bab6903d759266d34bc332ec7f18 data/modern_industrialization/recipe/materials/le_uranium/craft/dust_from_tiny_dust.json +bffa45aa5b379ae1a545a073e17ca53a88305663 data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_block.json +7dd20c658ed9d4820b15326b5409daea2140d4ba data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_nugget.json +1f1825614c59e68289c678771255eb95314c815b data/modern_industrialization/recipe/materials/le_uranium/craft/nugget_from_ingot.json +4873a340d58d7683aabedd28116814f057d6986d data/modern_industrialization/recipe/materials/le_uranium/craft/tiny_dust_from_dust.json +193e44c74731eac876d9d3d149931f689adfcfd0 data/modern_industrialization/recipe/materials/le_uranium/cutting_machine/main.json +206349265b57b1f06fb28553ab43f56376e8e8d0 data/modern_industrialization/recipe/materials/le_uranium/macerator/ingot.json +8038b844388bfc72bec8b16d179bbceb0b8c93e9 data/modern_industrialization/recipe/materials/le_uranium/macerator/nugget.json +5da73aeec57bf208d413cd3dd811f48ea93d5a77 data/modern_industrialization/recipe/materials/le_uranium/macerator/rod.json +344d8c8d67381cc84804a52af578d0ddfd6ac5df data/modern_industrialization/recipe/materials/le_uranium/packer/block.json +75b15724f1621f682063a923a5f5fb28b9755dfb data/modern_industrialization/recipe/materials/le_uranium/packer/dust.json +e06e73546639c3a91a7899953dd030bf0647c1c5 data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_double.json +7a7c421cb6b99813a6ea877ef9f78a2db6ed6f5c data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_quad.json +da1714c64388a74fdfdeaca6add19468f5adcc6d data/modern_industrialization/recipe/materials/le_uranium/packer/ingot.json +3c63e93605b359a408e38367a19c0a8c56ea7e83 data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json +b692a17fba87ea914ff26804c73501b0fb695b62 data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json +ce2242b12008b7e5b7be10804ed83d12e25c8260 data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json +affcde3e9ddbe313d1bad5d3eee780f0f44439c6 data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json +3d8d99ff3c1e31fc0d2777e0077c7ea41f5ea905 data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json +37b9b1d096027d7c6bb016648d40ecb58f21cb96 data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json +b706892e16b764e4f6ba528fcb1c44c02529c198 data/modern_industrialization/recipe/materials/lignite_coal/craft/dust_from_tiny_dust.json +fd7f6e4b09b49eb579b0752513d9a6780d97d32e data/modern_industrialization/recipe/materials/lignite_coal/craft/gem_from_block.json +2d4844040bc462c6a437288113243457bae7c649 data/modern_industrialization/recipe/materials/lignite_coal/craft/tiny_dust_from_dust.json +44d608b1ed6c1d5a57f132f15dc892b783136148 data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/crushed_dust_to_dust_with_tool.json +ddbfabc64494eb8a3db3a170ca04ae3bb0ec1bad data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust.json +ac11c32940e8eaad2aad10eaf6ac764673066d6d data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust_with_tool.json +be653799cf9590f096e5fdfbcb8fd7fadd65f1ea data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_dust_with_tool.json +e95ebc57b0ac0a717d877b8be94af4616b4c59fd data/modern_industrialization/recipe/materials/lignite_coal/macerator/gem.json +858db84e032fbf20268c2108f9bd28807f96a1ae data/modern_industrialization/recipe/materials/lignite_coal/macerator/ore_to_crushed.json +0a9b02862e10515148bb6d0ce429007f8419747e data/modern_industrialization/recipe/materials/lignite_coal/packer/block.json +d90c199fc8348cad709aedfd682dd5396ea3ac5e data/modern_industrialization/recipe/materials/lignite_coal/packer/dust.json +2445994603430410d1195184b17310436147e53f data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_blasting.json +9023f91da60d1047f34f7a43403afde0137ef880 data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_smelting.json +dc9bde291d07a1987d90a2ac79dced0b21901bfa data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_blasting.json +f5398258c267716f296ac4b6d22ed563f1e87c9e data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_smelting.json +89f6c8528700c62ceba989dd724a633d280e5e18 data/modern_industrialization/recipe/materials/lignite_coal/unpacker/gem.json +3a0c29419c6068c7d383de9350183c3bd883e78a data/modern_industrialization/recipe/materials/lignite_coal/unpacker/tiny_dust.json +be644daa62da786cf3fca4016bd2a628804df77e data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json +be85356a0e3749160f79854787883aa7c636ac67 data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json +396de689ace6a5355dda927146f258aedf065e05 data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json +71d8100700a564a69dfd39dcb73095df960276f4 data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json +6918e58b66563590a041758caac2581e29709d0b data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json +b48a1cf2083e21904b9329e8cb365afe44ba055e data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json +955bfb9cc07f6e39dbe5ac0c9e865a67f29d8a2d data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json +6f5f8f8f234feab7df26997b7bef41b69bf0dd24 data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json +ba8827cc18579bf4f3c80ac669b6acf9f8d8a23a data/modern_industrialization/recipe/materials/macerator/wood_pulp.json +76d18ed531520de5c311c86aef40bab80f37b3ac data/modern_industrialization/recipe/materials/manganese/craft/dust_from_tiny_dust.json +96ba6e6d9e3a15fa2f884e25153afdfdd5fd62f0 data/modern_industrialization/recipe/materials/manganese/craft/tiny_dust_from_dust.json +f517334920c033d660f47c65d8ba60f569931fd8 data/modern_industrialization/recipe/materials/manganese/packer/dust.json +fbe340be219c164d33b99de1966771e94b93e25d data/modern_industrialization/recipe/materials/manganese/unpacker/tiny_dust.json +8075d6448e0b0e97b51a2f2bb6a938652d2c75b3 data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json +374301ec73b4e0f56f3f7d80488c8f6885fbe774 data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json +72c0801177aef73b81e01b81235d8ed43d66a583 data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json +6de8a6e3414b4f0de807764594cd9892db26b3b7 data/modern_industrialization/recipe/materials/mixer/gunpowder.json +38fea81c311912abac86514de7ff4d2b6f0261d4 data/modern_industrialization/recipe/materials/mixer/itnt.json +8fc12a565257a99939767439a96fec9735fa7e21 data/modern_industrialization/recipe/materials/mixer/lubricant.json +ebb60dc04528c6fd821c78a3f2ded60a0f12e346 data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json +152d765985566547b5a69554968c2adefd51972e data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json +1d2c6858b360154a5f8bcb21b692c01e6e7a817c data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json +6ad91009acf85d4df0a6106260a34dab11a60953 data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json +96d4642cf4b5e7a50e57e389eab7d8f558ea9359 data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json +07ff66343f3c6722fa0a696a98d8b912dae25518 data/modern_industrialization/recipe/materials/monazite/craft/block_from_dust.json +482df695fec16d86aa3d0de653adf2c3fb1bb74b data/modern_industrialization/recipe/materials/monazite/craft/deepslate_to_ore.json +3d2aa745eb7266efd2b706feb0c1d364281db911 data/modern_industrialization/recipe/materials/monazite/craft/dust_from_block.json +7424367c5b0d46a157daaec98ba3dd0580a276ed data/modern_industrialization/recipe/materials/monazite/craft/dust_from_tiny_dust.json +b2b8884cfae1550916cba0ab759eb11b9022ad13 data/modern_industrialization/recipe/materials/monazite/craft/tiny_dust_from_dust.json +5e05f36e9fa511b8c192125aece9065d896ec0ca data/modern_industrialization/recipe/materials/monazite/macerator/crushed_dust.json +75780ebfb672eaee17637dbcbca4f9def31d4852 data/modern_industrialization/recipe/materials/monazite/macerator/ore_to_crushed.json +5884eb79de487576456dec27f212e2ea187ced76 data/modern_industrialization/recipe/materials/monazite/packer/block.json +b343ff78edbfcf43efd6ea769061f026b76ff9ee data/modern_industrialization/recipe/materials/monazite/packer/dust.json +500d469a7fb208895e1ca9427364094493d5a3ce data/modern_industrialization/recipe/materials/monazite/unpacker/dust.json +087cc89c91648855945ee66cdfd71766c9ea3af9 data/modern_industrialization/recipe/materials/monazite/unpacker/tiny_dust.json +15a114a61720000fe8456fc677fe88b188670b46 data/modern_industrialization/recipe/materials/neodymium/craft/block_from_dust.json +927e631f780c20f7d8579a2fb1df4d1ada1eb268 data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_block.json +1deab051c1107bac6e5a8930c718d3950d67cecd data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_tiny_dust.json +68b669173a84d9c706346a50cf28b4d8151cc6c2 data/modern_industrialization/recipe/materials/neodymium/craft/tiny_dust_from_dust.json +58ddf1e92ee470e765223561148e7aca6c4ed95a data/modern_industrialization/recipe/materials/neodymium/packer/block.json +8d7cd5c9ff05ea72043dfe0c9b78a2e9b158d2ac data/modern_industrialization/recipe/materials/neodymium/packer/dust.json +0a9174cfd9042871a543d575985d51db8fce48a4 data/modern_industrialization/recipe/materials/neodymium/unpacker/dust.json +4c93dbd6b96c02dc8106d100d7ee619bd1c7f6c3 data/modern_industrialization/recipe/materials/neodymium/unpacker/tiny_dust.json +3dc3b9da4441e4f74a30545f5362fd5b73b4d980 data/modern_industrialization/recipe/materials/nickel/compressor/double_ingot.json +5a601277cf4aad73e1c5c80d0a3a585e1f6bc582 data/modern_industrialization/recipe/materials/nickel/compressor/main.json +f67dff3b1dc6850f3aaeab3cf4042e696db73ff4 data/modern_industrialization/recipe/materials/nickel/craft/block_from_ingot.json +865b8ca4555348e3838362efa047fc5dc7d0cf8a data/modern_industrialization/recipe/materials/nickel/craft/deepslate_to_ore.json +814c9cdcf00520d476f3f1c53c3b17da9b45bca2 data/modern_industrialization/recipe/materials/nickel/craft/dust_from_tiny_dust.json +b1eee5ab453b0fd04a8f20d57b5053385235add0 data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_block.json +af0380fac43598548a06e4c867bb17796be8e9f1 data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_nugget.json +04283c1d71572126921c911ddb0e2139cdaf05cd data/modern_industrialization/recipe/materials/nickel/craft/nugget_from_ingot.json +aa1c055f82b17dba1741499590ced755f3fc3b8b data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_block_from_raw_metal.json +97b2d9a6b34a40faf719d2dfcf356bcebc23f3bd data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_from_raw_metal_block.json +eed0ff61abe15df67117a757828c04991cc07296 data/modern_industrialization/recipe/materials/nickel/craft/tiny_dust_from_dust.json +1f03aec952cbf35db7c15ec0043c22ae18a9777d data/modern_industrialization/recipe/materials/nickel/macerator/double_ingot.json +fe6ee99130d169e9ddd03831a6809350a3cc7db6 data/modern_industrialization/recipe/materials/nickel/macerator/ingot.json +5542480c87b9aa22dffaded51933c8131f1c7baa data/modern_industrialization/recipe/materials/nickel/macerator/nugget.json +121cc607f3c42d06bbfe74943c6c015881f32162 data/modern_industrialization/recipe/materials/nickel/macerator/ore_to_raw.json +60a3add56ee820d1dc51486a0fb77a56deaec266 data/modern_industrialization/recipe/materials/nickel/macerator/plate.json +cd2995eef5293b0043406dd402f7f664316a9c6a data/modern_industrialization/recipe/materials/nickel/macerator/raw_metal.json +d729357bf4ad45e4e7bc663d4be2bf8fb3a0d23a data/modern_industrialization/recipe/materials/nickel/packer/block.json +988f1f17e7c49af0abb847580c1aae8710042870 data/modern_industrialization/recipe/materials/nickel/packer/double_ingot.json +f18cd6145022bcc4d046a2526c6c3acfc5275889 data/modern_industrialization/recipe/materials/nickel/packer/dust.json +122596cd3a172abb83d0784b17ca2d6f7cb94dc6 data/modern_industrialization/recipe/materials/nickel/packer/ingot.json +bbb1ec831e40dfba492e080e08b97a910f594cb5 data/modern_industrialization/recipe/materials/nickel/packer/raw_metal_block.json +682b39f7cebd80ba4f63e91fa21a526d836990f8 data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_blasting.json +889d2348fc8ee92000c78e5565f34334a5954258 data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_smelting.json +56e77feabbded28f804534d213062ca11a9f044a data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_blasting.json +88a8bcd89ec29b0cf2005d70f8bebd2eebdbf9e6 data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_smelting.json +66762f64e3b15dae9bf610c94c98b2cc97f1e95a data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_blasting.json +9598fe7ba548c562e7ad6186d09768b30685779e data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_smelting.json +60d81bba84a95c58a61b1ff742eaa4fb47c9a74e data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_blasting.json +d3a7530ebb76c760588b81de726cb96480b85959 data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_smelting.json +22c441b8e9093994efd33d1b3864774135f1e48f data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_blasting.json +d185dc73cd92e531f67f0f65629f819cf9849a8e data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_smelting.json +d6c707f26e4108c0426bfdd88d8a721ee96daae8 data/modern_industrialization/recipe/materials/nickel/unpacker/ingot.json +972756412096292582a11ad3ce5b9f8d237352d2 data/modern_industrialization/recipe/materials/nickel/unpacker/nugget.json +b166ce768562a35f61cfdff09040104dffe09838 data/modern_industrialization/recipe/materials/nickel/unpacker/raw_metal.json +d02531563fe18a2cc413f80d837aee3d603fced2 data/modern_industrialization/recipe/materials/nickel/unpacker/tiny_dust.json +de827bce052ba06fdd6d3b5f83db08c6f3ae5b47 data/modern_industrialization/recipe/materials/nuclear_alloy/craft/large_plate.json +d873842f4d7adc12fbbaaf9de0a9cb99022930c1 data/modern_industrialization/recipe/materials/nuclear_alloy/packer/large_plate.json +27995028ee474f59412469cf40a8be74bee30a0e data/modern_industrialization/recipe/materials/packer/fire_bricks.json +9b2463828678eec2b5aa894dc1764f258be9f6f3 data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json +a36aa29efae0cf812ea052d3c11f4ee16b06b87a data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json +05782259e1f9abeb8d13ba0cc26faf9a798a0656 data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json +9ea94b61f08aebdab1f262f0f344c67d8cd283ce data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json +6417b65ac5fc47f7dccfa4dd94f62015fb4bd251 data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json +363ba2f43f3460a24d20c0781a4652b33a3de6ff data/modern_industrialization/recipe/materials/platinum/blast_furnace/dust.json +945d12afee955578eed11cf0704d0c2052e4af6f data/modern_industrialization/recipe/materials/platinum/compressor/double_ingot.json +843197767b313e86281b10d7a1fd041178927b03 data/modern_industrialization/recipe/materials/platinum/compressor/main.json +ccc00e132cd208aa92300fe1afafd18f12d2b49a data/modern_industrialization/recipe/materials/platinum/craft/block_from_ingot.json +ff72e6f143f8816db4d261acf9339f02c9d0f569 data/modern_industrialization/recipe/materials/platinum/craft/cable.json +7fcf6d0c87480d576521f03b398e409d2ce7a7f4 data/modern_industrialization/recipe/materials/platinum/craft/dust_from_tiny_dust.json +dc61eed1de4ec1595769c15dbe266605a055925b data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_block.json +448707a2179b66a51e945983713f44743bd99a55 data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_nugget.json +802ca1e809cdb9958a2d6679430953d26c2de710 data/modern_industrialization/recipe/materials/platinum/craft/nugget_from_ingot.json +ef2d6d45209b96c99dbe0614627340363b327301 data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_block_from_raw_metal.json +e9adeacc3a56b011341ea869e1d0b1bcf3ab3710 data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_from_raw_metal_block.json +60f9e660a51d33135249d734f16eca76dc89597f data/modern_industrialization/recipe/materials/platinum/craft/tiny_dust_from_dust.json +aed945d7b193c55fe732501ffea542a4f5fab724 data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json +9716d9abf74068ed403141deefe46d9c83adb305 data/modern_industrialization/recipe/materials/platinum/macerator/double_ingot.json +1ea7e394d5e8db3b17cec1ec412fa87a19591d52 data/modern_industrialization/recipe/materials/platinum/macerator/ingot.json +b77a0f3a54a065229881f2a57fa70f27f60913a8 data/modern_industrialization/recipe/materials/platinum/macerator/nugget.json +de4817b2e9da4fcb24e857f86cc974dd301abd7b data/modern_industrialization/recipe/materials/platinum/macerator/ore_to_raw.json +bb8447d7da170881f6790ce3a7f3f1464bb99d0f data/modern_industrialization/recipe/materials/platinum/macerator/plate.json +8a8a1ebcfe8bb8a0d3fc062a9b59fc09cfd38c47 data/modern_industrialization/recipe/materials/platinum/macerator/wire.json +0d336f3a5481dc7f360c31f33ec9513f11f6044c data/modern_industrialization/recipe/materials/platinum/packer/block.json +eab995f630e5f28ab4d1707e6956153f1f4a667d data/modern_industrialization/recipe/materials/platinum/packer/cable.json +27662c98cbd8bbbf23b93aaab1d397cee26e7000 data/modern_industrialization/recipe/materials/platinum/packer/double_ingot.json +d1025208503ef3a66d6f02fc694ca747b4f4b1cc data/modern_industrialization/recipe/materials/platinum/packer/dust.json +05bb413b6330f50bdafb456d23b468e2e730d58a data/modern_industrialization/recipe/materials/platinum/packer/ingot.json +e0a10e1ef9c2089795c1b1ed46c251e970beb516 data/modern_industrialization/recipe/materials/platinum/packer/raw_metal_block.json +42075a261de5dc491374ff72252347d932aab9f7 data/modern_industrialization/recipe/materials/platinum/unpacker/ingot.json +2efb7fe29b73da74b50e69d51f79892586f7db68 data/modern_industrialization/recipe/materials/platinum/unpacker/nugget.json +ad7e2cd8b2d977e4acc35e86f857cc619dffc406 data/modern_industrialization/recipe/materials/platinum/unpacker/raw_metal.json +f64c7c3dd6865d468191eb6d475643c645facd9b data/modern_industrialization/recipe/materials/platinum/unpacker/tiny_dust.json +cf76f713c63a235c4bc3427000310287c169d232 data/modern_industrialization/recipe/materials/platinum/vacuum_freezer/hot_ingot.json +b6c80bff921353b2359d288ebe5fd06886388857 data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json +7048730b23a0aff5ad070c316a3189d2c11a4448 data/modern_industrialization/recipe/materials/platinum/wiremill/wire.json +6d05622b96a371dcae98c190fa5b334b5f656dfd data/modern_industrialization/recipe/materials/plutonium/blast_furnace/dust.json +1e797217e8b045d30ae9f363c45c402557e6237f data/modern_industrialization/recipe/materials/plutonium/blast_furnace/tiny_dust.json +b91f8851f260bcd84b8c7218b44bc4666ede5c5d data/modern_industrialization/recipe/materials/plutonium/craft/block_from_ingot.json +29180cd6414b0e9dd19b69b6278ce3a3c4ac696e data/modern_industrialization/recipe/materials/plutonium/craft/dust_from_tiny_dust.json +97e17e9d740277e11662c974c72e942da655dcbd data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_block.json +50ffa9ef0fbaebe6e40b9f1711821e0b07f4a4a5 data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_nugget.json +c1176faab6c6e61935d87d47310d3650a01144f9 data/modern_industrialization/recipe/materials/plutonium/craft/nugget_from_ingot.json +b43e6bf28bdbc08f7914aeabe95719fad523c85c data/modern_industrialization/recipe/materials/plutonium/craft/tiny_dust_from_dust.json +3b7113d04743a4a2669615accb3d46fd58c61467 data/modern_industrialization/recipe/materials/plutonium/macerator/ingot.json +1dd5e065c254fe30a21acf404cc616a6cd495a34 data/modern_industrialization/recipe/materials/plutonium/macerator/nugget.json +8feeb79223599092a3cdd144b7e236eaa2b6d6d1 data/modern_industrialization/recipe/materials/plutonium/packer/block.json +fcb80701c238e6e5161815a86cd6c84ea2a91519 data/modern_industrialization/recipe/materials/plutonium/packer/dust.json +d34f284c1bd1e2e515a52f188d6b794d20f4727a data/modern_industrialization/recipe/materials/plutonium/packer/ingot.json +d51ec7c01f3b884a085c682e315d6e7405db254b data/modern_industrialization/recipe/materials/plutonium/unpacker/ingot.json +61880f0c3eee9032ff057f9ef2fff0f72f565978 data/modern_industrialization/recipe/materials/plutonium/unpacker/nugget.json +e628749e755941e4b0c5e41e2754325fbef91340 data/modern_industrialization/recipe/materials/plutonium/unpacker/tiny_dust.json +a22836aefc23163b0ecdcd22ab01da05eb31a39b data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json +8778666c393f2364e583922fb181cdf9ab7946be data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json +f77dfe0d7f5ff89f61821beeede76b8e6167055b data/modern_industrialization/recipe/materials/pressurizer/down/steam.json +b1de4ab1753f1b3b476627f33ce7e170685e9320 data/modern_industrialization/recipe/materials/pressurizer/down/water.json +71d9e555e07a743d14b664b8ff7bd53d6d98a3b0 data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json +a6a0d7441cc0eb807d80ce8708d972ac470db1d6 data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json +7d9ac7bba9af9355f04d138fe24ae6f4e9d27b38 data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json +c14809a14bb7e1e62ef656084fa85cf72d67af75 data/modern_industrialization/recipe/materials/pressurizer/up/steam.json +9cdbdda3924fc1e49c476d5656f6a7976aa22276 data/modern_industrialization/recipe/materials/pressurizer/up/water.json +640ee6e4ad356ad1e190b16b4a14b85d1c3c47bf data/modern_industrialization/recipe/materials/quartz/compressor/quartz.json +7faee25716987b42dddba2f1916211877a5f7e8a data/modern_industrialization/recipe/materials/quartz/craft/dust_from_tiny_dust.json +da216a416181fce5083ba652e083bbd20a5af8c2 data/modern_industrialization/recipe/materials/quartz/craft/tiny_dust_from_dust.json +f9852ddbf2cd907dbb7375370e2cc7fb5068c06d data/modern_industrialization/recipe/materials/quartz/macerator/crushed_dust.json +ef596459dd13fb6f126b37126f2edf4d4387bfc5 data/modern_industrialization/recipe/materials/quartz/macerator/gem.json +258a7b41e968471b1d5be6e231d99e9afa78a58b data/modern_industrialization/recipe/materials/quartz/packer/dust.json +67b5dc8b6c1b98fd301acdd48901be4afd8b4b0c data/modern_industrialization/recipe/materials/quartz/unpacker/tiny_dust.json +ed462b177e3aad19d281ebdd23566a8a3e4a45d6 data/modern_industrialization/recipe/materials/redstone/craft/deepslate_to_ore.json +8f8b9524c3821f34343c64669b23c96079e01fcc data/modern_industrialization/recipe/materials/redstone/craft/dust_from_tiny_dust.json +5e8fdb7ae01a640caae6014b562166647a52cb1a data/modern_industrialization/recipe/materials/redstone/craft/tiny_dust_from_dust.json +609be4637017bfee74f268e7a2ba04659b56cd58 data/modern_industrialization/recipe/materials/redstone/macerator/crushed_dust.json +67579030b17eef728dccfae30892b747ca8a37e5 data/modern_industrialization/recipe/materials/redstone/packer/block.json +c50ac5424b8f728ed82c975894ab619a78b60220 data/modern_industrialization/recipe/materials/redstone/packer/dust.json +d15efc0d3a493a47b81555a122fd329b502c3034 data/modern_industrialization/recipe/materials/redstone/unpacker/dust.json +38538db2f0e4a15d87597af2efba8e1fce18f7bc data/modern_industrialization/recipe/materials/redstone/unpacker/tiny_dust.json +e438eac2539d1af76a9a6d83f1c96157bf501552 data/modern_industrialization/recipe/materials/ruby/craft/dust_from_tiny_dust.json +e43e5d3cd5b30dfb768566e70da47a8fbee42e47 data/modern_industrialization/recipe/materials/ruby/craft/tiny_dust_from_dust.json +512b211ac0cbf47bc7705eef0458b9f1094baeaf data/modern_industrialization/recipe/materials/ruby/packer/dust.json +f3a24dd98016e78866ae93d01963105176b81db3 data/modern_industrialization/recipe/materials/ruby/unpacker/tiny_dust.json +7a16880870b2a69140667d80fcf3a57d31863968 data/modern_industrialization/recipe/materials/salt/craft/block_from_dust.json +90c6de59e9d2d3fa3ee17962a83a1a6b9d8fe50c data/modern_industrialization/recipe/materials/salt/craft/deepslate_to_ore.json +c6af8e0a4824890b996fba6a5f2c14a5b9ee4238 data/modern_industrialization/recipe/materials/salt/craft/dust_from_block.json +a762665b8100682f2b7327341fd2c428f48ab09a data/modern_industrialization/recipe/materials/salt/craft/dust_from_tiny_dust.json +104f717a76cabe6b84eba58a49f764620fbae4b6 data/modern_industrialization/recipe/materials/salt/craft/tiny_dust_from_dust.json +b0a486ce73d54e3bb32a644beb45718bfded2458 data/modern_industrialization/recipe/materials/salt/macerator/crushed_dust.json +72f6ff00a57aedd801b2040f0f9133fc2d421b0e data/modern_industrialization/recipe/materials/salt/macerator/ore_to_crushed.json +d5e289bc392849e76c8bd2e8e85383618f4e3332 data/modern_industrialization/recipe/materials/salt/packer/block.json +55e1046815adb8c09e3d5971226782b92845d6f6 data/modern_industrialization/recipe/materials/salt/packer/dust.json +7511fc9ab048b93b73871bd9f38c945e99a48e6a data/modern_industrialization/recipe/materials/salt/unpacker/dust.json +c4cb8d581232562a3e5dbd0bd144948dfd8ac763 data/modern_industrialization/recipe/materials/salt/unpacker/tiny_dust.json +16652028d7dac4917fdabcbe1e3d646d49d26e78 data/modern_industrialization/recipe/materials/silicon/compressor/double_ingot.json +dc070c4f7abe53c96515aa079310ca0c81a992f0 data/modern_industrialization/recipe/materials/silicon/compressor/main.json +abecfc4993ec304080168ddae54e904ed70c98ac data/modern_industrialization/recipe/materials/silicon/craft/block_from_ingot.json +2abe28e12e99ac41e5d7779095ebb92ba92fa656 data/modern_industrialization/recipe/materials/silicon/craft/dust_from_tiny_dust.json +c857bba346525763629112141a28186f00babfb9 data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_block.json +76fd0b43a8b377c7f5ff94a843b763720dcb6e3c data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_nugget.json +0e9dedcab7f33e7b3d260ee8e20269e1ab74a13a data/modern_industrialization/recipe/materials/silicon/craft/nugget_from_ingot.json +fdd6b29c4b96546f483cebaba2715f4f2bbcec44 data/modern_industrialization/recipe/materials/silicon/craft/tiny_dust_from_dust.json +1b9f559b214318dd338435115b1c037db662e069 data/modern_industrialization/recipe/materials/silicon/macerator/double_ingot.json +4bef3314fdfefcf6e0b6f0ac8af211dc220d88fc data/modern_industrialization/recipe/materials/silicon/macerator/ingot.json +6c17a948bb71ad8d51954706847c447afbf4dab1 data/modern_industrialization/recipe/materials/silicon/macerator/nugget.json +98546dbc977f9e395f3e24943255b0c292c8afd1 data/modern_industrialization/recipe/materials/silicon/macerator/plate.json +4534501283d600b74599d5dbd303ffc48c308dfb data/modern_industrialization/recipe/materials/silicon/packer/block.json +3774e1ee7a88004a4985841414df960da66134e2 data/modern_industrialization/recipe/materials/silicon/packer/double_ingot.json +7970d5f88a62b69a6884e1b10bde97a2b66182f6 data/modern_industrialization/recipe/materials/silicon/packer/dust.json +efc6e19b23824e92b667ee91fe4408d042f4625a data/modern_industrialization/recipe/materials/silicon/packer/ingot.json +9abce34bad5492e7d719383a9c27d8a8087c2470 data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_blasting.json +2b82747191dd73a837d38ef004846acb535bbfb5 data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_smelting.json +25554de7602fff9dd69a31461b7d8aca7f462649 data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_blasting.json +48621b90e83854c5aa48d2c3b51dfef181f0412c data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_smelting.json +d902d51048728e78ba74591ef473403e4361957a data/modern_industrialization/recipe/materials/silicon/unpacker/ingot.json +2768ec920892bdd181bd2dc07bf1976eb677d3fc data/modern_industrialization/recipe/materials/silicon/unpacker/nugget.json +751a4a87a065c675d0b1ec3c01642e982da4b2a5 data/modern_industrialization/recipe/materials/silicon/unpacker/tiny_dust.json +27eca9abb430136f36e2bc0e52c19b8826700f61 data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json +cc9478ff72bca7977a044fe5b1bf17ac5f9ae1cb data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json +68002435d58f480686b0e2970bf5b6922bddc8e9 data/modern_industrialization/recipe/materials/silver/compressor/double_ingot.json +da565b227229f2131c49ba2f0bd18b25c34144dd data/modern_industrialization/recipe/materials/silver/compressor/main.json +0ca43bba10c4df1a40577892746d390c17634246 data/modern_industrialization/recipe/materials/silver/craft/block_from_ingot.json +824e065904d6ca084d50e2e3d98b6bb95da1030e data/modern_industrialization/recipe/materials/silver/craft/cable.json +1362268c24c35127fa55a784f0798e0bff49efef data/modern_industrialization/recipe/materials/silver/craft/dust_from_tiny_dust.json +f1a22ba0775a35f4b5397d0b05bb634585606980 data/modern_industrialization/recipe/materials/silver/craft/ingot_from_block.json +0a6ebc280d64418811dc19b9b9294d335199f956 data/modern_industrialization/recipe/materials/silver/craft/ingot_from_nugget.json +0c4323fa1a96c09b47583e053b522ba344b27ed5 data/modern_industrialization/recipe/materials/silver/craft/nugget_from_ingot.json +aea70aefe8c2993d3658cf8a5d137bb8c1a59f41 data/modern_industrialization/recipe/materials/silver/craft/raw_metal_block_from_raw_metal.json +9b8986c77b74f8efa8877fcac40d55e91c062b17 data/modern_industrialization/recipe/materials/silver/craft/raw_metal_from_raw_metal_block.json +5aba5782d2f02aad246a3dfec47b84571b82657a data/modern_industrialization/recipe/materials/silver/craft/tiny_dust_from_dust.json +b07ca2d364b6912a4eea5315809de2540399b57b data/modern_industrialization/recipe/materials/silver/macerator/double_ingot.json +52cde0cf06ad50c92816c00c8065c84afdcc1923 data/modern_industrialization/recipe/materials/silver/macerator/ingot.json +2cacbba98397c1452c4b4f0b7dc85175aee07d6c data/modern_industrialization/recipe/materials/silver/macerator/nugget.json +37290273278cdf5007d52fa701ead768f59f01aa data/modern_industrialization/recipe/materials/silver/macerator/plate.json +bd34a126243be1158bdf91e5ff2e19857bdc17fe data/modern_industrialization/recipe/materials/silver/macerator/raw_metal.json +ec4555acbca98d8dd48148d6cd8bf1c8a5897db0 data/modern_industrialization/recipe/materials/silver/macerator/wire.json +a5d99b2746607327ad7070e06c0c795afda337bb data/modern_industrialization/recipe/materials/silver/packer/block.json +29e97ad97ffad49221feace7ba8d40332e41633e data/modern_industrialization/recipe/materials/silver/packer/cable.json +bee4e62df51eab0f143cca26ef90b3bef177e115 data/modern_industrialization/recipe/materials/silver/packer/double_ingot.json +f44a92383f374b1165fd3c2ef0486f321edbe997 data/modern_industrialization/recipe/materials/silver/packer/dust.json +7c9b6954086c73ab2e185ac6b8a51a093eaff983 data/modern_industrialization/recipe/materials/silver/packer/ingot.json +d3809b3269cca8d84d7dd073624e3e9881e16e42 data/modern_industrialization/recipe/materials/silver/packer/raw_metal_block.json +3ea831040f0cca09426b771b374953ff4b6159e5 data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_blasting.json +d3bcff98acac7a6ac47339dae52d031f9d81fe4f data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_smelting.json +e883ea6afd49b1570d95d13f58df40a2441d23f5 data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_blasting.json +4690e36e39ec8d0c4779b5e3fd81c53abbfb6ae4 data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_smelting.json +fb3463e614119d0c48872796be6c5873adb4d087 data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_blasting.json +9716d91f90346114bb996a9cd80e61b8d1551bc7 data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_smelting.json +a01158acc25b84911c669de08effcaa6b41f499a data/modern_industrialization/recipe/materials/silver/unpacker/ingot.json +b5946e228edc7fe5912b5e43a5503c8f0b21efc2 data/modern_industrialization/recipe/materials/silver/unpacker/nugget.json +a8f314bcdf5c20c44c270b60ed751fa248727eb8 data/modern_industrialization/recipe/materials/silver/unpacker/raw_metal.json +65d2eeba17ae98c86b5bc55e499ffeddd07bfb09 data/modern_industrialization/recipe/materials/silver/unpacker/tiny_dust.json +610821f4682647961c2167d02838eff8c3be3251 data/modern_industrialization/recipe/materials/silver/wiremill/wire.json +4be1aeffaf18f5a7944f040a2fd88689bca22f6e data/modern_industrialization/recipe/materials/sodium/craft/block_from_dust.json +7066a59d32dce2210e94299bf6f99a4192e02e24 data/modern_industrialization/recipe/materials/sodium/craft/dust_from_block.json +18b838e7ffd3d75b579c0b3ada5f79125971380c data/modern_industrialization/recipe/materials/sodium/craft/dust_from_tiny_dust.json +4b5e73cbafb63d8a4e83683b2bae81729a2f17b7 data/modern_industrialization/recipe/materials/sodium/craft/tiny_dust_from_dust.json +d3a0af0b1669ca9c664b3c91ff08600abc49219c data/modern_industrialization/recipe/materials/sodium/packer/block.json +c386836d0568dac499aa275ba7a3499761d52b1c data/modern_industrialization/recipe/materials/sodium/packer/dust.json +902abccb5298d6037ebec307f971d3524446abd4 data/modern_industrialization/recipe/materials/sodium/unpacker/dust.json +d7112c0bd030aa31faaa884e3a3647fd5c99b91c data/modern_industrialization/recipe/materials/sodium/unpacker/tiny_dust.json +e4d4361a028734ea9137864fcb4e5d341488da9d data/modern_industrialization/recipe/materials/soldering_alloy/craft/block_from_dust.json +6996f902c00c5be0c12f0e7659b3a0298ddc0469 data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_block.json +87ba7ef12360357b6c9b8d6af04043042738529a data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_tiny_dust.json +c866a42ec7ec4a2c70e6c74e4531ad6249ba1a2b data/modern_industrialization/recipe/materials/soldering_alloy/craft/tiny_dust_from_dust.json +17e6f6b9cd6e3ad0e03b77b2622e33dca5825346 data/modern_industrialization/recipe/materials/soldering_alloy/packer/block.json +6735e8c3fafce6b4c8ee60b151b5e7e0cb5ca5ac data/modern_industrialization/recipe/materials/soldering_alloy/packer/dust.json +fb97610d5892bf3bffb8981793c978f93b5e171a data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/dust.json +e65c35c3e78d4d60e3082c9fe585e6fc765e8ad0 data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/tiny_dust.json +0fc0960f3b62299e3a99f994cdf5a5a8c6bb630e data/modern_industrialization/recipe/materials/stainless_steel/assembler/barrel.json +ef0cc842b01ee2b015a58c162c9d7db3b1b244f6 data/modern_industrialization/recipe/materials/stainless_steel/assembler/drill_head.json +539ccb121058b51764d2968a2dbe5776dd6d8c57 data/modern_industrialization/recipe/materials/stainless_steel/assembler/gear.json +b39236318e6872414f6b767f2080912535d8776a data/modern_industrialization/recipe/materials/stainless_steel/assembler/rotor.json +8110a9605ac11d4f19012687fe58669368bdcafe data/modern_industrialization/recipe/materials/stainless_steel/assembler/tank.json +312ba31f4b38f5b776512f0447c2df58f8b0c1bc data/modern_industrialization/recipe/materials/stainless_steel/blast_furnace/dust.json +f875b71783d9b2f7c19cfb797e25f04df0a9c55f data/modern_industrialization/recipe/materials/stainless_steel/compressor/double_ingot.json +c540b99ada0ac0e725e7875eef38a66f5fb8ae3c data/modern_industrialization/recipe/materials/stainless_steel/compressor/main.json +69743658e11782ef6d1c5ca064ce60e88b4343fa data/modern_industrialization/recipe/materials/stainless_steel/compressor/plate.json +0a0957457f8e54cbbe8f31f3265d65db5d9c327c data/modern_industrialization/recipe/materials/stainless_steel/compressor/ring.json +751a7228c70e0ed7c17448f14d8ce673fdf1c8cb data/modern_industrialization/recipe/materials/stainless_steel/craft/barrel.json +d49a2eda78836d129442bd1a13253f2ffbd59296 data/modern_industrialization/recipe/materials/stainless_steel/craft/blade.json +006161629ed545254c7e380b3c796e810b601fa6 data/modern_industrialization/recipe/materials/stainless_steel/craft/block_from_ingot.json +3e0457fd75dc72bd42788ce08902128465b37a98 data/modern_industrialization/recipe/materials/stainless_steel/craft/drill_head.json +a2af8056296215574da66bbdb113be6b861c28da data/modern_industrialization/recipe/materials/stainless_steel/craft/dust_from_tiny_dust.json +c698cbaf3399f6f4cf78ce92071500880e629508 data/modern_industrialization/recipe/materials/stainless_steel/craft/gear.json +6e652e938cfcb35a26da4e1acee6146118cb8888 data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_block.json +e69d569db225fe2a667e60b3f2645041854655ff data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_nugget.json +a5aade890b16a3d23ac080af741bf63e09760a06 data/modern_industrialization/recipe/materials/stainless_steel/craft/large_plate.json +969b35433c77f1a0551a1b56aeb8e88b77c79589 data/modern_industrialization/recipe/materials/stainless_steel/craft/nugget_from_ingot.json +d640f24664d7992ab2678143ed951a88b096513c data/modern_industrialization/recipe/materials/stainless_steel/craft/ring.json +c5439c9c2e8a07c6c65e67b44d795e04562c78f1 data/modern_industrialization/recipe/materials/stainless_steel/craft/rotor.json +cbf04320cf99c1fae3a07e6c800d88bd3874dbb4 data/modern_industrialization/recipe/materials/stainless_steel/craft/tank.json +eb77178cb6408168888da235d6b9cc6bd03442aa data/modern_industrialization/recipe/materials/stainless_steel/craft/tiny_dust_from_dust.json +b2cf746fd213dc79accc3fffa9fbb42099811341 data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/double_ingot.json +32940906ed21c533509ee550e9e01b298ba290b5 data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/main.json +43a30789ff07cdfe240bb314b3128a89d8575f6f data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/rod.json +d0f038f61c8dd85b93a0b6d1a4017761573a4625 data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json +be50396881dfd7af437f649d35dfd96eba7ff6be data/modern_industrialization/recipe/materials/stainless_steel/macerator/blade.json +c53c84033633d4ae9818d2b7c3923e9cd23366a0 data/modern_industrialization/recipe/materials/stainless_steel/macerator/bolt.json +0799aac57eb5f0d5bf3a800b71339132423482ea data/modern_industrialization/recipe/materials/stainless_steel/macerator/curved_plate.json +2e096ff49be0995f12ba2e9e6be4b5b43a12f2c5 data/modern_industrialization/recipe/materials/stainless_steel/macerator/double_ingot.json +42987b5498ec007837e2752da4c315d7f4a2c8a4 data/modern_industrialization/recipe/materials/stainless_steel/macerator/drill_head.json +4a32a589855979eb807d704e632fcda1a74c8b31 data/modern_industrialization/recipe/materials/stainless_steel/macerator/gear.json +7bd9a3db8cdb0ef9913309e192d0127501a28338 data/modern_industrialization/recipe/materials/stainless_steel/macerator/ingot.json +a9b0885d9c2679eaebd2dd27e7dd096fa9e215cc data/modern_industrialization/recipe/materials/stainless_steel/macerator/large_plate.json +44f804d772b1f516ada05d37e54ebfa4c7589101 data/modern_industrialization/recipe/materials/stainless_steel/macerator/nugget.json +691b5fa053ec76f2d64dc7e62984230496e739aa data/modern_industrialization/recipe/materials/stainless_steel/macerator/plate.json +789a5807fc3c371f774a23054affbc0ea98f4306 data/modern_industrialization/recipe/materials/stainless_steel/macerator/ring.json +56ac7b2714f12b03dc51679f0223b652fbdc9e1f data/modern_industrialization/recipe/materials/stainless_steel/macerator/rod.json +98bc0392ed4ad66b3c50f274deaf758d91de3c8e data/modern_industrialization/recipe/materials/stainless_steel/macerator/rotor.json +17ce09cf0b91f1e75ffa9e01a666af10421ab681 data/modern_industrialization/recipe/materials/stainless_steel/packer/blade.json +60c3196b55a7ed233483bce119113655aa3ecc25 data/modern_industrialization/recipe/materials/stainless_steel/packer/block.json +b4eb948cee4a51db752464e2412eaf6421d42adb data/modern_industrialization/recipe/materials/stainless_steel/packer/double_ingot.json +954589c547cfc7364de24a69f1b5ceecedd9d192 data/modern_industrialization/recipe/materials/stainless_steel/packer/dust.json +84e8ef0e30f1435b1ee7c5a0d1052adb26140ddf data/modern_industrialization/recipe/materials/stainless_steel/packer/ingot.json +8d8220d7512f1e9ad7bd6b43a2292e9a9295b00d data/modern_industrialization/recipe/materials/stainless_steel/packer/large_plate.json +5e9fa1ba58f70f6314fb337e7ed324e0ccc00eda data/modern_industrialization/recipe/materials/stainless_steel/smelting/rod_magnetic_to_rod_smelting.json +f1e4189eed6778827763faf34ee2c30d00f69e61 data/modern_industrialization/recipe/materials/stainless_steel/unpacker/ingot.json +d138396536bbcbc9c99d45bc6351bc8de198a22a data/modern_industrialization/recipe/materials/stainless_steel/unpacker/nugget.json +0d8dc1cc5c36e9575cbcb786660e336be09e0f00 data/modern_industrialization/recipe/materials/stainless_steel/unpacker/tiny_dust.json +9bcf29771335521007d7873f9813706170acee13 data/modern_industrialization/recipe/materials/stainless_steel/vacuum_freezer/hot_ingot.json +45eaecac95838b8d2fa9de5e09d613eb2cd84152 data/modern_industrialization/recipe/materials/steel/assembler/barrel.json +024156615bc0db66ea64f03dae04da0059d66294 data/modern_industrialization/recipe/materials/steel/assembler/drill_head.json +3760cfbbf522e836878869e9c81f9d47674f5e30 data/modern_industrialization/recipe/materials/steel/assembler/gear.json +87d76f173382636c8ef15e98d95892ebde45992a data/modern_industrialization/recipe/materials/steel/assembler/tank.json +cf95d7d46e369650e7026a27d9b620577af679c3 data/modern_industrialization/recipe/materials/steel/compressor/double_ingot.json +05c56dd64801f7afba48f91e7dd61cc58557d6a9 data/modern_industrialization/recipe/materials/steel/compressor/main.json +95dad8ee4c1a3fd2f334fb5356346ca2cda466b3 data/modern_industrialization/recipe/materials/steel/compressor/plate.json +ad18b8d11644bc7b3bff84c931084cdb92501bb6 data/modern_industrialization/recipe/materials/steel/compressor/ring.json +937f616e3a998bd688903dec9419672f256b28cb data/modern_industrialization/recipe/materials/steel/craft/barrel.json +80fd24ca0bbf1725954c47d78a8e8d64512ca40a data/modern_industrialization/recipe/materials/steel/craft/block_from_ingot.json +f49bc1ee788908343bc115bb6f13f060bf94b4d2 data/modern_industrialization/recipe/materials/steel/craft/drill_head.json +8ccb766c8c5220fe4ea47e926071ca16aeb96629 data/modern_industrialization/recipe/materials/steel/craft/dust_from_tiny_dust.json +49456d0e560e9d8c7b95c043d5f936922313b5ac data/modern_industrialization/recipe/materials/steel/craft/gear.json +3ef4fa559e93c19d7f7676b75f5d7f2bbdb3dff2 data/modern_industrialization/recipe/materials/steel/craft/hammer.json +819f4cfd24f6f4b556dc59a0e554fe12f9822b64 data/modern_industrialization/recipe/materials/steel/craft/ingot_from_block.json +1bb151fc2d82ad57779991b6f821df4d2dd701c7 data/modern_industrialization/recipe/materials/steel/craft/ingot_from_nugget.json +38f25be7ad8e3a5bc7328e873055837046c099ff data/modern_industrialization/recipe/materials/steel/craft/large_plate.json +f862f7389259b389433db918c3d829be56a3b6ad data/modern_industrialization/recipe/materials/steel/craft/nugget_from_ingot.json +17c9cb8e0357eddbcd44f1d6403de074d0d13ab3 data/modern_industrialization/recipe/materials/steel/craft/ring.json +209eb0cbb4fd686f9ade04d89646ef5a71f171e9 data/modern_industrialization/recipe/materials/steel/craft/tank.json +1eaa72755baf6e0828d6ab5474208b2fd9d9dc9a data/modern_industrialization/recipe/materials/steel/craft/tiny_dust_from_dust.json +941f1f586a867408c08c9f09d1d196fed9c8cf30 data/modern_industrialization/recipe/materials/steel/cutting_machine/double_ingot.json +2ee0a190962542faf6e31bcd73e92aa8d084e2af data/modern_industrialization/recipe/materials/steel/cutting_machine/main.json +a0c746c668ad4cccf7a5e062fbea13d6320dd18a data/modern_industrialization/recipe/materials/steel/cutting_machine/rod.json +d56f9deb594ab4be10f2dc9f399b4177f19ae5e8 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt.json +72f4c33bad4c0e93ca89d3ab8fa9b71092213696 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt_with_tool.json +7b094753d9413e1310e07084976f5b7ed66bb97f data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate.json +81bb34cfe4da3bb2e4d9d453a7838137a4e27aa7 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate_with_tool.json +9c6eaee4b83129ab6967a3c0b6d16cf4e356e8cf data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate.json +e32a9cd1b96a0747673b499323a849024e862b27 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate_with_tool.json +edd9f429aa087f193157f2ff912126f76629631d data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring.json +5c12c81a1bc699abe253e9a9b0c2e671272ce266 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring_with_tool.json +b45c54ae00622084d8c85039920e27036d09fab7 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod.json +beab975871b251cc70aad8242a9112395a68f772 data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod_with_tool.json +85425748de1a2a516ee26065a3fe7baeb5c02833 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt.json +782775b8b7bfe0cf531f47fcd8e27928808ec340 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt_with_tool.json +ea2c247604e38df0cefa4f132d0cdde0ccb3e19b data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate.json +761b52316541a9354403e6a9e94d8a3306327264 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate_with_tool.json +12bd2fc6bbde875b501b7499b6d901bac6a27314 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_double_ingot.json +3ec164eefbe44aee335d1c5a8d42dcfc26fa352f data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_dust.json +043086974f81f12d2e05573cab7df34dd00d0d1f data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate.json +5642d015d9fd8168d2b6bc6ab648782f1e422bc6 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate_with_tool.json +e92fdef6986d54017a66a692da0d3c1e52a53acb data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring.json +b1984ca3fa4356e835d0df8fb5582a311667a95b data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring_with_tool.json +d60612d6872afa0a61ab24da395e913f0eff83f0 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod.json +cfdaeb4d0418fd647ae753d181bd24409500fd93 data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod_with_tool.json +9bbc888e69404bebb6de32ada79a6aa01fd31a86 data/modern_industrialization/recipe/materials/steel/forge_hammer/nugget_to_tiny_dust.json +a9fa968ed389fe41174d1bc832628ccee452fd1e data/modern_industrialization/recipe/materials/steel/forge_hammer/plate_to_curved_plate_with_tool.json +4360118586b844eac55ef9f0304e0835b7a7b60a data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_bolt_with_tool.json +2f9c47f3d3fc787f8d540f6f6449157051b794ef data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_ring_with_tool.json +808682b7f2e366a2ce6a3d527815a7ae5c511d2e data/modern_industrialization/recipe/materials/steel/macerator/bolt.json +5cf361d100f223018245d3599c34a701fdbb68dc data/modern_industrialization/recipe/materials/steel/macerator/curved_plate.json +50777db74c3b76e26790b57dfcd0e9d206dcb83b data/modern_industrialization/recipe/materials/steel/macerator/double_ingot.json +cc7eb4fabfe492fffbc2576c2b1b16284ad46a6e data/modern_industrialization/recipe/materials/steel/macerator/drill_head.json +cf950fe6687af3f5f0e7df9620d1b2450aec3d38 data/modern_industrialization/recipe/materials/steel/macerator/gear.json +ec9f3fa0c6bbf4a6974f4274601b721b7bebad00 data/modern_industrialization/recipe/materials/steel/macerator/ingot.json +fdb429614365b80ecdcdb5af81e6bb2f0ad63fd3 data/modern_industrialization/recipe/materials/steel/macerator/large_plate.json +641f49b21ea780bb189cd1cf880164d73ba81ebb data/modern_industrialization/recipe/materials/steel/macerator/nugget.json +b5d2ff23d262a059128742017e73b16029e94669 data/modern_industrialization/recipe/materials/steel/macerator/plate.json +3669a0ee2feae9b1715b9d97509172f35a0b0796 data/modern_industrialization/recipe/materials/steel/macerator/ring.json +4157eb0389520a1c579632f45eca70923742c849 data/modern_industrialization/recipe/materials/steel/macerator/rod.json +b0dc2b2d9af794d76482419b3a946c3ec945c716 data/modern_industrialization/recipe/materials/steel/packer/block.json +72231f7700808b3f4c257118ed36178ecc8baa86 data/modern_industrialization/recipe/materials/steel/packer/double_ingot.json +1d6b5409288a2defe5d9c1adeb8dfa226aec9733 data/modern_industrialization/recipe/materials/steel/packer/dust.json +cd7114b0cc120b55a7f2ba99975bf87e63a3689e data/modern_industrialization/recipe/materials/steel/packer/ingot.json +d5b4b39c339cbf25313553c56250b4634d0ee396 data/modern_industrialization/recipe/materials/steel/packer/large_plate.json +52f5eeea7ac4429e5f0f97e53c830b9966d84832 data/modern_industrialization/recipe/materials/steel/polarizer/rod_magnetic.json +e883bdb9d11fd18dd7bf451f19bc6bc78383cb50 data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_blasting.json +ef35fcdbda8d9ecf3e56df9b7b1d2a501876d192 data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_smelting.json +28c600fc975cbde1e5a54195ad206bc3d1e54087 data/modern_industrialization/recipe/materials/steel/smelting/rod_magnetic_to_rod_smelting.json +b37f5846498325a06be2fe07c75a29521ad49d12 data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_blasting.json +c20f115be45ce1701713b8ae7be9dd6b290ed1f1 data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_smelting.json +1a94b445e3ae49c1c026a80d535b9ff28d756692 data/modern_industrialization/recipe/materials/steel/unpacker/ingot.json +e1a82d70a2ef6697d591ec2e3a610f5f37169dd5 data/modern_industrialization/recipe/materials/steel/unpacker/nugget.json +6dd77fcfc4082df4d4041f6625c861ca56dfb064 data/modern_industrialization/recipe/materials/steel/unpacker/tiny_dust.json +ff92cc8eb3ec085020907e630ac9fe13ea033509 data/modern_industrialization/recipe/materials/sulfur/craft/block_from_dust.json +cc9a1f3cd84591320d5c568e16ae0ac9e79a023e data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_block.json +b8d41a7ba0f00a5db0ad5ee8ebc69862cea48080 data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_tiny_dust.json +228d984f5fa2a8de371609c00af12edb27329c53 data/modern_industrialization/recipe/materials/sulfur/craft/tiny_dust_from_dust.json +0a83a525109b365e9fc8a04095a58c747d3f82cf data/modern_industrialization/recipe/materials/sulfur/packer/block.json +cd9a3f0c335a388905672c5e738dae04afba85e9 data/modern_industrialization/recipe/materials/sulfur/packer/dust.json +5c78c65f2719d6690dddb1a7fba2995a194bb4fa data/modern_industrialization/recipe/materials/sulfur/unpacker/dust.json +0e0cc948306a8bab5bf9d5e0e4106d903a4806ee data/modern_industrialization/recipe/materials/sulfur/unpacker/tiny_dust.json +e0c041c6d10160120aef6a8fe6774ad891e69196 data/modern_industrialization/recipe/materials/superconductor/assembler/coil.json +1e85f23710c9d527b9650b096583b911a9460a52 data/modern_industrialization/recipe/materials/superconductor/compressor/double_ingot.json +e666b57c698f1821714820a1e9610aa71f4c50cb data/modern_industrialization/recipe/materials/superconductor/compressor/main.json +2d32b694746a25516e5504e42a34ecf5d3a576c2 data/modern_industrialization/recipe/materials/superconductor/craft/coil.json +3d8ddea855940ab6bc270c1b7111af4a39f52cc6 data/modern_industrialization/recipe/materials/superconductor/craft/dust_from_tiny_dust.json +f3a6a0de6c6256dda554af7cdd627e647c4cadd8 data/modern_industrialization/recipe/materials/superconductor/craft/ingot_from_nugget.json +f85d2cfbbc1d4fe398741a80eeb01ea2841b4549 data/modern_industrialization/recipe/materials/superconductor/craft/nugget_from_ingot.json +4be40a1f6f429ae85386b0ca16c31428295c3558 data/modern_industrialization/recipe/materials/superconductor/craft/tiny_dust_from_dust.json +0efd2637637029066958f34fd32360a7876e1fe8 data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json +fa5b4c66b93ce5aefa7be2fc6df9fd06298c9354 data/modern_industrialization/recipe/materials/superconductor/macerator/double_ingot.json +55a93993c0429d9f00b9512a69c1b8d3973b1e88 data/modern_industrialization/recipe/materials/superconductor/macerator/ingot.json +0d66ea2ada826f4bb4e9bc6b4ce4f434c14c76d7 data/modern_industrialization/recipe/materials/superconductor/macerator/nugget.json +1825aae9a5a549ff6a3c894a44e9b279a90ad60f data/modern_industrialization/recipe/materials/superconductor/macerator/plate.json +78e8bad69ad503c0885967619d9ceb25c8da72e8 data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json +957d03bc586a93ab5222a6a18c47dba681499f89 data/modern_industrialization/recipe/materials/superconductor/packer/double_ingot.json +8b00ce93ee78e6e21a4c0f724226e7dc3696746a data/modern_industrialization/recipe/materials/superconductor/packer/dust.json +05aa2a1758da466c77b872155761a3ed8feb15ef data/modern_industrialization/recipe/materials/superconductor/packer/ingot.json +f999fe10e76dd29f12071268bca94585853ee73a data/modern_industrialization/recipe/materials/superconductor/unpacker/coil.json +2a7727d4053d71fcd15a1eed2c03c299b1b4a989 data/modern_industrialization/recipe/materials/superconductor/unpacker/nugget.json +301ecd5226ef8259f4ead7bfbe7be90e747240fb data/modern_industrialization/recipe/materials/superconductor/unpacker/tiny_dust.json +9ed90f566aaff9ca5ecd14a270cfd56c64d185f4 data/modern_industrialization/recipe/materials/superconductor/vacuum_freezer/hot_ingot.json +b8495579fe4f5cc5f6e5e4d02313c54da982756a data/modern_industrialization/recipe/materials/superconductor/wiremill/wire.json +7a8510892d34744ee9fc28372ce11912538c08b4 data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json +ea6406ca2d31d39382028baa5f353bd6f763aab8 data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json +492dc39074186affe39ba56ddd6eb593d1dc1ddb data/modern_industrialization/recipe/materials/tin/assembler/gear.json +0c4dd0d9217b878a586eb4f3c546a0afe65ba56a data/modern_industrialization/recipe/materials/tin/assembler/rotor.json +d933b09b1f57144f051dcb798b807ff61f57bb80 data/modern_industrialization/recipe/materials/tin/compressor/double_ingot.json +54bafb2fae79f3046f8c4ce81ecb62fe86e0cc95 data/modern_industrialization/recipe/materials/tin/compressor/main.json +519354128b9ad994fb530cdda2e37a77ec788db4 data/modern_industrialization/recipe/materials/tin/compressor/plate.json +1ab533985ebbaa55bc19e531cb498614b22e36be data/modern_industrialization/recipe/materials/tin/compressor/ring.json +2907efac1924fc7550468c72b8b3c94ab4d96e13 data/modern_industrialization/recipe/materials/tin/craft/blade.json +feba139e73708479f82fac86d23f74bc300dbdc8 data/modern_industrialization/recipe/materials/tin/craft/block_from_ingot.json +fb045231a2ecc0177e1654e527fc18d740c24738 data/modern_industrialization/recipe/materials/tin/craft/cable.json +845e8f9b307ff3f4e675e9eddae5e44e924551a6 data/modern_industrialization/recipe/materials/tin/craft/deepslate_to_ore.json +040886699f03dfdfb08609157a45740cf77ccff5 data/modern_industrialization/recipe/materials/tin/craft/dust_from_tiny_dust.json +396fed7d1835a3e748c4a718b329f675eb48f687 data/modern_industrialization/recipe/materials/tin/craft/gear.json +80cb25e5e7ee8f7a91f9aa6c70e19c80aa6af653 data/modern_industrialization/recipe/materials/tin/craft/ingot_from_block.json +5d5c3554c5be2a696371af5c528622cb6d69ecd9 data/modern_industrialization/recipe/materials/tin/craft/ingot_from_nugget.json +2bda351ada1c3c23e95b3c74b10f5f0c6a20098b data/modern_industrialization/recipe/materials/tin/craft/nugget_from_ingot.json +5a7d01ad75fd239002535843cbfb13d746a02a14 data/modern_industrialization/recipe/materials/tin/craft/raw_metal_block_from_raw_metal.json +0e0161084fe3f4a124306cfba0b5ba8e662c7f21 data/modern_industrialization/recipe/materials/tin/craft/raw_metal_from_raw_metal_block.json +82f79d4310315a3a2323f6239c6f08886efc0a10 data/modern_industrialization/recipe/materials/tin/craft/ring.json +2ff9b188f6f7359857e754432a6abc7e4613a891 data/modern_industrialization/recipe/materials/tin/craft/rotor.json +715ae0442d5ec683ae4e53a9f4600a1052c918cc data/modern_industrialization/recipe/materials/tin/craft/tiny_dust_from_dust.json +58f5b6adef4cc88f187996649d635976ecbed098 data/modern_industrialization/recipe/materials/tin/cutting_machine/double_ingot.json +d242287c6aa8f7827f19e2b03df5abfb829a4678 data/modern_industrialization/recipe/materials/tin/cutting_machine/main.json +5d9a83a5d7c67e8eb4e52755afc047d997baf3c0 data/modern_industrialization/recipe/materials/tin/cutting_machine/rod.json +9290544bbe8e9633ae933a0100267713ae883b01 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt.json +9b8f71bf66621971d9a9e046a7481b75308f8d8a data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt_with_tool.json +8ef8789713e3f8faa8a428e01cfe8d343708b177 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate.json +884f0793fe8ceb3d99c82ec650ae2ccde73f1429 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate_with_tool.json +142abf701feb4abeed2210b8b67d1f3537123d2c data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate.json +a10581579bbc00160b58c83672b163919383bbe8 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate_with_tool.json +445aeaa494e1810f1915259b6017133aafa15232 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring.json +7b263b09464ed91fc147a374a464429d31058db1 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring_with_tool.json +7dc314fa4b3c3190f31c472c018e5408bc5912e5 data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod.json +938ed29ef8ac2ac2a4650ad1b8e15ba2eb8d72fb data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod_with_tool.json +2c69c0fa604f945ba87e90623822a50e30ba9f3b data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt.json +faedffa85ac0760c46c7b91fff9b2eb124a7c47d data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt_with_tool.json +9f947455c18d72478b7c05ba60b4b50bc832a625 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate.json +8ed5d98c9d0dc584b649fce0a9b39aeb0b7aad44 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate_with_tool.json +806b2323cf0a09be5ec2232c26307de8341be321 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_double_ingot.json +bc00fe343b9589eb1df28930ae13050debec15a8 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_dust.json +f3b6565b1cb4503688e3e067e2d8f4303f16217a data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate.json +c64ba9992373584002dc8798e15ab91ba9f2425a data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate_with_tool.json +13f12c9a7f82a13fa0a92a3695577ab5597b85f2 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring.json +bd8b0279ab70483a3ab039b8b900480be51c701a data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring_with_tool.json +0fdea7da942f7827626ae6b6db60f5514a76c3cf data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod.json +a84ec42f7e11aeb794c86ffba1a1606e793677d6 data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod_with_tool.json +cc6dd06bd828d68f35db13dcdc0f3643da070d60 data/modern_industrialization/recipe/materials/tin/forge_hammer/nugget_to_tiny_dust.json +0b957a0898661c573aea7bce1fcc089fe77c8806 data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_dust_with_tool.json +72c521bb88f3451b29e7683c5279855ae129daa6 data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal.json +b7f5dd01662609cce82cfd226aa161339cc7606b data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal_with_tool.json +14c94f754324e1d5e93221ca25aa3a579a920bc4 data/modern_industrialization/recipe/materials/tin/forge_hammer/plate_to_curved_plate_with_tool.json +c493f4f0c9ec91b15eab8b120b61056cebb0ccbc data/modern_industrialization/recipe/materials/tin/forge_hammer/raw_metal_to_dust_with_tool.json +80a75df9f2d1130171ec37bb3ceee1ae84d2e1c6 data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_bolt_with_tool.json +3da55ffedc12328cea038fc7e71c05a5a1216068 data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_ring_with_tool.json +8f6454a27513a727e208222e874e9cc281adacd3 data/modern_industrialization/recipe/materials/tin/macerator/blade.json +92d29e4062e662ffeb1981b0c997b16c6b36b503 data/modern_industrialization/recipe/materials/tin/macerator/bolt.json +6bd89ba9cc40ea22b9fff2a05ffc9855ed949ab0 data/modern_industrialization/recipe/materials/tin/macerator/curved_plate.json +531ebe2958a4fab8dc57621b95ba4d97623264c2 data/modern_industrialization/recipe/materials/tin/macerator/double_ingot.json +48480cf59e6140bf527615351c99d7dae0a21e63 data/modern_industrialization/recipe/materials/tin/macerator/gear.json +6aa361b9a98cff2dfa5b54f8c397d634cc57f046 data/modern_industrialization/recipe/materials/tin/macerator/ingot.json +7f28ccd87b03804d7a797ea2e0188f61674be57f data/modern_industrialization/recipe/materials/tin/macerator/nugget.json +1ac0af6bc599e457c2a3e53dea1a6f2123953ff2 data/modern_industrialization/recipe/materials/tin/macerator/ore_to_raw.json +8b14c08d1c8aecfc45892d65f4309f390acce965 data/modern_industrialization/recipe/materials/tin/macerator/plate.json +b585d676c676a2eef8c0ad7005c0cd7a12752b39 data/modern_industrialization/recipe/materials/tin/macerator/raw_metal.json +0e669406aae36ebb9a79f2cf00dc3efef1a2f95b data/modern_industrialization/recipe/materials/tin/macerator/ring.json +44a938694f0abfa074cf0f31452fa808957f2a2a data/modern_industrialization/recipe/materials/tin/macerator/rod.json +6c7bd9968a84cc164af6aeb6e778dfb1a42e1b5c data/modern_industrialization/recipe/materials/tin/macerator/rotor.json +386d5447f776f1c73df175df40dae4b61e3a5d18 data/modern_industrialization/recipe/materials/tin/macerator/wire.json +0654c7fab97181db996ce8ed65a04611dbcd2966 data/modern_industrialization/recipe/materials/tin/packer/blade.json +ca549b7516de9b28b8934952c149d30830878ace data/modern_industrialization/recipe/materials/tin/packer/block.json +0b3ee3e547bb87850dd899e1093a2650cc39fc23 data/modern_industrialization/recipe/materials/tin/packer/cable.json +b8e5c647be9e59351bc7008f7dfa0205ccd6e14c data/modern_industrialization/recipe/materials/tin/packer/double_ingot.json +dcf280a8187c77ec20693fac91eab1b0466fdacb data/modern_industrialization/recipe/materials/tin/packer/dust.json +9755661c0a26fec55d69285a176c0cf875cd0787 data/modern_industrialization/recipe/materials/tin/packer/ingot.json +880ac103cb9a70d3bf297c4fc5fbacd974fb2903 data/modern_industrialization/recipe/materials/tin/packer/raw_metal_block.json +13a8683add8c8741050b9207d579be415809d550 data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_blasting.json +01b4e969af172a11a2301d247388c5a0bf86a22d data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_smelting.json +654474f6e1a68d54ffd79c290dad4e0c0d135dad data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_blasting.json +31bb8cb8e19ccd54283e3c09418208c35e9b0d7e data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_smelting.json +5ba12b25ccfd9eb1b72e552512d4fc0737df6531 data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_blasting.json +a597c966850eb045cabaedd14b36b4a3695a1869 data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_smelting.json +372870fb772c1c2af37babe72b09c70fe7c0c89d data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_blasting.json +928c797f00bda9db07c96b2bbb6fcab3a76c3455 data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_smelting.json +ff04d52df9429e7810f75de486002cac8ca6bc59 data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_blasting.json +d809e8bd5e3596995b5a23eeccb9ce5c42ae5cef data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_smelting.json +97daeba9dc2dee0ebc5f1616e01c294b37182c31 data/modern_industrialization/recipe/materials/tin/unpacker/ingot.json +9524cf26fe0bed4937950ac5fad64146268ccd47 data/modern_industrialization/recipe/materials/tin/unpacker/nugget.json +9a9e953ef047a5afa6c6213f014d7158f6f68771 data/modern_industrialization/recipe/materials/tin/unpacker/raw_metal.json +b1880a7edd493d2a2013f51b8232427a9579ee96 data/modern_industrialization/recipe/materials/tin/unpacker/tiny_dust.json +7ac4cc3162db4d76b64adf6694939c7fe918c948 data/modern_industrialization/recipe/materials/tin/wiremill/wire.json +01a407bf9a3906b3fe8e0f36209092a4528cb854 data/modern_industrialization/recipe/materials/titanium/assembler/barrel.json +42ed0adb49557efba77bf4b6b165f4911cba90d9 data/modern_industrialization/recipe/materials/titanium/assembler/drill_head.json +bd300e7cdf33f4a242bd787faaf70f67b8da7f21 data/modern_industrialization/recipe/materials/titanium/assembler/gear.json +744f0e028d0bc0a577418a07ca2ffbac36651cfe data/modern_industrialization/recipe/materials/titanium/assembler/rotor.json +bd5c3bfc1382231957bb9285865804fceffb38a6 data/modern_industrialization/recipe/materials/titanium/assembler/tank.json +37302d66e272966c72df9a5ab4e0bc5bc4033b9b data/modern_industrialization/recipe/materials/titanium/blast_furnace/dust.json +5341d1e97a1d50adac0a7e085d412f7cb0e58835 data/modern_industrialization/recipe/materials/titanium/compressor/double_ingot.json +31775c7bae0dc901f636c51a91c746311494b4c3 data/modern_industrialization/recipe/materials/titanium/compressor/main.json +d31f48c54e4c2273d8c0a1e7a7e5746b04c62f7e data/modern_industrialization/recipe/materials/titanium/compressor/plate.json +4bc648ffb5a1fe944b99ce8d5a6ed7ad2bb90d70 data/modern_industrialization/recipe/materials/titanium/compressor/ring.json +716a54d2254699ec8e37ae85d48e4319092e4a72 data/modern_industrialization/recipe/materials/titanium/craft/barrel.json +702e0e763bf1aecdc16838740dfbbce1fcb55948 data/modern_industrialization/recipe/materials/titanium/craft/blade.json +0d99adb2c8a02a8477d581255258b1649177a6f6 data/modern_industrialization/recipe/materials/titanium/craft/block_from_ingot.json +a86b4447640c8ff7afd457ade8b091005291aaf4 data/modern_industrialization/recipe/materials/titanium/craft/drill_head.json +8b464d38414fb15f392d6d59a8a3892c69344bd8 data/modern_industrialization/recipe/materials/titanium/craft/dust_from_tiny_dust.json +430faafc4296944356211de4e494a37aa5e64ce4 data/modern_industrialization/recipe/materials/titanium/craft/gear.json +f9c3b0c1f6381300fb8defb961656a80def57dd5 data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_block.json +689c033a40df3482fee15e926ae4fc438f1fef94 data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_nugget.json +906a8b8f02dd8e10004453292aae438cb996bff9 data/modern_industrialization/recipe/materials/titanium/craft/large_plate.json +f6e5ba3d9489a08a41ea654c9feef2a72f445b64 data/modern_industrialization/recipe/materials/titanium/craft/nugget_from_ingot.json +488921cc3d78a2c0253bef3e23be01738418f7f1 data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_block_from_raw_metal.json +508b98ab491ac91d954c3466e1e9cce32fb5d008 data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_from_raw_metal_block.json +24d82f8c30c4a2718e2fcb6576c7423e8abac551 data/modern_industrialization/recipe/materials/titanium/craft/ring.json +d0ad6cdbd819c8a91ad250c8db9ed11b941d7822 data/modern_industrialization/recipe/materials/titanium/craft/rotor.json +1b28f9f787b10ae9da88be9a92db5a10fd90f8fb data/modern_industrialization/recipe/materials/titanium/craft/tank.json +55376934a6ed13c7257026c39c68a8970d889300 data/modern_industrialization/recipe/materials/titanium/craft/tiny_dust_from_dust.json +9608e42f0948e8185c52e13ec9bea244eb9e1e18 data/modern_industrialization/recipe/materials/titanium/cutting_machine/double_ingot.json +66a09b97057ad81eae35defa89323374cc430274 data/modern_industrialization/recipe/materials/titanium/cutting_machine/main.json +89139ee5906e6424907119dfbcf2daaa0089b4e8 data/modern_industrialization/recipe/materials/titanium/cutting_machine/rod.json +1941c5bb267070017b573ec605d3ccab54b92682 data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json +520d7d222de7127e3439b043e0732f3c4f3f42f7 data/modern_industrialization/recipe/materials/titanium/macerator/blade.json +ac79623127d250565fb05e85ff8bf6bc0435ed2d data/modern_industrialization/recipe/materials/titanium/macerator/bolt.json +11312c8239beed96eba6717527c8dd0774a8b8cd data/modern_industrialization/recipe/materials/titanium/macerator/curved_plate.json +855cec87cb547e2787ad065d1b16a8dce6208c4f data/modern_industrialization/recipe/materials/titanium/macerator/double_ingot.json +7030a0963a8b56f45f39b5396f4ddd9cd6317a35 data/modern_industrialization/recipe/materials/titanium/macerator/drill_head.json +164f9b466ce3bfa3d6d1046348a7e84feaca7790 data/modern_industrialization/recipe/materials/titanium/macerator/gear.json +b39ed856b98ed86d2ab0fc813e59691c3c6c8333 data/modern_industrialization/recipe/materials/titanium/macerator/ingot.json +3bc1d774643673733e20ddc1ba60822c3cd4775f data/modern_industrialization/recipe/materials/titanium/macerator/large_plate.json +dd4a2bed3253d57e9f4c391634221d4611318dbb data/modern_industrialization/recipe/materials/titanium/macerator/nugget.json +f16835e71437ab06f08dc3e68a5eee852478b3ca data/modern_industrialization/recipe/materials/titanium/macerator/ore_to_raw.json +3efff9a715c03874ed2bca3630a052cf69c55f75 data/modern_industrialization/recipe/materials/titanium/macerator/plate.json +64426f12206d417bb87902b934cc45bbce76dca6 data/modern_industrialization/recipe/materials/titanium/macerator/ring.json +f7ee96b10e22857fca8452e909915c083dcff9cd data/modern_industrialization/recipe/materials/titanium/macerator/rod.json +427853b09710557bfd94d568a2c1d33f94264eec data/modern_industrialization/recipe/materials/titanium/macerator/rotor.json +5b6cd669628d23282cd763dd5746a49185d4a66a data/modern_industrialization/recipe/materials/titanium/packer/blade.json +c882f09750999ec08dd5d04a110643edc7be59b1 data/modern_industrialization/recipe/materials/titanium/packer/block.json +29b409d4de2d52440968828bb01a9eee29b47962 data/modern_industrialization/recipe/materials/titanium/packer/double_ingot.json +5400c9aee1609c9b3dddda71966cde1631ae5da2 data/modern_industrialization/recipe/materials/titanium/packer/dust.json +3a3207704ad4a20309be669343bf80a88b8cf356 data/modern_industrialization/recipe/materials/titanium/packer/ingot.json +842d2eb30d678d93c570b7d274c771f5f2a8b1fc data/modern_industrialization/recipe/materials/titanium/packer/large_plate.json +845af07be6089036e2e49524bf0b7354c42224c5 data/modern_industrialization/recipe/materials/titanium/packer/raw_metal_block.json +045bc962e2d36c969acb731429400337f75049f6 data/modern_industrialization/recipe/materials/titanium/unpacker/ingot.json +456e305f572542b6f097aa877f7e14ec4821bd7d data/modern_industrialization/recipe/materials/titanium/unpacker/nugget.json +82243ccc60f8bf8bafe7dff014057dabc2fcd18c data/modern_industrialization/recipe/materials/titanium/unpacker/raw_metal.json +ae6eda5000c314c74f69c860ac2a3b679e1f677a data/modern_industrialization/recipe/materials/titanium/unpacker/tiny_dust.json +f6663460a42dc79491f3ae6ffb1b805683acdfd8 data/modern_industrialization/recipe/materials/titanium/vacuum_freezer/hot_ingot.json +72d880f4a7c1bda37d45deb499e839bed4b24f80 data/modern_industrialization/recipe/materials/tungsten/compressor/double_ingot.json +d5f226b58fdcbe8611a41af92d2ff4507507e7d5 data/modern_industrialization/recipe/materials/tungsten/compressor/main.json +333507fb21ea7df71c40aa76471cb4cc4d0a2e57 data/modern_industrialization/recipe/materials/tungsten/craft/block_from_ingot.json +cb466c573af7bc0a245fae7853c2ec5aa90252f5 data/modern_industrialization/recipe/materials/tungsten/craft/deepslate_to_ore.json +1ce6f1c3036c3a544bcfe67cc3340fae629657c8 data/modern_industrialization/recipe/materials/tungsten/craft/dust_from_tiny_dust.json +3d28faa7bd58b9805483e27d2d7130fba29d627c data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_block.json +7124778416e855529c26a57e0d9e872206e7c233 data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_nugget.json +b6ae4b2401f73ec54f5821e5c41f0782edb76a85 data/modern_industrialization/recipe/materials/tungsten/craft/large_plate.json +bcd0ad334b4f8f9dfea23c91784a0078448c9928 data/modern_industrialization/recipe/materials/tungsten/craft/nugget_from_ingot.json +910e8dd9526653d398538d6898ee03c93581cdff data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_block_from_raw_metal.json +582ada32847baa630eeb410037f998fcfcad7161 data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_from_raw_metal_block.json +aee4b34519b3d01f077d429a0c7ec11b7255d2a5 data/modern_industrialization/recipe/materials/tungsten/craft/tiny_dust_from_dust.json +77aea067f50634e12e40136921e371b00be50070 data/modern_industrialization/recipe/materials/tungsten/macerator/double_ingot.json +3702728383bac75a36c1a0d596dbd882b73e65cc data/modern_industrialization/recipe/materials/tungsten/macerator/ingot.json +7d311263c58c7f781d429c879f2ae100370365d6 data/modern_industrialization/recipe/materials/tungsten/macerator/large_plate.json +50c6124b5ee54703e43612be8efa80f82838b897 data/modern_industrialization/recipe/materials/tungsten/macerator/nugget.json +3056c69da51dfa430f66e1b65cfcc6a4aefdeb3f data/modern_industrialization/recipe/materials/tungsten/macerator/ore_to_raw.json +d18e01beff7bd7ee3e40ff3bc444255e1a0039a2 data/modern_industrialization/recipe/materials/tungsten/macerator/plate.json +fc55bd8bdf8cd289132ae8b0896239d170553108 data/modern_industrialization/recipe/materials/tungsten/macerator/raw_metal.json +ef6d877bad671737ebbd73c45c0ea7111884cd1c data/modern_industrialization/recipe/materials/tungsten/packer/block.json +630e4b57f2d416196b83bc1c4d4a591ee045bb17 data/modern_industrialization/recipe/materials/tungsten/packer/double_ingot.json +fbe79c1404bf86995a83a29dd05bf1c3a8b8c5e9 data/modern_industrialization/recipe/materials/tungsten/packer/dust.json +6e04adac6ad6aeaffe2246d98a0fc49a925b3ce8 data/modern_industrialization/recipe/materials/tungsten/packer/ingot.json +824ae26b8506ea14c06106f7393da781722dcb71 data/modern_industrialization/recipe/materials/tungsten/packer/large_plate.json +66bc0fd0d83227d56211d839383027e0fa049a7e data/modern_industrialization/recipe/materials/tungsten/packer/raw_metal_block.json +7d66b912e4212a80497afa4394b69ba68ffde0fd data/modern_industrialization/recipe/materials/tungsten/unpacker/ingot.json +8165d2de35feaa2b883181efab59868edf1525c0 data/modern_industrialization/recipe/materials/tungsten/unpacker/nugget.json +9192a0088dbb359bea0164a37b60613d9aa80b94 data/modern_industrialization/recipe/materials/tungsten/unpacker/raw_metal.json +f3a6abf8b3aa9cf95e8e000ba90b35711c399fdf data/modern_industrialization/recipe/materials/tungsten/unpacker/tiny_dust.json +f3764c6529fac0620aa5de63a88cf89d5507074d data/modern_industrialization/recipe/materials/uncooked_steel_dust.json +7582f26e21ee5e31845af6ed270241697583ea41 data/modern_industrialization/recipe/materials/uranium/assembler/fuel_rod.json +68c433033df426fb5a2ba361490e5904a6239159 data/modern_industrialization/recipe/materials/uranium/blast_furnace/dust.json +d69248345cc8b70e5a4ddee3537a0b51373ace05 data/modern_industrialization/recipe/materials/uranium/blast_furnace/tiny_dust.json +8ec202a4e13f673f4e013589039034f311abdaf0 data/modern_industrialization/recipe/materials/uranium/craft/block_from_ingot.json +ff0f9a9da7b6127a9d4e0034909c26632e66bc61 data/modern_industrialization/recipe/materials/uranium/craft/deepslate_to_ore.json +698093a3ef961efbcab887407ae1455c7d085835 data/modern_industrialization/recipe/materials/uranium/craft/dust_from_tiny_dust.json +6950fe27a84db56e91825e25728d29357e707ecf data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_block.json +f58ccb09d924668217843fb2535616504f470d78 data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_nugget.json +cf743f66b38b9e991595f91ac3553a5dd0a385ed data/modern_industrialization/recipe/materials/uranium/craft/nugget_from_ingot.json +3e6081e64e58169e806fd5e29548a8163e95e750 data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_block_from_raw_metal.json +3b56cfd44dab0be38e9c6eff685fa6bd63ac02cd data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_from_raw_metal_block.json +5f0157c706604f89870c7d72e48eeb5cc26c6336 data/modern_industrialization/recipe/materials/uranium/craft/tiny_dust_from_dust.json +fc90ccb81d62392fe25df418d691f02eff168905 data/modern_industrialization/recipe/materials/uranium/cutting_machine/main.json +08de5c0d0ce4d04e4a8921bdefb6258543b93b26 data/modern_industrialization/recipe/materials/uranium/macerator/ingot.json +724f0b58ae4b6c173049be1c8a5900251372ef6e data/modern_industrialization/recipe/materials/uranium/macerator/nugget.json +d69206b7edb966d5002ae714599a0bffd4469911 data/modern_industrialization/recipe/materials/uranium/macerator/ore_to_raw.json +43680c99d12dc580d8e4c08138c49d46b8e62b8d data/modern_industrialization/recipe/materials/uranium/macerator/raw_metal.json +f80756406778dd9292b97b47dfd82230a06e8120 data/modern_industrialization/recipe/materials/uranium/macerator/rod.json +3202d47fe9ee7e277ce00a866cc639d8d8bc8017 data/modern_industrialization/recipe/materials/uranium/packer/block.json +ad7f3a8eb64aeb65866fc8f9ee380081301ed18a data/modern_industrialization/recipe/materials/uranium/packer/dust.json +672b1df3bb35190a0d08292b7e87b68eed07b39b data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_double.json +0ff8ed551c1d740fe5db4a5726fd5bb2e1deb9c1 data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_quad.json +6cd66713966792c2f6e3b4c164295f9feb4970c0 data/modern_industrialization/recipe/materials/uranium/packer/ingot.json +ad1699f6cbb05e132839c18a13bb169eea039f2b data/modern_industrialization/recipe/materials/uranium/packer/raw_metal_block.json +9c34c68c805619f0aa66fd479c37a538f4119cf3 data/modern_industrialization/recipe/materials/uranium/unpacker/ingot.json +f09945c1f5bd1b0b532d3dd21a7ecd8a79e69e88 data/modern_industrialization/recipe/materials/uranium/unpacker/nugget.json +afca855282f22f580ca40346d9e56a9e0aa72aa2 data/modern_industrialization/recipe/materials/uranium/unpacker/raw_metal.json +f5d0de04a05352e26e1c3a7c4315afc31b1c7d06 data/modern_industrialization/recipe/materials/uranium/unpacker/tiny_dust.json +a583fd94799872ea51b880c1ec88863f82f0f822 data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/dust.json +73b30b169a34fc906a60befdc7b1a09e60bf61c1 data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/tiny_dust.json +045a1bdb95d4dc33518e19fd7a5d252ab4a8eb3a data/modern_industrialization/recipe/materials/uranium_235/craft/block_from_ingot.json +2512fd3d251cb149a62cbdd093e403631a7f7d16 data/modern_industrialization/recipe/materials/uranium_235/craft/dust_from_tiny_dust.json +40c935e08120cc898e80cc9c8cc861d479c539d9 data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_block.json +ee80c2c31c01393fe6aee6eae920b00ac1e515a1 data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_nugget.json +8fe9f1a89da2cd8c29a64b88e40d232ce6c62386 data/modern_industrialization/recipe/materials/uranium_235/craft/nugget_from_ingot.json +4d83c09f780bbc211c5a5b275939c18903462512 data/modern_industrialization/recipe/materials/uranium_235/craft/tiny_dust_from_dust.json +cf4cd8f7c7f9768eddc2b7b259e26690034f738f data/modern_industrialization/recipe/materials/uranium_235/macerator/ingot.json +fc36cfda877a33a6f693cbae7085321d4199040b data/modern_industrialization/recipe/materials/uranium_235/macerator/nugget.json +a0af2edb038b521c91dd395554cf86f85eb98baa data/modern_industrialization/recipe/materials/uranium_235/packer/block.json +852570153490bbe241a875968758b216778b174d data/modern_industrialization/recipe/materials/uranium_235/packer/dust.json +b917e4773b9aef13c6e8d5a4549bdecd8a057431 data/modern_industrialization/recipe/materials/uranium_235/packer/ingot.json +9b7ed23d534b3ae9bd2ee379292c3b3f2c19d16b data/modern_industrialization/recipe/materials/uranium_235/unpacker/ingot.json +96a3fd4575cbfa61a511eea2b8b0b2ad0179e7ea data/modern_industrialization/recipe/materials/uranium_235/unpacker/nugget.json +5cc7979152eeae4fb377526a3a9dc5a9165750f2 data/modern_industrialization/recipe/materials/uranium_235/unpacker/tiny_dust.json +78e8d6937e269bff158d76e9058a03e7e34695f5 data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/dust.json +9d1a3ea232af73819ccaf25cb9492fd0537f920e data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/tiny_dust.json +a21f4e99b057a41431aa90930b4afcd4be305df8 data/modern_industrialization/recipe/materials/uranium_238/craft/block_from_ingot.json +4d3b210e930d37dd26fee89a87f078d91b36b76e data/modern_industrialization/recipe/materials/uranium_238/craft/dust_from_tiny_dust.json +8ae2b6681227a2e0a8006565adbee7eece390774 data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_block.json +66042b6978cbeeb9ce38030a1bd33d103f31a5ef data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_nugget.json +8cdc0ec11be6d0009c0a5fef1368346e3dc4e5aa data/modern_industrialization/recipe/materials/uranium_238/craft/nugget_from_ingot.json +b92d3751f6ac9d2868dcda32b66986d58931ce12 data/modern_industrialization/recipe/materials/uranium_238/craft/tiny_dust_from_dust.json +e67ae7b21408ed1616ba605309bebf752335ca7f data/modern_industrialization/recipe/materials/uranium_238/macerator/ingot.json +fb3a7eb774121ec27b0427d400f3fbe96efab4a6 data/modern_industrialization/recipe/materials/uranium_238/macerator/nugget.json +2f49d7baec3b59da9f8558cd9c506216a71b4c0f data/modern_industrialization/recipe/materials/uranium_238/packer/block.json +540c283e9ba4ad208be8757d1a3d2a6ab7cbcb5a data/modern_industrialization/recipe/materials/uranium_238/packer/dust.json +c791aa58e79647b61bc3a19d481a560f41480ea7 data/modern_industrialization/recipe/materials/uranium_238/packer/ingot.json +aebf9cf0d253d03510b2add86ed654facb0c3d39 data/modern_industrialization/recipe/materials/uranium_238/unpacker/ingot.json +edb84b03b285a1a85342651e8765107c93786bb6 data/modern_industrialization/recipe/materials/uranium_238/unpacker/nugget.json +58915a0c43354141bc27d6939a6083377ca6ac6b data/modern_industrialization/recipe/materials/uranium_238/unpacker/tiny_dust.json +e3fd5cbf3b98c90f395a86a3110b92fdcc5a3402 data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json +89736dc9e8bbcb06bd9dbfad9845b5a0e507794f data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json +e23a4753ccc61d0a6448489186b1bf63326bca25 data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json +23213e77e19ae92a2830b091c0dd8c8aa431bde1 data/modern_industrialization/recipe/materials/yttrium/craft/block_from_dust.json +9dd41e6fb3772cec02ff1e12cce39a9853c34bc6 data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_block.json +3ab9dfa21426990aaa591f4d85ccb1ab01f36748 data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_tiny_dust.json +21b38974a6b7f8d2ec2c8b782d45f1407f9d7a32 data/modern_industrialization/recipe/materials/yttrium/craft/tiny_dust_from_dust.json +0d015da8a9087f68bf6fed1a2e6614d3fa72112a data/modern_industrialization/recipe/materials/yttrium/packer/block.json +07be424c1b4d114dce63acee72dc58e22b9b928f data/modern_industrialization/recipe/materials/yttrium/packer/dust.json +b26946b56cdbd94b89591d02d15ab40022d0fb22 data/modern_industrialization/recipe/materials/yttrium/unpacker/dust.json +1f3ca44f011dc8ef065e97975715b3cbe17da623 data/modern_industrialization/recipe/materials/yttrium/unpacker/tiny_dust.json +c31f5e04dd70ade2a242c233899d1e5fef6b67c7 data/modern_industrialization/recipe/misc/forge_hammer.json +9bee4f1480704ba273e07eaba6eee7bd8f94a6a1 data/modern_industrialization/recipe/misc/guide_book.json +7182f7e6a276bd62a58a485a6b063cd62356a28c data/modern_industrialization/recipe/misc/packer_block_template.json +597c4d81bae43c5acafa1afeac96bef77a09decc data/modern_industrialization/recipe/misc/packer_double_ingot_template.json +d04ff6d3d153be797d5b0f8cab010b52471cfd24 data/modern_industrialization/recipe/misc/trash_can.json +eff4e7f74d94e542eea69cfd50432d229430076f data/modern_industrialization/recipe/misc/trash_can_assembler.json +00774f79910de253e74ebe09497f5d41ce3a2369 data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json +3b06a643fae60ced375d43fa2c3d1c5bdace1728 data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json +03041b42bdf2d793541e9e702e98df9b3ca071ca data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json +ed1a3ae5a9f34d1a0034c028fe0e069ee67b2ff5 data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json +e5a6e2bf8a36ab4bc0191c219aaecfb352a00e83 data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json +7b4d82a2c234f1c5ead3952622d8f803048d338a data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json +b243e967ba6822fcdd7920bb55093248bd3ada4c data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json +b47b3b6a64694d673acf03ca59c63f15bf8d47df data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json +1831fbbb2f619dbecefaabb85f0983480d07afa6 data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json +4066b6301ce72a8adb6dd6419d4a2e8cebae88b0 data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json +1c51a5dad5272e05241f0dec4ca194ca8d6339a6 data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json +ed0d0fecdd482b5b35b292d7a2d89d6868df3666 data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json +2cfe09113e64537b315a1d99e96c0e62766c6eda data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json +4c1becd7a3166807f2e9b25a38ff46943b69b5a7 data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json +1f47acd2b93acc1f3b2308f7cf531f93fac4ab93 data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json +cfff69e2f8ac22bd2d254b575191ea6cd37eeb01 data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json +24ac1fae36dbbdebd1fea84bd8f3ffeb75ef941c data/modern_industrialization/recipe/oil/crude_oil.json +2adb83adf376852864a275f6843dd911e34ad9a6 data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json +432d3cbad50b39473645c822071030f25964bd40 data/modern_industrialization/recipe/oil/mixer/diesel.json +8340242886d6a855504b3f32b51ff031f1925847 data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json +cba99ff77f0c18dc2d251f6a9c75fda338a4653a data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json +a27b3accd372febd14d8b4c2ed1aea487216c59a data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json +761682c9e1ec71ba0556ae7622261e4965b82c9a data/modern_industrialization/recipe/oil/mixer/sugar_solution.json +4d82a555cda0de8fe4667bdcb917e0e21be319bc data/modern_industrialization/recipe/oil/oil_drilling_rig.json +700583c26b742ab4a66efa00c4bdc1e884b90b28 data/modern_industrialization/recipe/oil/shale_oil.json +d997325a48714c1bcccef40b23b6ee5e46af002b data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json +e8ac3c998433fa950c81fa2663baad7efecc66b9 data/modern_industrialization/recipe/oil/water.json +6087887f77aa46395e002eeb1c1cfdcb5b845248 data/modern_industrialization/recipe/packer/stripped_wood/acacia.json +1b8eb6a8f8a2754f9bfb9ca56db6ed3167bfdc48 data/modern_industrialization/recipe/packer/stripped_wood/birch.json +305f0bfbec4d643b224e92d0e43e8c24cc8ad399 data/modern_industrialization/recipe/packer/stripped_wood/cherry.json +e2ac9ecad6ed566587a71c3489dcf09b6539e285 data/modern_industrialization/recipe/packer/stripped_wood/crimson.json +48386b1190550190f77a59404b53aa87a16d16fd data/modern_industrialization/recipe/packer/stripped_wood/dark_oak.json +25bc141d5ee77e49832e19b44485e269afb5d13a data/modern_industrialization/recipe/packer/stripped_wood/jungle.json +c08200ef905c0b3b2976ec644d6c9cc20186797c data/modern_industrialization/recipe/packer/stripped_wood/mangrove.json +da1ac9212ae87c0534a13695dc9f85f1fc0a1eb7 data/modern_industrialization/recipe/packer/stripped_wood/oak.json +c0d89b04fe03f9133ec571f3fefd4aea5b1e6e02 data/modern_industrialization/recipe/packer/stripped_wood/spruce.json +beb2d8d2f1a6770c64bc13229f1eb53487166857 data/modern_industrialization/recipe/packer/stripped_wood/warped.json +bf84906d315cbdb01ca036963cbb03b87725b7b6 data/modern_industrialization/recipe/packer/wood/acacia.json +7078f49193adeb9d486ae2a84e9655c228a2c104 data/modern_industrialization/recipe/packer/wood/birch.json +9c7d95eb4183e9c2693e22f976a1707ac8168419 data/modern_industrialization/recipe/packer/wood/cherry.json +6f8ef0c9c8a0c6acfc81594df009f98c149eab0d data/modern_industrialization/recipe/packer/wood/crimson.json +19ec296a80b318871a5b8051a348569386fb2e74 data/modern_industrialization/recipe/packer/wood/dark_oak.json +e8d6c446b85bb7162c2bfa53867ae6feb768702c data/modern_industrialization/recipe/packer/wood/jungle.json +8018b4386920861cff37c1228c2026bed946bc1f data/modern_industrialization/recipe/packer/wood/mangrove.json +95781592cffb36d2aad1aaac3db070ace96b0b99 data/modern_industrialization/recipe/packer/wood/oak.json +d03794edc158d22e09f6a8f23b4f97a02b097e44 data/modern_industrialization/recipe/packer/wood/spruce.json +47bd2ebec82a348712c47785cd48786ad5462fe3 data/modern_industrialization/recipe/packer/wood/warped.json +c44fde08ea3143864c6e54aba5fe86336ea74d4c data/modern_industrialization/recipe/petrochem/distillation/crude_oil_0.json +a387271dca0faa926dbe4b705fa695002e2d1dab data/modern_industrialization/recipe/petrochem/distillation/crude_oil_1.json +e0d9b2c50a50e7cadc5f1d7c44d97631667de3b5 data/modern_industrialization/recipe/petrochem/distillation/crude_oil_2.json +5e46fb2fb6f40488ba83d08179a423425813c508 data/modern_industrialization/recipe/petrochem/distillation/crude_oil_full.json +4cabee3cbabd8e0b781fcc748bf04ba24c51872b data/modern_industrialization/recipe/petrochem/distillation/shale_oil_0.json +3c746a59258b9eee8cc451e2b7e92a937b9b8642 data/modern_industrialization/recipe/petrochem/distillation/shale_oil_1.json +686950e59958c5252290aff188617a8335642dc9 data/modern_industrialization/recipe/petrochem/distillation/shale_oil_2.json +f8d9edd2fe2cc8bb5ae98559f19a937714e69dd7 data/modern_industrialization/recipe/petrochem/distillation/shale_oil_full.json +a833860c24797950d869d73504f0bbc91d9adb98 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_0.json +5e2d3c1ec69d21fecba02b43fa9cab0b048bb035 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_1.json +337ae3372a3b2a9877d8e37cffdbd5e0cb822752 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_2.json +f0de3694695b49d9f18452baa124069486c357be data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_3.json +b25d159aa8acb5c35230fd45d120e2e8c4abd2f4 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_full.json +c3f6b96eb16073818bd0ffd1a38beefddd6ab914 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_0.json +dc56c2680965403492fa4ab9f91855ff55cf055d data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_1.json +69e6020bbb4a1b0c8fbaa1c354dbcd84ea002e1d data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_2.json +d6f4d955ede7643a67832ff3ea899824eb73d1dd data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_3.json +06132fb6e64ac632698895f2b1a619fac0157a1f data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_4.json +10e962fdad1b5eb16c519640a6e8055769812576 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_full.json +3f300c808f719bdbc04ca08ac418e92d517e4d60 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_0.json +45cc538390ddecec2ae118b296a54783f39fb6e6 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_1.json +45eb616b3a5d69e6bb6846ab22de21e72b8223a9 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_2.json +0c3659e7b6470700c8f2e63c7e6b32b0890c9e8b data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_3.json +4b5a4cd01e1cc2af7e13ecbab1a6fb0c3e8e1c0b data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_4.json +d62eb7d828fd7ee94f05fc9e39ce785b3813ddba data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_5.json +d723a1cfa1f1af3e5a66d5d399d012075da65d39 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_6.json +af7e9e545792c74a0f8b647448b3c9a89621da14 data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_7.json +123a437420f2d7e357e3bd7b8c12f2f211e1ba0c data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_full.json +679d3fc2ec449efac1fe1dd025ff2dd6fee74366 data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_chromium.json +791e29db957943abe6066078130141c7ee6a2bd3 data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_lead.json +defa397600ea6681ceb44240c2ce008e24bc80ae data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_chromium.json +c139e5b7775fdeb002e02687ffc1b39c15ae676b data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_lead.json +56cb2372365a251d4cb47afa1cc6fd33aec58ac5 data/modern_industrialization/recipe/petrochem/polymerization/ethylene_chromium.json +25c9513dab7d47794ba54066c8b5f0815b820e8b data/modern_industrialization/recipe/petrochem/polymerization/ethylene_lead.json +614144291d2653ad2fa561595d263863cdd49009 data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_chromium.json +54e2b52dc5e5dbfa915b61af23da9f09301030c2 data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_lead.json +3b0f5ca621d52ff52808210448e1bcdc2c2652a9 data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_chromium.json +fb4c9018381762f1de9e6e41e1470f70b774149a data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_lead.json +695d359f9f722a1fa9d6a6aa8fbfd3f0b43622a8 data/modern_industrialization/recipe/petrochem/steam_cracking/heavy_fuel.json +086165be764a96a33d2e0057fedefd821b5dd953 data/modern_industrialization/recipe/petrochem/steam_cracking/light_fuel.json +4190913c018801738ad5b90ead2962019c5b5f3d data/modern_industrialization/recipe/petrochem/steam_cracking/naphtha.json +35abf0ab8668aaac166913dbb674a4d10ebe3fb4 data/modern_industrialization/recipe/petrochem/sulfuric_purification/crude_oil.json +9500573036964e4bb4905b85ee71ab0188613c41 data/modern_industrialization/recipe/petrochem/sulfuric_purification/heavy_fuel.json +0b41fc1cf4edf9a40c49f327b44656c4c23fdc30 data/modern_industrialization/recipe/petrochem/sulfuric_purification/light_fuel.json +1f35fa343ed5bdd91c6abbe089769a77f41d6eb6 data/modern_industrialization/recipe/petrochem/sulfuric_purification/naphtha.json +5786433c02d7f8ed0ea5a0cb749ce67a8a54489f data/modern_industrialization/recipe/quarry/drill/aluminum_drill.json +a4389f9aef81e65cba627c39a052cf0f15b4d39f data/modern_industrialization/recipe/quarry/drill/bronze_drill.json +1e59a74a1db23fc863b4f0f29d42120968dab092 data/modern_industrialization/recipe/quarry/drill/copper_drill.json +db09c1108ec6c3e4a2200a015fe2f5f5742f57f0 data/modern_industrialization/recipe/quarry/drill/gold_drill.json +1048a43ead1eff12844c739b2726e7b4c8337434 data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill.json +6d808fb9f03d672243e1cb9d462584dbe83a8841 data/modern_industrialization/recipe/quarry/drill/steel_drill.json +69a47595da6aad017d3d170b8b89909fee3fc51b data/modern_industrialization/recipe/quarry/drill/titanium_drill.json +399b358b477cf5b5f1cb23ee53c682e044308c8e data/modern_industrialization/recipe/steam_age/bronze/boiler.json +2b0dce5d13914f9fe44dbeb1fe4bff42818a7eab data/modern_industrialization/recipe/steam_age/bronze/casing_pipe.json +fa5e5801209bf3ca010df5f1d61d20d3538c3516 data/modern_industrialization/recipe/steam_age/bronze/compressor.json +0e625e87b89426c3d71cdd3a3631ae12790d4278 data/modern_industrialization/recipe/steam_age/bronze/cutting_machine.json +816c692b67160a8ed5b81a1bf366cdde1756762f data/modern_industrialization/recipe/steam_age/bronze/furnace.json +00abf80ceadc665124ce70e97414545842db4320 data/modern_industrialization/recipe/steam_age/bronze/macerator.json +3d9415d3dff6f418adda5b68ac91675311a64e39 data/modern_industrialization/recipe/steam_age/bronze/machine_casing.json +110f2f7c1e45dd85c05d3bf1eeec1f0446c13879 data/modern_industrialization/recipe/steam_age/bronze/mixer.json +f84ce5a56d34c1f767e71599ad9040f4b925ba94 data/modern_industrialization/recipe/steam_age/bronze/water_pump.json +bab2599615f7fa619e9346fdd5a905c65f78b770 data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json +8bffbedf921e9c84077e08578952e67266a36390 data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json +0d00252901e9f1b587c9eaee6a1c532f3b2fc302 data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json +5e4ad985a7442db5a3a94e3a72ced44111f9e88b data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json +aebd3d3f9c1c34d1e3f90e08b8abbfc0d1084e0b data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json +324f4e1b8d952e54fc3e6c52687d11fa4b6721e9 data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json +81fa173e5899c5a5883d8386cbf48182ad220e4b data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json +40b38b93b55e63ea925ed48003d67fe3c0dd9d83 data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json +d5366942e0f5ffde573401598697ed3007be3ce2 data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json +9d81ca0334fa70769d03a1927818f41d3e77c2f9 data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json +e8d11219f17cba6e15ab2c96f9e3cc4f995d96f4 data/modern_industrialization/recipe/steam_age/fluid_pipe.json +1a3647a9f1c05955ebbce90a84b9fcdbd9a91cf1 data/modern_industrialization/recipe/steam_age/item_pipe.json +9af3f35cf40ea1aeeeb08bf09c58d457dda2de7a data/modern_industrialization/recipe/steam_age/steel/boiler.json +8dd6c7986d06f0bc5309f33c26bdfb114d6bbb6c data/modern_industrialization/recipe/steam_age/steel/casing_pipe.json +8affaa5d2510b329d59b4d5aeb53985180b10d65 data/modern_industrialization/recipe/steam_age/steel/furnace.json +43be667646315bb475307525ee66db1d810d702e data/modern_industrialization/recipe/steam_age/steel/machine_casing.json +c37e6e9246e0950202ef0955f3737b04fefe7651 data/modern_industrialization/recipe/steam_age/steel/packer.json +1f61e291cd00fa3a566680e31761259416c1eb2e data/modern_industrialization/recipe/steam_age/steel/quarry.json +37c566bf6cb06536c754e0a8e70f27bfec5c6914 data/modern_industrialization/recipe/steam_age/steel/steel_upgrade.json +8a701586af7b8bbbe5bde639863d81a1dd4a961d data/modern_industrialization/recipe/steam_age/steel/unpacker.json +7843fa5c87fd213f828a3c2ee8249f1713f7f451 data/modern_industrialization/recipe/steam_age/steel/wiremill.json +94a2e67d51add7cb2460bf354dbefa9cb5ff07a9 data/modern_industrialization/recipe/tools/config_card.json +8632352809fec1039e4a1b0e8bf7a8f2bcc08103 data/modern_industrialization/recipe/tools/diesel_chainsaw.json +d946e8ab70d9d45bc00a613fb4520d920ac52365 data/modern_industrialization/recipe/tools/diesel_mining_drill.json +e5833013edba8efd7986c010d15a100ee4887272 data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json +4f6eef5069b436c84703097dd2602305afa5e701 data/modern_industrialization/recipe/tools/steam_mining_drill.json +1830ecd8c5d6e64967c216587a0907ae19293435 data/modern_industrialization/recipe/tools/wrench.json +f8b386ba100272b6e113124f10ac26d09652f073 data/modern_industrialization/recipe/upgrade/craft/steel/boiler.json +0056fb9afaf20b31cbf31982a0c4d01ee4b09dab data/modern_industrialization/recipe/upgrade/craft/steel/compressor.json +eef9690f93e4ab3c9a1360ff9a535ad278f8b486 data/modern_industrialization/recipe/upgrade/craft/steel/cutting_machine.json +baf3d066271c4b5244b7245f55dfad61f8244efd data/modern_industrialization/recipe/upgrade/craft/steel/furnace.json +cfda2f19331cf0f3f4589529ee3b412971194288 data/modern_industrialization/recipe/upgrade/craft/steel/macerator.json +46d36ee9e99c4652ba3d91e3fdbefcf5f0fc79df data/modern_industrialization/recipe/upgrade/craft/steel/mixer.json +56d52bb4ca5724c1dedab040898fec6cc5aac4c7 data/modern_industrialization/recipe/upgrade/craft/steel/water_pump.json +0dfbab6d2eca92b529be6797bbe45604841757dc data/modern_industrialization/recipe/upgrade/packer/quantum/boots.json +5ae402afe64c87899a9fb447267f7335196531cc data/modern_industrialization/recipe/upgrade/packer/quantum/chestplate.json +b48d19c74316a39cd258e17854353b1d54ade530 data/modern_industrialization/recipe/upgrade/packer/quantum/helmet.json +e7bfb4807f7dc6af5e3c0837ccddf3d0fa892a92 data/modern_industrialization/recipe/upgrade/packer/quantum/leggings.json +103b7180bebd53e034d4868cba8ca9b9395fe137 data/modern_industrialization/recipe/upgrade/packer/quantum/sword.json +56793c2bb469e11a8b7d43e6ac4a50cae4753266 data/modern_industrialization/recipe/upgrade/packer/steel/boiler.json +7f30d3705e2163aab65391f5222985cb2a284b5a data/modern_industrialization/recipe/upgrade/packer/steel/compressor.json +dae0512161487453878d52f0cd5b93156c5a5f0f data/modern_industrialization/recipe/upgrade/packer/steel/cutting_machine.json +e1f6f9335154049263a4ad61f83e46b90d62e627 data/modern_industrialization/recipe/upgrade/packer/steel/furnace.json +6b2543f3a5de617797a4f88461774d9469f0f9e7 data/modern_industrialization/recipe/upgrade/packer/steel/macerator.json +4a776d4068b3f3f1aa6859c2261ec2af9e193fd8 data/modern_industrialization/recipe/upgrade/packer/steel/mixer.json +82ffeeed7b917bc597065cd9fcc3d7185ba0545b data/modern_industrialization/recipe/upgrade/packer/steel/water_pump.json +a213e249d895b0aa1ec1f199ead018e19d35cbc2 data/modern_industrialization/recipe/upgrade/unpacker/steel/compressor.json +7820655454b1d170c3e91e23d6a24a90f67aae42 data/modern_industrialization/recipe/upgrade/unpacker/steel/cutting_machine.json +5fecfac304d61632e2cf9ebf7262fbb047c56a5b data/modern_industrialization/recipe/upgrade/unpacker/steel/macerator.json +52a84854a10d6da30e3b60152f55220d5b4f79f7 data/modern_industrialization/recipe/upgrade/unpacker/steel/mixer.json +753dbd1e1bd6cda1d68fa304138d1eb5843938d9 data/modern_industrialization/recipe/upgrade/unpacker/steel/water_pump.json +454551369490e87231e439edd4775271917ea713 data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json +f425f11d51273ab3a4bdc60a7f2d71b0dd4a2911 data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json +89d26a9e6200b2064ffb487abba5680c734a6e65 data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json +c85a6ea8d9bbe15ab22be90c5421500d9483c0a6 data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json +ec893fba59c2e096b5b42b2e34bd4f3c4f0ab58f data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json +c8d1c757534aacbe86944215ca2f9516451e36ce data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json +8c0f0b02087d9c4118fc23f1bfa2d3827f90cb0e data/modern_industrialization/recipe/vanilla_recipes/blast_furnace.json +f587ac3e43edb61e9ba1dbb8bd1ea5e157dc7c9a data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json +9ff588944fe067ac337157e4e51d13121db07225 data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json +e352244e1465c237ae99b5abe260e9fff2b73603 data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json +4f7bab2453d9496ef17b6602aecaf796f266c32e data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json +3a1343668f1210bc0efb10071d146dcb42ec52c4 data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json +ef06874491e5ff2489b062f9b9d0b57d2efd8217 data/modern_industrialization/recipe/vanilla_recipes/chains.json +c5414ac20374e716c490ff26d1ec76ff2e5b94c3 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json +9c37b5ddc6cead94cc9fe7006baf5c020fe3c329 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json +e28ce7552ec16560bbb6bac411fbea473adefbf2 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json +36749714446e810bb1066d996c3148c217ed2f6e data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json +7355d28ed5010c9366c49a00762884e177c72fff data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json +73f3e4df7f370983b3c6945dc6d64a95ab94c517 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json +2387f98cceef7e5e7505fae6ed845df553323254 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json +146832c50bbd156522e0c20ecab35b1e4cb042c8 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json +3767e6be7ed492ebc2c313cc2b3f55486d627939 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/copper_block.json +cd8445d026c61dd97b36545a9397563f0467217c data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper.json +838fcbca1cc27a0dc3774982b892dfa48aac7844 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_slab.json +ad60d1cddd40d33d7c48b5c3d31418f4c084575c data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_stairs.json +3fb903f92fdb23723c4f881f2146d5dd45e556fb data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_copper.json +4896f22a0507ef43c5eefbad97fd28b386f85d6d data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper.json +6bc3fa248ba8e161f2071bb657654db770e5a0e9 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_slab.json +266d1b9a7c8b6ebaccd60b0fdf493b4957d74de4 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_stairs.json +e8ba3ad1c4cbb560f7b74178ae32150f235086d9 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_copper.json +2bf9f13f6d0ce6232c34e5ec7538eb7352c5ba22 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper.json +c25fdf3c280524531292499e11d01cf0c0ce4646 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_slab.json +e6bd8d733428ce803d5bff3e2f447ce2313e4a21 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_stairs.json +15b6d130b5d72e1684325f7e7968de6c5f2ab5b6 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_copper.json +ea76b59faefc92ad3fc8f818fccdbbb8146e1244 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper.json +50c015be5f1358b02e3525dfd228f491e6eded34 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_slab.json +6a5ddedc80e87f7e66dd41b5efb6301f78cd0835 data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_stairs.json +85509f457a4ae0e9508492b85761cb242c9f0a31 data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json +58f52a75a29576daca73d5622d3bf69596bfa44d data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json +c5bf4beee2aaa3299102da05e98dee3f81595b5a data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json +38a254560a52d7de5fc437423a070750bfef09ac data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json +1fd8e23b01b125e0c1629ab0d9d24ae1acfa1f58 data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json +2b8ceb99b70900bd1ec89fae8912897ce895acbf data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json +aa97e40fdaf2fa80b104b9b57f602145117ac3b4 data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json +8acc7a4f88fd7048384c674afaedd0a68e12b8fa data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json +a04783b0635fa9b145f159029db7825245b8f6f4 data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json +a1e550a489e80a99dcb3987e3a6e3defb622bbdf data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json +3c58fa3d5841d4b14bb41bba4e8eb2aa64b1bbaa data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json +2f51ad3f1d4138d872c73eeef4725e30446c8078 data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json +df4b302282ccd5540e7c70b4d19a409aa0c78855 data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json +76c7d754152a8b97fa5de03ac87bc512c8c52025 data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json +08bd80420df87049282beb6ab9e6d15a8cc68b88 data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json +5516b4d09fb69677789ee27a3b0c2c12bc339a5d data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json +7ebc0fc09271a189a4252dbbea05715c8bbac8b1 data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json +1945b49e2ee1d680a6be3b74b28f534b61fd5954 data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json +e2afead0901e11406ca7cbddba91dc86bc56edc4 data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json +3378d3714d82dd846c98f1c570443a3f0b6e91c0 data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json +a617cd738cfdb9210eab714cd737c35c3b2a4126 data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json +31558d66f4c04cc80b577c58d14c141e92921b7f data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json +cc849f067c097ee1ad4e6772f287f86ea5347c17 data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json +b1f1807924c01f2f4043f57582aecf94bd5ba530 data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json +9d4f5774cf944e4adb0dde07efc76e49af1ee3d6 data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json +aa9c7256bed1e5b18cdc64d939f4d018a623e5de data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json +1aceb0a67312aaf7a6417f780c60d971a5e04e84 data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json +a215f25d5932c184849aea9364296369d9846e9c data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json +505826deeef438f502d3c5fd92f3941c970489b7 data/modern_industrialization/recipe/vanilla_recipes/macerator/stone_to_cobblestone.json +c2b230367c05b792fcfdd17b531c14596184dbe4 data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json +576bfe151102d2c853b3f62141e87cf768158133 data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json +0fbeadb79922acf4a0254d9b7fa9b2f4a682259c data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json +a9363e45b6a6cae0fe54d742009340d1a7f3b7e7 data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json +3bacb0c76e4d0f16e1c16ec9f113cf344a9cb432 data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json +b1d56d8694b13a41a2f0494552fc0c25ea864286 data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json +b8dc1354607f6e2b231b638613787d99aa58dec0 data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json +d086be8e537cd5784f7b49470890b6900032a4e0 data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json +c7733a397cde15e0301593dae6001093356b663c data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json +5bfcbaed0d128d1d3dd8514f2ca26539fdc3c217 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json +fdf90618be065466c86a0804e9ade0463405117b data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json +2a962f34a1302154277395f48aa46ce12d043136 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json +b8b7e5ba90915cb1159b88f0c2c8153e7d89b44e data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json +48ce31a862da0c1800725628795d75b2550b2cc5 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json +8077fc9393c59db14c2a165bfef01214b7892821 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json +738c7c496ebe794aa86eba5acd1ceaa97ecc2b21 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json +ad6f0025d2f280fc759b69be9fdce33d735ddee8 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json +52a5aaa961a893923b8468a767dfd69d3327a5d3 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json +34d2842bb6882310fb8be4ee369530c2d0ea7e8a data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json +4a503c659ecc972d64d21e642a5caa339e5520d1 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json +dae6940a7fa08ce7f355402e460aad4b02200e51 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json +f51e6eddd4100b0729ebb6ad08359549ede5235d data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json +fa4ab433ac5c3e954d47f3c29d4bf507ca5ae96b data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json +dd79fd0407ae4509d84cf43ca8c7360015ff1565 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json +39f1d7948aed16e17054055ad42842c61edb6b80 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json +1e604229289c82e3da0db0c66814f59d480d1c2f data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json +59e27c7e926a02a042de06a18eb557acd1849aee data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json +9e8e80441ebc5c837c34aca3725dead230f8eb5f data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json +3928df8d07ff80b5b539829c161e043df20fe510 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json +0002c276d8b5d424372215467d10d197f5e8c092 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json +1c85a9bca56a5c62b6fb8b396aba5b5d7e25fcc6 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json +af715c44725d27e95125b42422b6b2d809729ba5 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json +864b4c3446b5df7c19856a252f2d7a5428ec3e1c data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json +c58f6405164d8af1e0c992bfc03ad37eef792e00 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json +45de886e544338102ae99668c20766dbf7e93a88 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json +a363157f8e432112a74f8fc31f1640111b42077f data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json +0d919d8036ea0ff08a52c24e08dfb34a0a3b71fa data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json +64bd472cf339b6c56a9e077e7d8416c737a1e440 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json +d3baa9345fce477df0ff61e1a2cc5c792799c399 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json +b023e1072eb8b5324eade3a6eb9172b020386838 data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json +6173294179d938f10676f58dce5927068669f1a2 data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json +33205d9511d6465293ed4e76dfdd4c3c3862f284 data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json +aa79fbb1c2c4973a93220096f78e6e685e3c8a03 data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json +6ceeb892aa9ff0c2c8b7e04c247e06f6e143d68e data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json +38ee121966b37a13d3dbbcb4b03bdef6af6af3d1 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json +3bdaf2d2db47070f904e9b5aef408b9f7208c22b data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json +04e09c10055b3c86ce1cefd59ca91b4e5178c043 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json +76a6e71b68268a9f2b39fcc875f24fcda181085a data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json +d26290ad38f4e2999af0eecc4f925cd30fa56f4a data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json +55e59fae24513cd798fa46aa270879768d4acbfe data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json +63cd62baf715c237c27e233e8b06baf68ed89a46 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json +ea7d12035a96727e5ee050f27ce597ab4fc9bfb0 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json +ee177f7a10243c3e25309279f073c6a4e45d91f6 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json +9ac6a0f943562fe39f6392f3461d1f56cc614819 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json +ca6d97f3975baab0e6083750f1fe79cb6dbb9e83 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json +3ac18f98062c7e04dc80a30025962392a9c5124e data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json +30d15389580bed5caee65175da326024b448ad3e data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json +2fc11a640a30403cba754bd73b9c2f25d99be5b6 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json +edf6a7e8e6f3f35011496df5a36f566aca76e96d data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json +07d238d178c6a4976a1f3c3364d901d1cf627771 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json +7f69e94eea8f8012122e79a9539006e5d71298a9 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json +56434f62fdc860c24ac67a9caefce01f9b8e4310 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json +dad5bbb813f83bfa69d1c415d845f99fbd611b2d data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json +8a51c097a0c42d6f67ec0f639c583cb63289b00e data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json +67d2e02e6a02aecd272e6bb6eec266170253f5bb data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json +1742e7f672565dec0f1c296bacab0f7a5d9960bc data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json +38688104c37d981c229daa424df8bd3f58f8a2ba data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json +7cb87fd12d898331effb499c975715dd150cc1f5 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json +3b42b124eff6cae7016021ea7aab1bda170773c4 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json +8a28fbe99920c7ad5aa553533712b46be7365075 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json +dfbdcf26bc30757870239f494a6f582600c355ed data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json +c11e5c93e3154e4160451b7ccb217fa7d8b33924 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json +33802fa489b4345d5cea35621e2ed3e021536b0a data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json +f4f6bbed0050e979dce09322e620ce93a338f03b data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json +b279969d6824e820d8a06e6a7e1464beaafa8a53 data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json +d3e4b69029a890d9702b21b2feff8a3371482acb data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json +261e4d31a8c431bac8469c6141a01355018c7dff data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json +a73fbd2174afd79a8d7cfb8579ce2da3336deb8d data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json +9826b5deed310f6b735d58b60b364dbdce5cff56 data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json +626de08cb3ff996a3630f42f8b48cdb68ce50849 data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json +aa57bbc8f61fbe3eb97834b6e00f582010458248 data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json +c698cedacc4cc87380cbeb42120ef8e83e419421 data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json +ef7b30e7ffe5c071a7382e9a1513b083a3fbe2c5 data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json +16bd4e5f25adfea830cc3ba7f2ac64e9b7819e1c data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json +454d41eb9a809b5bc4fc9e11b2c97cef1031b2e0 data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json +9ced27d18c322106309b90dbbc0e6ccc659e7cfe data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json +4bfb98c6b79a77e946bd3742a2ea875d48f6d42e data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json +c0b134f53c40a873dafa7848f39a8114976d44f6 data/modern_industrialization/recipe/vanilla_recipes/oxidation/copper_block.json +421aab83ec954d96178c75598c16149a672c69fb data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper.json +338a7c2adfa04d53c51714467fd94fc79a7717bb data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_slab.json +d03e8ef290332f2e300c9c19f4c39a018156ea16 data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_stairs.json +8a5e3bf595043c02f30f733aa0210adb09e486ce data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_copper.json +bd079d1238f4935e36e0a0d9afd514ee02d8ec78 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper.json +1501a09a2066e0c19f5051ebd706210753df8b29 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_slab.json +c1e8793b200cdb3decd8ed22ed34aa0f29d5c122 data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_stairs.json +332f993d707e1045ac7eea1a3a453fda3b5ff234 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_copper_block.json +e5ec391783ca51f9c4c4a5b5feb9bd307c89242c data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper.json +a770b6eeffa1c480cab594074de18492ce70c2e1 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_slab.json +cbc793196b978fcefd1d20a0266af2c297057953 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_stairs.json +fb1525c7efca8b7c409bbeff864016f4bb3a4883 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_copper.json +6f082d0a5bd1d1800611b9c5e2447e1826a4c0e4 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper.json +cd8606ec1072a8678f193c9ad8f710d87f64b87b data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_slab.json +3231f581be34435e62cf137f5e93ce887cbddfd4 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_stairs.json +f6d2f821621dd659140c17f6419b43501aad6df9 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_copper.json +f1af8e58df891bb92c5a955ebd7e3b6549b01062 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper.json +09722fb540bcfe6595c1bca299a8312f2e1d0efe data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_slab.json +d686269788749db9d0dca5d05aa87833ba01ab01 data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_stairs.json +d145548da54b2c09cda20cd5997902d99b5bd0a0 data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_copper.json +8d1d8798f5466d81ea2d3cedbd434593dcf52d45 data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper.json +8c7a6904830f7ee3d75bd6f012f9f2d23a41f4f4 data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_slab.json +6eb82cee9fb563f8c5919171ca16ac8758158bf3 data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_stairs.json +7a651d671f88bd140fc95aae877005257323a705 data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json +39d232f255cf8dd826a7ad4ab04d0d467c887e59 data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json +bd4a7b12813256ab1e74bd615383e678a7a0c96a data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json +31f4d6198a6a669be340aa55ffa7ddf1b949fd02 data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json +caef5c8e6ff18ef20f26ee436d1615e029e92741 data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json +24af8c79b45f0f671dc864e16ed0634ac5d48d97 data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json +d17be7741fea010bc733ada6b9b1f970a67af7ac data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json +21ae929c63002f30e0f8b510d906d2ca3155f00a data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json +bc4d0a8036e4d9d0e9ba57499d90a851362f62ad data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json +47e0a4a989616e54200e434b8178db9d720ed692 data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json +95c713eff37619def9090bc5de7291ec23f229b1 data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json +b9e34f92ffaeda7584c8710f6dbdf9924d8a21ac data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json +1d73c33a84abc45594b4bf722148a8fa22f50805 data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json +5a9426ea27479b348fa354674f9d52bc3dda1927 data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json +9d9e51c6edaf451cb30ebd024252524ba3130d2f data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json +5e79f06a0119ac657ccfd46e08f87c28794a6b10 data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json +dbe3f28f8ae98808ee1e7566d5ea9764b5ccef80 data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json +a4dfbef3d1f17c33db19a11733df6a860ced37f9 data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json +3a9fd8aa37a4819fb2d73c1410de0bfb02f8ad94 data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json +5eff563dc459bc4afb8ecc9b98b1122f1030fc65 data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json +3367cb2cfb25ceb91ad0ddd7a3122e9039b3e95e data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json +3edf8de2d3202598bb9e132b5dda58b6d22bf6e9 data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json +dc99103f50ac407a06b074d220292478974d6e62 data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json +b24e990508dcfd720efebdda08d0583eafcfaf2b data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json +9438f7e4204f095213c5f2c41935e7dcfaebf9c0 data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json +8f746932ebe34124399dac7b3556fabbcc3c0a08 data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json +7c60f8c9e39db2a01950ad3d21308619d3314a15 data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json +f9599353dffcddb5799161d15849b009920397be data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json +0b63391764d7df367065a595a44e88cf002e55f1 data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json +65a65a2becafa0de20e7e50b252868ef81ea20a9 data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json +6334f3b5383812aa15beb490dd870d9de14d3e9d data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json +f5243464f84fe84ebc22eab580b3e67dbf686108 data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json +acfa4723f3ddccdf0fed264827cd94727d55e292 data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json +89f144325befdca9a8f9a3e832d6520595f6194f data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json +16153a4cf1fff3dc8bb63179e27c3b9181dc6584 data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json +f33771861921d8768fa6cbe0617891b19ed3f969 data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json +0b7f254667c9a709c5003b10590ef8b30e73f6e6 data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json +13b7f1121e1a9e84e9bedd5023afcc184c4674f1 data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json +928c4ef05dde7098e88e92b7ae654fa31d60a6e6 data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json +def0e379857b8db04812839f9645df821ab21f9a data/modern_industrialization/recipe/vanilla_recipes/steel_anvil.json +1fb469157442149ce748c372c253ce025444a4fb data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer.json +8b52601e1ff2d8e4b43c6b7fafc9fb1431c9c3fc data/modern_industrialization/recipe/vanilla_recipes/steel_hopper.json +4e98ecebacacebc7d369baa54c90a88eb1d6e1e1 data/modern_industrialization/recipe/vanilla_recipes/torch.json +d7013abaa42dbddf4e9370f934825fa5f98bbc20 data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json +5976b94c1a265c8fd8690ad9db0690cd5fa59f92 data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json +c11775060fec1efb4481ca6c2e7d4add9d8812fd data/modern_industrialization/recipe/vanilla_recipes/waxing/copper_block.json +a10fddda80dd2c84583d0d9f5864571a79b8d097 data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper.json +55748dd702f2962f03b179483c2c118f18fccb73 data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_slab.json +fd2a41b36397e119fd433370c1223d0317e04ace data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_stairs.json +2008447fdb3be548cca11d89da7e2b74a0643b00 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_copper.json +d12e47673d72bf618cc24d231c7716fd3a215d43 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper.json +40a7f9ee175aee1359e28d5cbd014f4dcc8f6217 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_slab.json +2a8f3058d8cf215669b384de69d522cc58ed4e89 data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_stairs.json +c0bc2f658adfc2a151cccd2de1080ee582bccf07 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_copper.json +c8151b76db26bab315602af0d0de8e065df70e54 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper.json +9378ab8bc8aca302649e2f594fc67e981f51b38b data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_slab.json +4df51ab204eb000e6c0663caf28258a0d5e83528 data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_stairs.json +c51abed4065e15de94f00723b343020c98daecd1 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_copper.json +8b42625e8d927e805c25509781969123b40dd18c data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper.json +ab5f9e0f687a5c048b21592ad38358ab80da47f9 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_slab.json +05abf26e350e42e44aabdb2d0256f2033fb183b8 data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_stairs.json +1f8b08000000000000ff8dd6bd8a23571845d1d27f771b277e1cc7133b742e0f3208cf740f2d457e1a3faaa78db70263be55053710ec1bd44214e765599e97fdedfae765b72ccbc779ea3c2f4f97d7fbf57ebddc968fe77939fef6e5edf31fb79765d97effb5fbf676ebd2e3d92d87dbfd7cbffc7be3ff9acd8a66bba2d9ad68f62b9ac38ae6b8a2390dcd66854fcde45333f9d44c3e35934fcde45333f9d44c3edb153e35934fcde45333f9d44c3e35934fcde45333f93cfe672b9ac9a766f2a9997c6a269f9ac9a766f2a9997cf62b7c6a269f9ac9a766f2a9997c6a269f9ac9a766f239acf0a9997c6a269f9ac9a766f2a9997c6a269f9ac9e7b8c2a766f2a9997c6a269f9ac9a766f2a9997c6a269fd30a9f9ac9a766f2a9997c6a269f9ac9a766f2a9997cfe796ff8d468ff6ce053a3fdb3814f8df6cf063e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff27958af68b47fe453a3fd239f1aed1ff9ec57f8d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed9f2d7c6ab47fb6f0a9d1fed9c2a746fb670b9f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fed9c1a746fb67079f1aed9f1d7c6ab47f76f0a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe91cfc37b45a3fd239f8ef68f7c1edfe0158df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df6cf1e3e35da3f7bf8d468ffece153a3fdb3874f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ff1ce053a3fd73804f8df6cf013e35da3f07f8d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df6cf113e35da3f47f8d468ff1ce153a3fd73844f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239fc7b77545a3fd239ffd0a9f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd73824f8df6cf093e35da3f27f8d468ff9ce053a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35da3ff2a9d1fe914f8df68f7c6ab47fe453a3fd239f1aed1ff9d468ffc8a746fb473e35fff5397d3b7fb9dcef97978f777e5af6bf9cbf5e961fbf5e5f2f9fdfcfbfdf7f3e5fdfbfdfffe1d3f97efef5f27ebbbebd2ecb4f7f2d7f03fa1be7c872480000 data/modern_industrialization/structure/empty.nbt diff --git a/src/generated/resources/.cache/4cdec22d5c12d9e86c7c84e8b78a8d68f11d5e8e b/src/generated/resources/.cache/4cdec22d5c12d9e86c7c84e8b78a8d68f11d5e8e index 7b7464766..5ff12e414 100644 --- a/src/generated/resources/.cache/4cdec22d5c12d9e86c7c84e8b78a8d68f11d5e8e +++ b/src/generated/resources/.cache/4cdec22d5c12d9e86c7c84e8b78a8d68f11d5e8e @@ -1,2 +1,2 @@ -// 1.21.1 2024-09-04T12:33:40.4168174 atlases generator for modern_industrialization +// 26.1-snapshot-4 2026-02-03T21:47:16.5610262 atlases generator for modern_industrialization 79db7951c20c5c4a4aaa2c58faf881ee8065f0b6 assets/minecraft/atlases/blocks.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 707daa14c..3adeaf9f6 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2025-10-17T22:04:47.2313843 Loot Tables +// 26.1-snapshot-4 2026-02-03T21:47:16.5350226 Loot Tables 8c7d1d16523de7745a32c402944c31b28e7b747d data/modern_industrialization/loot_table/blocks/advanced_fluid_input_hatch.json 06b622fd132363a136550c1b17ff15c63f5924bb data/modern_industrialization/loot_table/blocks/advanced_fluid_output_hatch.json 5ced05c7031a139315bf3450fad0d7acb9b93de3 data/modern_industrialization/loot_table/blocks/advanced_item_input_hatch.json diff --git a/src/generated/resources/.cache/5aa8824d5c3096f4df15e810b0938086516cca9b b/src/generated/resources/.cache/5aa8824d5c3096f4df15e810b0938086516cca9b index 922b1b207..be6d503cd 100644 --- a/src/generated/resources/.cache/5aa8824d5c3096f4df15e810b0938086516cca9b +++ b/src/generated/resources/.cache/5aa8824d5c3096f4df15e810b0938086516cca9b @@ -1,5 +1,5 @@ -// 1.21.1 2025-10-17T22:04:47.2559865 Textures -e0a301ec505baa61cef49fc21e62816b91122e7a assets/modern_industrialization/textures/block/advanced_machine_casing.png +// 26.1-snapshot-4 2026-02-03T21:47:16.5630255 Textures +45aeb65e8761f62810bab67885a31ccbcb5adf01 assets/modern_industrialization/textures/block/advanced_machine_casing.png 487b5b34a4ef6d847bdc50266d00e31a34a2e17a assets/modern_industrialization/textures/block/aluminum_barrel_side.png 63fe04dc6b85faf4af6fea9cc3bbcd181a40e979 assets/modern_industrialization/textures/block/aluminum_barrel_top.png 2373e7e95f920e7bb3024324bb13809b016b3e90 assets/modern_industrialization/textures/block/aluminum_block.png @@ -11,68 +11,68 @@ bcc6696e4af2f94aede0ad71340890fae145dcec assets/modern_industrialization/texture 649f1756a994feb459491f3b5ae4dece69ba15f0 assets/modern_industrialization/textures/block/bauxite_block.png 76c30190be18d6a894087e0747fc1a4ff0a7ebbb assets/modern_industrialization/textures/block/bauxite_ore.png 7031789891d6c9a1358129c961cab779eff72ec9 assets/modern_industrialization/textures/block/beryllium_block.png -bc679830ec8c2d6ef39d1bb9d8a8bee57e6db1e8 assets/modern_industrialization/textures/block/blastproof_casing.png +a883d79bbab81258b0758770e2eeea807fd9e4fa assets/modern_industrialization/textures/block/blastproof_casing.png 0b8cd9b07e1bb3648a2cd49c706153f0daf9e27f assets/modern_industrialization/textures/block/bronze_barrel_side.png 5fefc57ffbed75d2b5147e908988a7e7d8c521d2 assets/modern_industrialization/textures/block/bronze_barrel_top.png 6ba5ebc424a3f9c904eb41d21e4e615672c3b202 assets/modern_industrialization/textures/block/bronze_block.png -847e1bc2d2f949c59b6cc9af07f57aa481e7c114 assets/modern_industrialization/textures/block/bronze_machine_casing.png -d2043744d205081905bf24e7346a9cca0dfb4ee7 assets/modern_industrialization/textures/block/bronze_machine_casing_pipe.png -b5fab0e8c7721ce891c39408f9c4181a09c45a3e assets/modern_industrialization/textures/block/bronze_plated_bricks.png +559d33a8767cf4292ccf74d4f76e2bd8b849f33f assets/modern_industrialization/textures/block/bronze_machine_casing.png +a95c65b43aba07ec5000cdcb05c9a1b2e1d9e174 assets/modern_industrialization/textures/block/bronze_machine_casing_pipe.png +a2cc9740a56128b4f2c61b6d7ff9de939567e655 assets/modern_industrialization/textures/block/bronze_plated_bricks.png 4465b172c08a7902fd3eb92527ad06cc53e40e52 assets/modern_industrialization/textures/block/bronze_tank.png -1d4a58681d44eaacfe40ad0b0097b8aa9806d32f assets/modern_industrialization/textures/block/casings/bricked_bronze.png +31261dcc727840fa1a18933e0aa1e2be17559399 assets/modern_industrialization/textures/block/casings/bricked_bronze.png 6b0bb51add3d5abfa8ac642d2085796975581a62 assets/modern_industrialization/textures/block/casings/bricked_steel.png a748998452bc08da2c6a223be63c9ccc8106de1c assets/modern_industrialization/textures/block/chromium_block.png -b9de0974d13c20a10f68c679718c24e9b7263af4 assets/modern_industrialization/textures/block/clean_stainless_steel_machine_casing.png +962003932d414e2ce451fc09089e2f70e7bd59d6 assets/modern_industrialization/textures/block/clean_stainless_steel_machine_casing.png b048d8995afd71c39c4038afe12d2950c7180e07 assets/modern_industrialization/textures/block/coke_block.png 229cf5ea97dcb8f54e12be696560a4996db06fa1 assets/modern_industrialization/textures/block/cupronickel_block.png 1c7f937ddcdca77fd9c9c715d0c49d586ec1bf2a assets/modern_industrialization/textures/block/cupronickel_coil_side.png -085d056fd53f1489e8877d6d727e30acc5e5a76d assets/modern_industrialization/textures/block/cupronickel_coil_top.png +8e57d2f22b99e061ff222949090df2b916c75967 assets/modern_industrialization/textures/block/cupronickel_coil_top.png 8b0ca253b1a3449b37c5c9fe997be6d72e66d85a assets/modern_industrialization/textures/block/deepslate_antimony_ore.png 0a438bc8cc0df91b20ec1e49ea7a23648fb7fe2c assets/modern_industrialization/textures/block/deepslate_bauxite_ore.png 24886273373362cd3f0938315c5631f67211e3b5 assets/modern_industrialization/textures/block/deepslate_lead_ore.png -1289b7dbe9be999f89a9be5c803c19326d307063 assets/modern_industrialization/textures/block/deepslate_lignite_coal_ore.png -a562d3671aea171a7c8b3896013bf085448af49f assets/modern_industrialization/textures/block/deepslate_monazite_ore.png +ae33412f7b54dc259af97913525f6b44b0be32d2 assets/modern_industrialization/textures/block/deepslate_lignite_coal_ore.png +e1f06a228807037391a5d6f46889099fd734f03e assets/modern_industrialization/textures/block/deepslate_monazite_ore.png 4330e69e011dcfd072da66300a55a01374389565 assets/modern_industrialization/textures/block/deepslate_nickel_ore.png -222ed996c13abb1be84de937735cbb91abd161f0 assets/modern_industrialization/textures/block/deepslate_salt_ore.png +a0fb36afd4ef2c289853247c8ffd687f804c480c assets/modern_industrialization/textures/block/deepslate_salt_ore.png 53c0ba8eb7671df5f3eb5cf82302d5c38a0dd75a assets/modern_industrialization/textures/block/deepslate_tin_ore.png 83faaa691bb9342cf9e5dd8531fc599bd5305bad assets/modern_industrialization/textures/block/deepslate_tungsten_ore.png 71041d9d08e9a43436019abbc50d02ba5b6e26c6 assets/modern_industrialization/textures/block/deepslate_uranium_ore.png 391e6e588c5bbb09ddfb3d141b0a6d757c47888a assets/modern_industrialization/textures/block/electrum_block.png -bf63c13affb74331c1343b149b6d6e3a6a1ed3f4 assets/modern_industrialization/textures/block/frostproof_machine_casing.png -3ebafacbe1155cd458f35ac531180c28efc45338 assets/modern_industrialization/textures/block/heatproof_machine_casing.png +c19f7a9f8c2b373e4592d81eb901ee915990b1b8 assets/modern_industrialization/textures/block/frostproof_machine_casing.png +f3ba0232448b1b3c8f150aea7564f627ba34d25a assets/modern_industrialization/textures/block/heatproof_machine_casing.png 79517e05a830ea2207a67a594f87c06c0fa12fe0 assets/modern_industrialization/textures/block/he_mox_block.png d65b9dd2ca67d7171caca17474e8206ca3398e2e assets/modern_industrialization/textures/block/he_uranium_block.png -af1d359afd8c42fbdfde2d5f4849cc9dcfd31b06 assets/modern_industrialization/textures/block/highly_advanced_machine_casing.png +462a306b23d164574d2b45a20dd059de92c9d155 assets/modern_industrialization/textures/block/highly_advanced_machine_casing.png e13e7535528b0c4fac4846e02fbd7ae8488dc2f1 assets/modern_industrialization/textures/block/invar_block.png f8fc3d11c6ccab39396910f6010fd50090fc3886 assets/modern_industrialization/textures/block/iridium_block.png -442c078a005dae83b21556b2a99b239f5add19dc assets/modern_industrialization/textures/block/iridium_machine_casing_pipe.png +a3d7a967bcb7fb425507ceba6703e5d40c7df91a assets/modern_industrialization/textures/block/iridium_machine_casing_pipe.png 8a4caa53c159f374e2a242c8ec9c3df773a4b426 assets/modern_industrialization/textures/block/iridium_ore.png d9a5fcd0c76b1a3ac9bd694984bd3799a427da9f assets/modern_industrialization/textures/block/iron_barrel_side.png 8ccc32929b25d92b1efaba1e7b103cad3fd05a47 assets/modern_industrialization/textures/block/iron_barrel_top.png ccc4cdda4715c09e0dbc1ad0dd79c7925a71346b assets/modern_industrialization/textures/block/iron_tank.png 73af2af455299ff4fd754e187f4269046b5db3d0 assets/modern_industrialization/textures/block/kanthal_block.png b7072c32255d145e16df20dfd9add8c7babdaff7 assets/modern_industrialization/textures/block/kanthal_coil_side.png -18c2b722da1a08d11800133f546fde31ee1a3a75 assets/modern_industrialization/textures/block/kanthal_coil_top.png +b8b3c9d26cadb87a39150c4455d711e3f9a29c51 assets/modern_industrialization/textures/block/kanthal_coil_top.png b9b97257c7d420b7d92e3bc7b597f27da67a7dd5 assets/modern_industrialization/textures/block/lead_block.png 8161165f6cde3f91c78d9601511f1ef4f93b8096 assets/modern_industrialization/textures/block/lead_ore.png 86ee25b6fa304554d01eef128337997548424149 assets/modern_industrialization/textures/block/le_mox_block.png 8352692a1f4fa4aeca3d4393bea33b4addffc911 assets/modern_industrialization/textures/block/le_uranium_block.png df3529a6ea38846ba02919beeb295a87f28a580b assets/modern_industrialization/textures/block/lignite_coal_block.png -701691c57f7608ca5a08aaeb8d62dc206f635633 assets/modern_industrialization/textures/block/lignite_coal_ore.png -d67257b63d0f25899f20abf4ca647056a5cc5ff6 assets/modern_industrialization/textures/block/monazite_block.png -98c1e80ef558aee59553f656ae652d8dd21b5c0a assets/modern_industrialization/textures/block/monazite_ore.png +bed59e9f052eae68fc41e76df42863dc34901a2a assets/modern_industrialization/textures/block/lignite_coal_ore.png +1abb28d607ed8c330180eda0554af61b8ebeef4b assets/modern_industrialization/textures/block/monazite_block.png +0fb899d71c2ba1e2fc04bf4ea8f806d9c3275912 assets/modern_industrialization/textures/block/monazite_ore.png 0f2f54c6937d5d3bbaee29feea4871817a4e1e18 assets/modern_industrialization/textures/block/neodymium_block.png 2a122662497a24743aba6128850d83883167ece9 assets/modern_industrialization/textures/block/nickel_block.png b756b3ed0c2380cd007af60c5d50154cc6558aa3 assets/modern_industrialization/textures/block/nickel_ore.png -8b4a60c8d6bea5c92de9113561e5fa04ed2964c9 assets/modern_industrialization/textures/block/nuclear_alloy_machine_casing_pipe.png -733b2c4871f0353dc099a391462a684c2be68819 assets/modern_industrialization/textures/block/nuclear_casing.png -047264a29537f3f270dcf02d247fb1888e32ec64 assets/modern_industrialization/textures/block/plasma_handling_iridium_machine_casing.png +be00b853b1e8addc92924cda88fc061780be8943 assets/modern_industrialization/textures/block/nuclear_alloy_machine_casing_pipe.png +afc1d3b1077bbf6d74cae6238c5ed73b5dbf40de assets/modern_industrialization/textures/block/nuclear_casing.png +f010c013ed06334375f66a1e4e2edeacf7d558b7 assets/modern_industrialization/textures/block/plasma_handling_iridium_machine_casing.png dcfbab0f09b6c721391ca36f1cd7b9e1c12dd1ef assets/modern_industrialization/textures/block/platinum_block.png 74aca739bfdcea34481395317918141b19f4c8b3 assets/modern_industrialization/textures/block/platinum_ore.png 1716b3b5b6d79aa3eefc7d953ef17c6447058153 assets/modern_industrialization/textures/block/plutonium_block.png a60c89c93413f2fafea8cb64d560db0343dff9cf assets/modern_industrialization/textures/block/quantum_barrel_side.png 8d0e0c850c624abd9f6e020c7bd5c401a06a4ec1 assets/modern_industrialization/textures/block/quantum_barrel_top.png -3fe55db13623e04a35a3605c7424984be42bd9ad assets/modern_industrialization/textures/block/quantum_machine_casing.png +eeb679c3ba69bac5f9b430433f3b0418a9a489e9 assets/modern_industrialization/textures/block/quantum_machine_casing.png 94e3f0cb5003b11e0b42185ae84974cf28eb2a6d assets/modern_industrialization/textures/block/quantum_tank.png 5238b0053106e15681a4e96b35d1ae7c188cbb08 assets/modern_industrialization/textures/block/quartz_ore.png 50896a84802725e4d3d0cccb0bd78d8e8552ed22 assets/modern_industrialization/textures/block/raw_antimony_block.png @@ -86,189 +86,189 @@ a0938a3dd2a449a1c2fe6a83ec8b8fdd00055b9e assets/modern_industrialization/texture 1b5e29aa49b1afc796e1e9cfcca99a96c0e407ab assets/modern_industrialization/textures/block/raw_tungsten_block.png d2bc73172795f641cff086b0f6d135b430074621 assets/modern_industrialization/textures/block/raw_uranium_block.png 6e7c9947e5858e45852ab4e662312918fbb91422 assets/modern_industrialization/textures/block/salt_block.png -4dc22e311b87c5d6033b5cb9ba30701105983eef assets/modern_industrialization/textures/block/salt_ore.png +b11d435a2df5745e87b176ce604de4da191db72f assets/modern_industrialization/textures/block/salt_ore.png e394d5e61a8b6d91a4cea66adfe13082c8b1cf23 assets/modern_industrialization/textures/block/silicon_block.png 63109e9bfecccb8e7d0fc6987d602f95ba97a139 assets/modern_industrialization/textures/block/silver_block.png 4590682d0ef38cb1e8be63e61486e5982630c355 assets/modern_industrialization/textures/block/sodium_block.png b7ec0d420ba61a93ad12089d9b0fcf2358e23a42 assets/modern_industrialization/textures/block/soldering_alloy_block.png -5ee148448274c1771744a8dcee9dbe5521fc4764 assets/modern_industrialization/textures/block/solid_titanium_machine_casing.png +efd83e9eef45c7d52f0d5b645efeed1cf36e9c64 assets/modern_industrialization/textures/block/solid_titanium_machine_casing.png 10c9a21ab28642ed6f301564c3dfc943ae88a014 assets/modern_industrialization/textures/block/stainless_steel_barrel_side.png 15ccd5e2a2956096a4cbf4574427e51e55d13b76 assets/modern_industrialization/textures/block/stainless_steel_barrel_top.png c1658094a28aead0c98eb375c8250ca4003aa7d0 assets/modern_industrialization/textures/block/stainless_steel_block.png -1430ccaff51fec9a7ad09bbc1f24f4b5a88d151d assets/modern_industrialization/textures/block/stainless_steel_machine_casing_pipe.png +71fa4baa3ff947652b1dfbd255ed34a09b421053 assets/modern_industrialization/textures/block/stainless_steel_machine_casing_pipe.png 54f8a97e9ab36024a486c749bda7ee40f7779e24 assets/modern_industrialization/textures/block/stainless_steel_tank.png 7ac33edb34d86f71219fbff5db9993978c79106b assets/modern_industrialization/textures/block/steel_barrel_side.png 32004dfaadc581d840a72ae1c30e278082f5f3d4 assets/modern_industrialization/textures/block/steel_barrel_top.png cd22465972ba06dd80b6f74ff568e3acec999203 assets/modern_industrialization/textures/block/steel_block.png -e3cb18a73f1c8c870dce2816e148ac28dd0c62f1 assets/modern_industrialization/textures/block/steel_machine_casing.png -43561905dfa745ae56def1a608245a439aeedf7f assets/modern_industrialization/textures/block/steel_machine_casing_pipe.png +3d4ee8380d999676e70eee6e95d6c6176b2e13b3 assets/modern_industrialization/textures/block/steel_machine_casing.png +97ed71898835b613da8bc6337523205809c312c5 assets/modern_industrialization/textures/block/steel_machine_casing_pipe.png 9b6e382f6d07b31a334d35d784b0f38fbb861fcf assets/modern_industrialization/textures/block/steel_tank.png 5a97b0d021a63fbdedcddb76eda73a4a738e775e assets/modern_industrialization/textures/block/sulfur_block.png 78721f944302a58d0edf5dbeacc2bec18f675a2b assets/modern_industrialization/textures/block/superconductor_coil_side.png -0381e93fdc6a2074e728a78f0c01a57340e79c93 assets/modern_industrialization/textures/block/superconductor_coil_top.png +943c92cc2f338b66c93cf72c53f32f5fda39104b assets/modern_industrialization/textures/block/superconductor_coil_top.png 13238704f219546f6bd058805290c82632a88700 assets/modern_industrialization/textures/block/tin_block.png 8f6f4a3fb87e83ac98708d7e7147275eb40b55e7 assets/modern_industrialization/textures/block/tin_ore.png 28c1c8d0a52f0f76d20b81985c010ae71ca49172 assets/modern_industrialization/textures/block/titanium_barrel_side.png 477d2c9c02101ea62fd6a9f7d416a736617077e2 assets/modern_industrialization/textures/block/titanium_barrel_top.png 5a96890c88c5c3224a6d60887e6ee6d2fb4a6993 assets/modern_industrialization/textures/block/titanium_block.png -1e334ba3fcadb1d02f4d55f8aa07ba5caed4054f assets/modern_industrialization/textures/block/titanium_machine_casing_pipe.png +4e46b9da66b69c26c60af0962b9297bc74e51695 assets/modern_industrialization/textures/block/titanium_machine_casing_pipe.png 989be5899ebd5dbbf7cf7cd6d0587104fded0f4a assets/modern_industrialization/textures/block/titanium_ore.png 4a9bc360340704c0e7c60478d29cdb25ca2020ee assets/modern_industrialization/textures/block/titanium_tank.png 77d8e67dbb543abb02df23df871a230e49d8e3c5 assets/modern_industrialization/textures/block/tungsten_block.png 08c67c47b7b63f13b60fabf30f74c1263d51dad5 assets/modern_industrialization/textures/block/tungsten_ore.png -aef56cd4ed81f67b0090665f401b0a1b1dbc0c41 assets/modern_industrialization/textures/block/turbo_machine_casing.png +bdf24b7dad7ea55103766f6171a1fcec4b8db14d assets/modern_industrialization/textures/block/turbo_machine_casing.png 438660ef0d955ac709d1e5c4b352e8340a835936 assets/modern_industrialization/textures/block/uranium_235_block.png 0bf9f3b54f479505f2d3afcc08ca81fcb0f42a7f assets/modern_industrialization/textures/block/uranium_238_block.png 4d3a0ffb62d0700a93844582aa1cc57957a6bdd3 assets/modern_industrialization/textures/block/uranium_block.png 4bb3090bfc0fe495c4029699ab631d02a8300246 assets/modern_industrialization/textures/block/uranium_ore.png bc3e1b082ce2a15940d27b9d960d3b6d0464df08 assets/modern_industrialization/textures/block/yttrium_block.png -615182cc425084bf4ee6b4c0f359f34635e609f3 assets/modern_industrialization/textures/fluid/acetylene_still.png +a7f8ad9343c16e38e4b95639ed3ff29d67cc927f assets/modern_industrialization/textures/fluid/acetylene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/acetylene_still.png.mcmeta -97920dd6f669b4653f686b7f1dfccdd3c22f937d assets/modern_industrialization/textures/fluid/acrylic_acid_still.png +0c0bda2c280c6245902814be481cd750c4e1cec5 assets/modern_industrialization/textures/fluid/acrylic_acid_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/acrylic_acid_still.png.mcmeta -2a7ca6968ad33e1fc28636b1197c658285c79e92 assets/modern_industrialization/textures/fluid/acrylic_glue_still.png +2813ed49fc02b79a3820211bdc7684da6ac229cd assets/modern_industrialization/textures/fluid/acrylic_glue_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/acrylic_glue_still.png.mcmeta -335ce39a0b141ea9502c5639b07f17061ae040b9 assets/modern_industrialization/textures/fluid/argon_still.png +43ab2a04deabb69164f16a5f8f1dd8a2db84f320 assets/modern_industrialization/textures/fluid/argon_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/argon_still.png.mcmeta -3baaa488d4ede2f31b0343363de6a7ee886fe288 assets/modern_industrialization/textures/fluid/benzene_still.png +6ae71924b28285a8c32cef20946d71076037dd86 assets/modern_industrialization/textures/fluid/benzene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/benzene_still.png.mcmeta -70bcc16926ff915e50d7c98c67807c202fa34ea3 assets/modern_industrialization/textures/fluid/biodiesel_still.png +c6691f77543ab2ed3b0565c14ecb6ff8cde61ece assets/modern_industrialization/textures/fluid/biodiesel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/biodiesel_still.png.mcmeta -e5e316fb4a3f892b937a2e8c3873285cdec57890 assets/modern_industrialization/textures/fluid/boosted_diesel_still.png +68414755b3af523f0a37c1d8c4ce8b36a5436cf3 assets/modern_industrialization/textures/fluid/boosted_diesel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/boosted_diesel_still.png.mcmeta -7e82b8e5228f416f4e728d86fc60ae6d71fe272a assets/modern_industrialization/textures/fluid/butadiene_still.png +769126e62df800eec1918e0c77f3c80d514005a9 assets/modern_industrialization/textures/fluid/butadiene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/butadiene_still.png.mcmeta -324a7cf51602ffc589fe5c34ff547582fd2d6212 assets/modern_industrialization/textures/fluid/caprolactam_still.png +a860c026f3fe8f8fcb5a7507fb943c3855c01477 assets/modern_industrialization/textures/fluid/caprolactam_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/caprolactam_still.png.mcmeta -f77d0f592380f60b83af9a561d764ba82a85f880 assets/modern_industrialization/textures/fluid/chlorine_still.png +bfd1e8882e4e5bda1610c9e35601179d0af14a6f assets/modern_industrialization/textures/fluid/chlorine_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/chlorine_still.png.mcmeta -986660da43bb7aea10d50e90b6b3409048408350 assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png +87adf5869a6ce9b7339c00e6592ff3a936e51b8b assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png.mcmeta -8d5f656fafeae5b033f1f7c1176433c9fcfd8306 assets/modern_industrialization/textures/fluid/creosote_still.png +3717f920c783d755278eb6c18282608e7e45dd65 assets/modern_industrialization/textures/fluid/creosote_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/creosote_still.png.mcmeta -71f32f6d51c51a99d65bbd78badb3afd4c09eb3a assets/modern_industrialization/textures/fluid/crude_oil_still.png +b0e50a03ae7008e4c3eaae07a55a1200fc9145da assets/modern_industrialization/textures/fluid/crude_oil_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/crude_oil_still.png.mcmeta -61c260eb7b115ed03f460b3be483ea135144fd81 assets/modern_industrialization/textures/fluid/cryofluid_still.png +541c6c12d092652306250b90f727c1343787f9f7 assets/modern_industrialization/textures/fluid/cryofluid_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/cryofluid_still.png.mcmeta -4539bc1a0f56d75d836b5045c1744e7b766be1de assets/modern_industrialization/textures/fluid/deuterium_still.png +626fde5027f5494aeb63a66174ed3b70f2dc98ed assets/modern_industrialization/textures/fluid/deuterium_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/deuterium_still.png.mcmeta -d135b4c3f2f8f5e02ef0a7acecddbfe21fa297c9 assets/modern_industrialization/textures/fluid/diesel_still.png +d0426d6e512f5c4cc2d4eb444d832fce8c13ff07 assets/modern_industrialization/textures/fluid/diesel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/diesel_still.png.mcmeta -d43732989ac2a5adf73f5e6192156af493a159cc assets/modern_industrialization/textures/fluid/diethyl_ether_still.png +df2cd1d53a40ca6007720246aeab7ab4f1fc40b6 assets/modern_industrialization/textures/fluid/diethyl_ether_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/diethyl_ether_still.png.mcmeta -073353f32e0919f64db4634194b920add48b7d71 assets/modern_industrialization/textures/fluid/ethanol_still.png +fddaf517aa2c9c00b72d16d7ffafa5c6a438121a assets/modern_industrialization/textures/fluid/ethanol_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/ethanol_still.png.mcmeta -180dc14f2dc58ae993bb76b614b65aaf2c5b43e8 assets/modern_industrialization/textures/fluid/ethylbenzene_still.png +450a1efc579962b777b93d1a918606614385491a assets/modern_industrialization/textures/fluid/ethylbenzene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/ethylbenzene_still.png.mcmeta -44f3b0fe1a4a5461e19540944ad9a95fa927e600 assets/modern_industrialization/textures/fluid/ethylene_still.png +08aed2ff261076672dd84cc69f676a3941e21e55 assets/modern_industrialization/textures/fluid/ethylene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/ethylene_still.png.mcmeta -4a45dfbc1a56ea860b784d2b9a4be6690c90aac9 assets/modern_industrialization/textures/fluid/heavy_fuel_still.png +f5fb8316fc68a4d13c13264a400404bbd0a408b6 assets/modern_industrialization/textures/fluid/heavy_fuel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/heavy_fuel_still.png.mcmeta -fc0eff51fa5dd99dc3780015fec6b8c702b08b60 assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png +8a19975c389e60c7b1334cc2d9e2d8c51b3cea90 assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png.mcmeta -7a6e27967a85d9c2a7b6227904097793f17da1c1 assets/modern_industrialization/textures/fluid/heavy_water_still.png +e589a224de6e07d24ac402b9c4edbf19a58eb2e5 assets/modern_industrialization/textures/fluid/heavy_water_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/heavy_water_still.png.mcmeta -b5ef84dbde5cd1df9cf1a05281ea293853687bf6 assets/modern_industrialization/textures/fluid/helium_3_still.png +b5a1c0511b43c055dbcd5ba0aeb6d1ab35dd3e52 assets/modern_industrialization/textures/fluid/helium_3_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/helium_3_still.png.mcmeta -a000b0f2d53a88a387d4bd23fb8a4149379a3c17 assets/modern_industrialization/textures/fluid/helium_plasma_still.png +7438c128f6fb7998424e0ac4d2dc7be8912e2809 assets/modern_industrialization/textures/fluid/helium_plasma_still.png 16be830150bf2a99e8117b0217ec72b5da03f6cc assets/modern_industrialization/textures/fluid/helium_plasma_still.png.mcmeta -f2ebd233981d24a25d9d5589e45219ae2fde400c assets/modern_industrialization/textures/fluid/helium_still.png +5c79ec5addf25752096f89501ff66e3b5d7355db assets/modern_industrialization/textures/fluid/helium_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/helium_still.png.mcmeta -ca2aab6aff96cd0dc92afa78ccee5d25d35875d4 assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png +9210fb176924a52bff8a18f452cc709f76339581 assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png.mcmeta -591425c073e41cd6b7fad69c0502999d6a792cde assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png +3e35b8f063142bd437ead303c3754a6895edf533 assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png.mcmeta 94b41f5a65a7ff93e4caafc970078a95f30968a2 assets/modern_industrialization/textures/fluid/high_pressure_steam_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/high_pressure_steam_still.png.mcmeta -b306598163e6c1321992ae7af67455acf2528d31 assets/modern_industrialization/textures/fluid/high_pressure_water_still.png +ef1fb18c55a6bbf5af0c228f58228db92343096d assets/modern_industrialization/textures/fluid/high_pressure_water_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/high_pressure_water_still.png.mcmeta -de603c9eea849cd5f5530db474f8e8fa294cb303 assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png +8203c04662769359889d1afddd7b6cdec0d1c49b assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png.mcmeta -e012184a5ba2479f4fb72c6dd34e72c5b870008c assets/modern_industrialization/textures/fluid/hydrogen_still.png +baf53df16cdb70fbd3e64806006b2be469c34f4f assets/modern_industrialization/textures/fluid/hydrogen_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/hydrogen_still.png.mcmeta -202f13d528616796e0e65f754921b36567019ad5 assets/modern_industrialization/textures/fluid/light_fuel_still.png +2ffd8e4adea758d4cf3a07f473dd517752b507c0 assets/modern_industrialization/textures/fluid/light_fuel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/light_fuel_still.png.mcmeta -5a16dae0f28740151fa032c515a29fe0281053d7 assets/modern_industrialization/textures/fluid/liquid_air_still.png +d7281dca364ccdd58b651c1783b3188cedfa68cd assets/modern_industrialization/textures/fluid/liquid_air_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/liquid_air_still.png.mcmeta -96f07cc7e8c29c1d28e757d12ad37a02850019bd assets/modern_industrialization/textures/fluid/lubricant_still.png +5b7af90b732758ba03862adfe44f924d33a6e4e1 assets/modern_industrialization/textures/fluid/lubricant_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/lubricant_still.png.mcmeta -510916215164c79f2b559fec170f80077a5f6e0d assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png +5c7578a4f6e0c69fdd8a81f6dc3f10318e7c7f4c assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png.mcmeta -25adf6578144365e1eb8dacb1d3291169e267bdb assets/modern_industrialization/textures/fluid/methane_still.png +28c0adad745a8fffae49fbfe2f76ef96156e5ff9 assets/modern_industrialization/textures/fluid/methane_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/methane_still.png.mcmeta -0a3f45ab2cc92e71125ce0f5a76561664d263f70 assets/modern_industrialization/textures/fluid/molten_redstone_still.png +c58cf7d229a603a6f2d2fea42131b676e9b91c9a assets/modern_industrialization/textures/fluid/molten_redstone_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/molten_redstone_still.png.mcmeta -b14d23a11235e242521886e1b279c932dd2f1b23 assets/modern_industrialization/textures/fluid/naphtha_still.png +fe1fd43953c8fdd124e6523bfed2e534fc52d035 assets/modern_industrialization/textures/fluid/naphtha_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/naphtha_still.png.mcmeta -90bc3b4a9ce04351d776abf7a96bb20523113f90 assets/modern_industrialization/textures/fluid/nitrogen_still.png +4899de0778da7de101b459d57818f665f8c5cdb0 assets/modern_industrialization/textures/fluid/nitrogen_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/nitrogen_still.png.mcmeta -960916ac911ac533e1d592413d62871958ee3cef assets/modern_industrialization/textures/fluid/nylon_still.png +cb3e37694c38e5172841e34808dd73af696fcff6 assets/modern_industrialization/textures/fluid/nylon_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/nylon_still.png.mcmeta -ef1a1b51dd20e134dbe6af4b8df6ad6fd7857985 assets/modern_industrialization/textures/fluid/oxygen_still.png +ec52eff2892f98da96982c994a9c6df82006f922 assets/modern_industrialization/textures/fluid/oxygen_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/oxygen_still.png.mcmeta -5c30855c7ae822d76621db5522c202ce35285eec assets/modern_industrialization/textures/fluid/plant_oil_still.png +c73a98197f2d3f32f58204e6569f2108429add60 assets/modern_industrialization/textures/fluid/plant_oil_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/plant_oil_still.png.mcmeta -91dc9f9e8004f897b9826c84330a69e69f090d02 assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png +14a45e447cfc78f34740a1d28ac5a883ded7e6d0 assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png.mcmeta -96b3539cc6bdbde8ff343cf4d81af860dc1d6cd5 assets/modern_industrialization/textures/fluid/polyethylene_still.png +22f2dd26197aad60340a279ca8b9b78cf48c2931 assets/modern_industrialization/textures/fluid/polyethylene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/polyethylene_still.png.mcmeta -bb6e7fe3a61c922bc323dcb4fb4a7b11f57b769a assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png +3bd05460abd69a7dadf307a67aa44fcb338518ef assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png.mcmeta -5ef7d96e7549f010a06c46dcadbba9756b4e8b37 assets/modern_industrialization/textures/fluid/propene_still.png +0d5535759771d83234e2ee7b743f8d5101583ff6 assets/modern_industrialization/textures/fluid/propene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/propene_still.png.mcmeta -478ae883ade11a32f9c66af3279a224402edcdaa assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png +992500709edec132dec62e5df7c3d035c1a92f9f assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png.mcmeta -ea6fdc57b74448549e3bc8220ce54306b9fd1a12 assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png +adc1ff3f61b6bbd50c02115e9c3c663afe7fc409 assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png.mcmeta -f12e0ad070d37da22c13e6806b615dabf996a867 assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png +2ba834de96636e272926f2333bedbce68b62cc69 assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png.mcmeta -1e5b2ed99b249b47fca873d532499789c2a8c250 assets/modern_industrialization/textures/fluid/shale_oil_still.png +8957e3077cb85b3a4d3b25805d93c06b7383edb9 assets/modern_industrialization/textures/fluid/shale_oil_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/shale_oil_still.png.mcmeta -405f6d9a79a29107aad4dfece4a4974179557dc9 assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png +fe479c3f4815e0087f0b453be9f66355777ff4ab assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png.mcmeta -e67fb86c1fc06fa18aea37124b2c033cc9160e95 assets/modern_industrialization/textures/fluid/soldering_alloy_still.png +47a3f61b96bc032d1e7643beb686aff2eb3b1ee1 assets/modern_industrialization/textures/fluid/soldering_alloy_still.png 48e2c8d30cefe9cc2cc10472516dcaba916eaa4e assets/modern_industrialization/textures/fluid/soldering_alloy_still.png.mcmeta -473507622a170d0c36a3c14405aeb85524481207 assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png +2c2082ed04abcd2421c1430a7d657db4c6ff9c1e assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png.mcmeta -8d8a0fcfed135e7951b05235bb418b6a383b6e5e assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png +8dbcd8fb276cfdcda4bf8b47001c80e319d53c6a assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png.mcmeta -4bb0bd7b44783bf6508f7f8e860c23e5fc4a36a0 assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png +8c98b15565e6df5a5c688eb837ab41ee95ceeab9 assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png.mcmeta 2db9cb405cf33af61ca29938c6ebbe351f50c5d7 assets/modern_industrialization/textures/fluid/steam_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/steam_still.png.mcmeta -d961d0cd49716ce9e8deb675481fead17a48b5d9 assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png +0172fd8b01494cb324213d88d099e425a089d840 assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png.mcmeta -591f654f56a3bdd915c39d252e8d0e0b0659da2f assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png +94f6badb6eba4951675de381f6a2bc925ee4418a assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png.mcmeta -0918d96667acce2ac529b48c93914d4a2fb65715 assets/modern_industrialization/textures/fluid/styrene_still.png +cea10d534117a2397f716f2abe3040db0cc6ed50 assets/modern_industrialization/textures/fluid/styrene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/styrene_still.png.mcmeta -e27689a92251be09b5b7b33345c92210657608be assets/modern_industrialization/textures/fluid/sugar_solution_still.png +2fd60da30585449e17be6924a7d6b667a216a63b assets/modern_industrialization/textures/fluid/sugar_solution_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sugar_solution_still.png.mcmeta -2f545ca8774f557b7428068f6a28827147d8ccc5 assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png +e4267e73b2a1af92e9a91903f213030c42c674dd assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png.mcmeta -d9cd77f18af1f3924afb1ebceead936248437409 assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png +2765f97b2d60c7f1b8dd566d9cf2c7ace36ade79 assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png.mcmeta -796069fd2637abbb2bac2fa02da77cef2a1ed3c5 assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png +f85e0cad9468ed05c2dcf10fd19867250b30df56 assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png.mcmeta -5a1821b7d1d54a8741376348ea35fb64dd072eb4 assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png +6e8b7922029a15059f91fe64050407508856d8f5 assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png.mcmeta -b652d6b817ef962c5f6e63d202c6542d87f61cd6 assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png +69017fe803f38d92446a4291cb731b04763f87f4 assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png.mcmeta fbdd3e3d6d6423059a52706b1283f6c7c87c4f2b assets/modern_industrialization/textures/fluid/synthetic_oil_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/synthetic_oil_still.png.mcmeta 9bfdc9b0d48a29346049019e276d841321a1c2f7 assets/modern_industrialization/textures/fluid/synthetic_rubber_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/synthetic_rubber_still.png.mcmeta -93ea378f3194d640fde2cfa955afd03a5b50824a assets/modern_industrialization/textures/fluid/toluene_still.png +8ad5d4d34de03db4211bfbc91bfdad16bc634cc9 assets/modern_industrialization/textures/fluid/toluene_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/toluene_still.png.mcmeta -fab93e9f8d3b7f054452a2fd0434d37162c3c069 assets/modern_industrialization/textures/fluid/tritium_still.png +1d0daa906d54894db3f301369f99b149e975b862 assets/modern_industrialization/textures/fluid/tritium_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/tritium_still.png.mcmeta -04bc33c7206a304b3cb17d9af27affd9df02a43b assets/modern_industrialization/textures/fluid/uu_matter_still.png +d6ff04b78895deafd47d4bf4a91b4ae01e2a60c0 assets/modern_industrialization/textures/fluid/uu_matter_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/uu_matter_still.png.mcmeta -7a31da0ac3909c8af17a1c92a0e0e8f29bb9fbca assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png +9ba4d46141c607cf21d1b236a2ea1c521704d73b assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png ae39cf5f32113a9476ca44f31c959bea27517c98 assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png.mcmeta -681332659593a28abf331a827fc51a7657e7499d assets/modern_industrialization/textures/item/acetylene_bucket.png -a17bd9deec02c71ea3cf75ac399f97288c7d70f4 assets/modern_industrialization/textures/item/acrylic_acid_bucket.png -e40e6d794f83fb7ce5a22b957dfe0af820fa18e1 assets/modern_industrialization/textures/item/acrylic_glue_bucket.png +a0b9e7a2104383db7f80007d6d5f715015f75bf7 assets/modern_industrialization/textures/item/acetylene_bucket.png +535da75f88879cefcda93251851cdafabe10b8bf assets/modern_industrialization/textures/item/acrylic_acid_bucket.png +766d21e81f81cba643633a15c08bc115ecbe2f55 assets/modern_industrialization/textures/item/acrylic_glue_bucket.png 7f72de245d38e197e0983676bab5a7c6a61eb38b assets/modern_industrialization/textures/item/aluminum_blade.png f309391c39c80312f69d4ddc4d2e318098017dd4 assets/modern_industrialization/textures/item/aluminum_bolt.png 00af0d421f7a9f62b7b154bf0bfafe54496fc5c0 assets/modern_industrialization/textures/item/aluminum_curved_plate.png @@ -298,7 +298,7 @@ fc49cc771b3dca0d5ad9437c6c8c228e0e071f5c assets/modern_industrialization/texture 9a95c0322a859b50d84039a4836519584d13e68b assets/modern_industrialization/textures/item/antimony_ingot.png 0959baa0fe505d645d99fec5ecd29c6c29472f7e assets/modern_industrialization/textures/item/antimony_nugget.png 42457921e40ee654b4a4d39bf9cffddeec0c65f4 assets/modern_industrialization/textures/item/antimony_tiny_dust.png -9a811f461e0f1c2172004ca16aa12cfd43d94f43 assets/modern_industrialization/textures/item/argon_bucket.png +f2753fe69640566e2c361302dbca7541e0c55fe2 assets/modern_industrialization/textures/item/argon_bucket.png ab90ce9935a323d7ee44d1062e867d510d167096 assets/modern_industrialization/textures/item/battery_alloy_curved_plate.png a97a667d99a751d012daf92aeb24f794d81e9b42 assets/modern_industrialization/textures/item/battery_alloy_double_ingot.png 7da45359915268895185653f7572782fddd07ccd assets/modern_industrialization/textures/item/battery_alloy_dust.png @@ -309,19 +309,19 @@ a97a667d99a751d012daf92aeb24f794d81e9b42 assets/modern_industrialization/texture 02cfde797ab090491d8c45e76e23ecd0a0ef6d0f assets/modern_industrialization/textures/item/bauxite_crushed_dust.png 583d2ca9c32f2a3dedfcb16f8b326f800fc742b7 assets/modern_industrialization/textures/item/bauxite_dust.png c8120ca2ebadee98cf3744d9a3e82273d75e3fff assets/modern_industrialization/textures/item/bauxite_tiny_dust.png -42d8efc82379037330e4fdd757053f088eeeaa87 assets/modern_industrialization/textures/item/benzene_bucket.png +a5543208316dd8c06d4180cdb8ca024ae00562a0 assets/modern_industrialization/textures/item/benzene_bucket.png f2f57a0cd39e5dcf0ec0eb92ae1cadc1ccc31adb assets/modern_industrialization/textures/item/beryllium_double_ingot.png 9d7779a530b710df3b64561a4637fdd1e33fa594 assets/modern_industrialization/textures/item/beryllium_dust.png dc50b4e6b204b745ce30699cfdac0ee64c645c26 assets/modern_industrialization/textures/item/beryllium_ingot.png 02bdce8f220613dd651c8dfb57ff2ed29a2af0f9 assets/modern_industrialization/textures/item/beryllium_nugget.png dd49c2bc9866bc772aa8c7f7077c9d76de086997 assets/modern_industrialization/textures/item/beryllium_plate.png dcbc2d9da0b74d9a1a18c0c9714dde099b14dd7b assets/modern_industrialization/textures/item/beryllium_tiny_dust.png -654819ae210dcdd1f80c2701aec53aacc27e241b assets/modern_industrialization/textures/item/biodiesel_bucket.png +2410e3f5d439c470c1d55165f5a355b4c88a8163 assets/modern_industrialization/textures/item/biodiesel_bucket.png c9437a10bc0a07fd3e782ad6a9e70ff18ae92bea assets/modern_industrialization/textures/item/blastproof_alloy_curved_plate.png d396771f74254445772e343ce85ed0d6593cb332 assets/modern_industrialization/textures/item/blastproof_alloy_ingot.png 1d70611dcb3e7cce2c1289fbe74ebafb1dc8b280 assets/modern_industrialization/textures/item/blastproof_alloy_large_plate.png 1f4bb01232fd4843983b170ff278acd1be66a182 assets/modern_industrialization/textures/item/blastproof_alloy_plate.png -7f0f6a5f5f14b34f39e8dd5ee20be5a30837802e assets/modern_industrialization/textures/item/boosted_diesel_bucket.png +efb24920446d323b17ff45f1090416deca71ebf0 assets/modern_industrialization/textures/item/boosted_diesel_bucket.png ffe0a379301ee1a89c8c0d7921ce8539676289d0 assets/modern_industrialization/textures/item/brick_dust.png 2526e23cb2e864b7ab0c9f450877f86aec09f4a5 assets/modern_industrialization/textures/item/brick_tiny_dust.png f2d702842b3f89934130c2c808954a69790c5b2e assets/modern_industrialization/textures/item/bronze_blade.png @@ -339,7 +339,7 @@ f8d97de496a412822ad432129e1cd03525c6dbd2 assets/modern_industrialization/texture 70808820e041fb342b40e1fb1f8b6f813eab7d3e assets/modern_industrialization/textures/item/bronze_rod.png 186cd54c3a3f73e2ef1325e6bcd955e8f19dd3bd assets/modern_industrialization/textures/item/bronze_rotor.png 16ae39ddb55b1f5d90eed96a09c73fae0fc0774e assets/modern_industrialization/textures/item/bronze_tiny_dust.png -3dd70ea235ce9785279e477e40b49f06f8eaee90 assets/modern_industrialization/textures/item/butadiene_bucket.png +49b8aaa25d4f693715c700ac4aaff8e5f5ee05a6 assets/modern_industrialization/textures/item/butadiene_bucket.png d5639cfee296030ad901599e832dcfe78758bf10 assets/modern_industrialization/textures/item/cadmium_battery.png 0da56437d5cd6821f39759d2de038d263c305da0 assets/modern_industrialization/textures/item/cadmium_control_rod.png eb935a1298ea568ac46532386c3cf62b73728ccf assets/modern_industrialization/textures/item/cadmium_double_ingot.png @@ -348,17 +348,17 @@ eb935a1298ea568ac46532386c3cf62b73728ccf assets/modern_industrialization/texture fd32f992e626155145d273f85658c31edce83ac2 assets/modern_industrialization/textures/item/cadmium_plate.png d617ce68d66f8eb0ecaf23ef8f5ed0a35d6055ec assets/modern_industrialization/textures/item/cadmium_rod.png e5cc01e08e6f9711d79becb923c8edcf63cbea30 assets/modern_industrialization/textures/item/cadmium_tiny_dust.png -74dbed7f43db0ad7772ba811ac98511384a8cc5e assets/modern_industrialization/textures/item/caprolactam_bucket.png +4cf7a374d2b6de1caf7b2d7f9498a83f2764ccb7 assets/modern_industrialization/textures/item/caprolactam_bucket.png 12ae4a59ba830cdba164ec46c54b86ac1efd3397 assets/modern_industrialization/textures/item/carbon_dust.png baff295b0e28c030c70af3c45e637361e19129a3 assets/modern_industrialization/textures/item/carbon_large_plate.png 9050e9c47467e696264c98b67729d7124b6117ee assets/modern_industrialization/textures/item/carbon_plate.png 52f9be61cbace73cbccc21a02281fc12555dd6b5 assets/modern_industrialization/textures/item/carbon_tiny_dust.png -c4c7aee898dd33d6c69f086dc1273b5fe6e468cf assets/modern_industrialization/textures/item/chlorine_bucket.png +a453e594f5bc5f0f905035e40b5a89ba3d9603d5 assets/modern_industrialization/textures/item/chlorine_bucket.png 11ca4deb3a25fa8228c3faeca3c0fdce3937a015 assets/modern_industrialization/textures/item/chromium_crushed_dust.png 771920700b789f922e35bb500c4855e38832db56 assets/modern_industrialization/textures/item/chromium_double_ingot.png daaa2887c0055be873e541c8bc95e9a1b34ac44d assets/modern_industrialization/textures/item/chromium_dust.png 71f14780873556dee1108551c469d979f17880e6 assets/modern_industrialization/textures/item/chromium_hot_ingot.png -75078ebc4fc1dd96f63132f6362cec752f10deda assets/modern_industrialization/textures/item/chromium_hydrochloric_solution_bucket.png +0038d5a42a55f3683c4845ad30284332fb4b87cd assets/modern_industrialization/textures/item/chromium_hydrochloric_solution_bucket.png b27285e08d730dfa3533ad55d4f84501169a009d assets/modern_industrialization/textures/item/chromium_ingot.png 2c9a2dd81c88e646219a3213dffea68740b7c9fb assets/modern_industrialization/textures/item/chromium_nugget.png 0aca4d45696d1a0e0d008bb029fe30832b2ec740 assets/modern_industrialization/textures/item/chromium_plate.png @@ -383,9 +383,9 @@ fadb94525cdc994831b95f448e16e5ba1201cb12 assets/modern_industrialization/texture 2f86939455bad9084533cc829755537c338dac41 assets/modern_industrialization/textures/item/copper_rotor.png ab70ae19a8727d3921589e73eed77d416763c14e assets/modern_industrialization/textures/item/copper_tiny_dust.png a57cd8f8a5b9219641eafa52842b9c3d77b43faa assets/modern_industrialization/textures/item/copper_wire.png -3886f3fb11db909fa06c6dad26cb457bc55c3bf5 assets/modern_industrialization/textures/item/creosote_bucket.png -104c5bbdade8401d637665b28b71ce240e67f6bb assets/modern_industrialization/textures/item/crude_oil_bucket.png -5440345773a3374b8e083068b3a79807d7fc0781 assets/modern_industrialization/textures/item/cryofluid_bucket.png +7fee88de1ef8058c9801b90b91962976fbe1fe44 assets/modern_industrialization/textures/item/creosote_bucket.png +f6b9622e705b8ae85d1959818dc5c7844c9a8cc7 assets/modern_industrialization/textures/item/crude_oil_bucket.png +9d0c3211adb02991b52b9f3a8f75564da487de58 assets/modern_industrialization/textures/item/cryofluid_bucket.png 53f9b7e468eb828a62493c81dfdea5d4a11148fc assets/modern_industrialization/textures/item/cupronickel_double_ingot.png 2480524e8bc4b0d8b5bd49ba0dbf6e8111a7ea19 assets/modern_industrialization/textures/item/cupronickel_dust.png 1b5229272b8d2fcef7513abc0507fd49cd4ddb80 assets/modern_industrialization/textures/item/cupronickel_ingot.png @@ -394,14 +394,14 @@ a57cd8f8a5b9219641eafa52842b9c3d77b43faa assets/modern_industrialization/texture 0866a252f03170dba17742f3db29a58ae55d718e assets/modern_industrialization/textures/item/cupronickel_tiny_dust.png 03851dc5a4346ca5b7cd2c6b3c10bb91ce43a5b5 assets/modern_industrialization/textures/item/cupronickel_wire.png 21916f87af655f15b2f71191328eec45abf09fa0 assets/modern_industrialization/textures/item/cupronickel_wire_magnetic.png -ee4d543667429bad61345bfc6ecbcb30f6e19e6e assets/modern_industrialization/textures/item/deuterium_bucket.png +6c4cf2960a287946234821ab0854c30ef448c4cb assets/modern_industrialization/textures/item/deuterium_bucket.png 537a06fb40bdcbf005cca0a339cb988159f18e51 assets/modern_industrialization/textures/item/diamond_crushed_dust.png af89c614473d576a522461cde4a4891b021976d8 assets/modern_industrialization/textures/item/diamond_dust.png e40ea80652bd7ffb973d42fc85b1a9b4d19bcfdf assets/modern_industrialization/textures/item/diamond_large_plate.png b0cca588fecc47a9998853dbfc3fed310d10e87e assets/modern_industrialization/textures/item/diamond_plate.png 82cc58010ed0e02b3f9de91759bb1bfe6aa9b307 assets/modern_industrialization/textures/item/diamond_tiny_dust.png -909976c2b155fef2a2b522cd55e6f34019004b22 assets/modern_industrialization/textures/item/diesel_bucket.png -7f508b80c3858205603efe854c7d44e51838088e assets/modern_industrialization/textures/item/diethyl_ether_bucket.png +3f4dff49832a9fd63e599d4f52ce45dc9125ba45 assets/modern_industrialization/textures/item/diesel_bucket.png +ae0f8a8bdfa662cad969b5284d2f22b8c2eb37e9 assets/modern_industrialization/textures/item/diethyl_ether_bucket.png e4475e98be020ac83510e94244c9db15eff13181 assets/modern_industrialization/textures/item/electrum_double_ingot.png febdfba58db9b53f78e87ceeb96ef759f4a16f4d assets/modern_industrialization/textures/item/electrum_dust.png df5883e5136d68fc9982cc5e3d53f6ea51540a86 assets/modern_industrialization/textures/item/electrum_fine_wire.png @@ -414,9 +414,9 @@ f7fb4fa5dd5179619e27579eed5aedd9ca3b008a assets/modern_industrialization/texture cbbd87f97cc6382c0a5f34a2e76bcd9343e2bf28 assets/modern_industrialization/textures/item/emerald_dust.png 71da6a60339a969ed9ebfebfc63f7ff947e1563d assets/modern_industrialization/textures/item/emerald_plate.png b05ac1d095fce58dfa32b3e3b135813bdab0e12a assets/modern_industrialization/textures/item/emerald_tiny_dust.png -c97ea3b7a1e561b2d11547113a0e8e70d37182e8 assets/modern_industrialization/textures/item/ethanol_bucket.png -b5e07c60b69276d95bdf1af1f7a001fc000e4615 assets/modern_industrialization/textures/item/ethylbenzene_bucket.png -5cccfc7f4abef2e02b3ee774f8025dab94ac77df assets/modern_industrialization/textures/item/ethylene_bucket.png +1c4f28263c65f50f0effe26e7e5b0904020a4317 assets/modern_industrialization/textures/item/ethanol_bucket.png +0ef4191221722afe03a5a93b2184d6679ef5c60e assets/modern_industrialization/textures/item/ethylbenzene_bucket.png +6ef39dafef9e9f4503a88cea9b0cfd4bee7cf28d assets/modern_industrialization/textures/item/ethylene_bucket.png 28f318cb42564b3ab418c4a7bc3724348d864cbe assets/modern_industrialization/textures/item/fire_clay_dust.png 1d2ef3ea07c37efd856fc20b38166b216c4360df assets/modern_industrialization/textures/item/gold_bolt.png 116d42d09e22e7c4c77ecaa7b6e1f78662c2e4a4 assets/modern_industrialization/textures/item/gold_curved_plate.png @@ -429,15 +429,15 @@ b3084e4060eac5ec40d5f367a0ab0f4bb40e35c1 assets/modern_industrialization/texture 83e3540a0477a5f8c16b2bc3aef51b9b8207ac9d assets/modern_industrialization/textures/item/gold_ring.png 88bd83d3a510ca189b41b5d98f0f080f33f7a598 assets/modern_industrialization/textures/item/gold_rod.png 443d2d8dc0b3aed506dac9dd4691e0b73b9096ec assets/modern_industrialization/textures/item/gold_tiny_dust.png -c4504017d013422f784cc9102b936121c6f5dbfc assets/modern_industrialization/textures/item/heavy_fuel_bucket.png -8a44201979e6382b05be10b4aa47631163f0b5c4 assets/modern_industrialization/textures/item/heavy_water_bucket.png -e1449e86afba5fd3c786f4019b02fe418b2ef158 assets/modern_industrialization/textures/item/heavy_water_steam_bucket.png -f00bba10e641307690625baee99049195f7ee1d7 assets/modern_industrialization/textures/item/helium_3_bucket.png -0fd28ef4bcb4c75083855c11b5070de670340210 assets/modern_industrialization/textures/item/helium_bucket.png -0fca9e34416aaf4db396b9f8e39ec8c43a340d78 assets/modern_industrialization/textures/item/helium_plasma_bucket.png +f754504b14091bb50fc010d5672007b13c0321ad assets/modern_industrialization/textures/item/heavy_fuel_bucket.png +793b3268ad4737aff8b1b6c7a2731f71a37b65f1 assets/modern_industrialization/textures/item/heavy_water_bucket.png +30ab516c3e762220e9d0be081701139348b13294 assets/modern_industrialization/textures/item/heavy_water_steam_bucket.png +7cfaa1abe76fe57776ca4f735071f17bdd7edc45 assets/modern_industrialization/textures/item/helium_3_bucket.png +7040461024285239f894d4ebd364cd2c08e64b3e assets/modern_industrialization/textures/item/helium_bucket.png +e0a82b8ceae191f1a37a9ee57a63b8ce6027c677 assets/modern_industrialization/textures/item/helium_plasma_bucket.png c3fadd1671e814e78e53b4f2ae3048c37a005a24 assets/modern_industrialization/textures/item/he_mox_dust.png f22f079172501c938ccd9f87fc03e0febb673fd0 assets/modern_industrialization/textures/item/he_mox_fuel_rod.png -f4306079ea24c981cfb13582417a244434b09bb1 assets/modern_industrialization/textures/item/he_mox_fuel_rod_depleted.png +f87e64909636fd78f306eaae46cd568abaf6ed98 assets/modern_industrialization/textures/item/he_mox_fuel_rod_depleted.png d25deebf9467324d0b588c81e0856e1bf2e33a76 assets/modern_industrialization/textures/item/he_mox_fuel_rod_double.png df48b7e0ba6efa38efb37e2064745ad854a45324 assets/modern_industrialization/textures/item/he_mox_fuel_rod_quad.png a4aaed4a22573812f261e9b0e05476e34a4065e4 assets/modern_industrialization/textures/item/he_mox_ingot.png @@ -446,19 +446,19 @@ a4aaed4a22573812f261e9b0e05476e34a4065e4 assets/modern_industrialization/texture daa22e1d576bcd2854d4eb92e8807d3097a7b43c assets/modern_industrialization/textures/item/he_mox_tiny_dust.png a972a29c87d1742de11edca9db0d8c8ddc1968f6 assets/modern_industrialization/textures/item/he_uranium_dust.png 0fcaecae5124fb81b58e6de2ef81fab759c40aff assets/modern_industrialization/textures/item/he_uranium_fuel_rod.png -db6b6427f6a0339b8c943e8b03ef4ce490a97c92 assets/modern_industrialization/textures/item/he_uranium_fuel_rod_depleted.png +9e0b700bd318e236668ae7d5eeae42e193c970b4 assets/modern_industrialization/textures/item/he_uranium_fuel_rod_depleted.png f650ac78d288959dddd2aa19a9d1028af0b24811 assets/modern_industrialization/textures/item/he_uranium_fuel_rod_double.png f3cf4a04ab7efca7b1b9ccc863d0bfb8f9615b2a assets/modern_industrialization/textures/item/he_uranium_fuel_rod_quad.png 0ab2cd6a2989f1edf4559afa17581a9386ed7f36 assets/modern_industrialization/textures/item/he_uranium_ingot.png 39da4198fd94243eaa1b3190fba11be692c10600 assets/modern_industrialization/textures/item/he_uranium_nugget.png 68b8c11ecff0c6b963ddf6e950601ead345194dd assets/modern_industrialization/textures/item/he_uranium_rod.png ecf08dd279c5ab2b0fcabd6c4b798f0e2c3fa4b3 assets/modern_industrialization/textures/item/he_uranium_tiny_dust.png -43b7c48a491d57266ef54e77fd98e59bd3f801d3 assets/modern_industrialization/textures/item/high_pressure_heavy_water_bucket.png -d830e45c5f7a8fbaac4fb582a8fd506c1b2914c4 assets/modern_industrialization/textures/item/high_pressure_heavy_water_steam_bucket.png +e35620e14021f89db642e3c46ada7953b35c318f assets/modern_industrialization/textures/item/high_pressure_heavy_water_bucket.png +2cc7afe24ce7d488d7903d1e1479f6a90c7abbcc assets/modern_industrialization/textures/item/high_pressure_heavy_water_steam_bucket.png 3bb14a89734db1950b9da0a80a72cd7ad62499ff assets/modern_industrialization/textures/item/high_pressure_steam_bucket.png -63e4b38442e078f3954d36e4d6134f2850a4e000 assets/modern_industrialization/textures/item/high_pressure_water_bucket.png -37be6344066bb88e7d101b3ca5e7efc9dff06e35 assets/modern_industrialization/textures/item/hydrochloric_acid_bucket.png -560ae3276814ed0939940ca0ebecd54f91766c18 assets/modern_industrialization/textures/item/hydrogen_bucket.png +0e797ade82991cd71a2de301e5fd0f8f185179fa assets/modern_industrialization/textures/item/high_pressure_water_bucket.png +d1be67c0b01f7fa2c436337056469ef45becb15b assets/modern_industrialization/textures/item/hydrochloric_acid_bucket.png +abd1490950369fbdb2cd2aed4b4b022415a21a09 assets/modern_industrialization/textures/item/hydrogen_bucket.png 17a86dcdc3b94e648c19753bf59659f135756268 assets/modern_industrialization/textures/item/invar_bolt.png c2767b26430589d213e08cf8d066dbcb7151f608 assets/modern_industrialization/textures/item/invar_double_ingot.png 169ae8e66d9bfad5dd699c1a29c00b8be7403351 assets/modern_industrialization/textures/item/invar_dust.png @@ -504,7 +504,7 @@ e11bfea752d28c37d0284d2b85c4ced508d314f7 assets/modern_industrialization/texture d06fb1b351e402374e4363d9780206cd4052033a assets/modern_industrialization/textures/item/lead_tiny_dust.png bec548ca663dfe5c47f4e201fb98975acfc56e56 assets/modern_industrialization/textures/item/le_mox_dust.png b26f563e2a05f289c054778ed1e6b6ce211b00a5 assets/modern_industrialization/textures/item/le_mox_fuel_rod.png -62e85a95c8cb19a7b2c4db345ac79fece82b0783 assets/modern_industrialization/textures/item/le_mox_fuel_rod_depleted.png +d2a95c077c0e2a5997006f73ec38e509c639079f assets/modern_industrialization/textures/item/le_mox_fuel_rod_depleted.png 44271db90b279017aae4fe907db31e39d97a8865 assets/modern_industrialization/textures/item/le_mox_fuel_rod_double.png 803458633609e885143f556d4d8c34c1fdb7b3be assets/modern_industrialization/textures/item/le_mox_fuel_rod_quad.png a3f80c1a9e2ceb340ea7069a75e09ed145730084 assets/modern_industrialization/textures/item/le_mox_ingot.png @@ -513,33 +513,33 @@ a6b22968cd7a46e113890219a052514fa134194c assets/modern_industrialization/texture e82dc40b55e1cc02885c1a29f49797460a67b342 assets/modern_industrialization/textures/item/le_mox_tiny_dust.png d6e432a3f52fa1e685e10dc54b114976495767e7 assets/modern_industrialization/textures/item/le_uranium_dust.png deff9bc0d204c6318d84ce1002247abdcd7e616e assets/modern_industrialization/textures/item/le_uranium_fuel_rod.png -f3a15cbc396fb14c9185bf411749cbe17064c3c0 assets/modern_industrialization/textures/item/le_uranium_fuel_rod_depleted.png +e28a157988df523cf651326ccdff78e8a1a71a81 assets/modern_industrialization/textures/item/le_uranium_fuel_rod_depleted.png 3f5b61d8f5686d8e8c727ba58b17c54d85913c41 assets/modern_industrialization/textures/item/le_uranium_fuel_rod_double.png 735b874dc777b914990b88c7326857c2568ba9f8 assets/modern_industrialization/textures/item/le_uranium_fuel_rod_quad.png e820ca00f8df7b56bf9e4ed6c505aa68f0cb88db assets/modern_industrialization/textures/item/le_uranium_ingot.png bfb29c56207b2aafadd9c4b3d9c088f3e9f0d1fb assets/modern_industrialization/textures/item/le_uranium_nugget.png 6e97e269b451358df20c84cd66acdbb02fb58322 assets/modern_industrialization/textures/item/le_uranium_rod.png 78a589e601201779ff168927fb7570df7e2a9dec assets/modern_industrialization/textures/item/le_uranium_tiny_dust.png -d1b4c58104297f5ebf3651b3674832f6f29e9b2d assets/modern_industrialization/textures/item/light_fuel_bucket.png -21a5d3e664499310e9831ca7505a6c169eb8f574 assets/modern_industrialization/textures/item/lignite_coal.png +2cb41a5ff5ea46f0016aeae6bb130e78f5aaeb50 assets/modern_industrialization/textures/item/light_fuel_bucket.png +33438481eccf391723f03d45de992fe3bc68096e assets/modern_industrialization/textures/item/lignite_coal.png 867cc86f5874c53dbf8bfdfbc719b85926cd1c95 assets/modern_industrialization/textures/item/lignite_coal_crushed_dust.png 8a64a31f3810b1a1f0880e0679de715458b8126c assets/modern_industrialization/textures/item/lignite_coal_dust.png efcfc125da5a0d7f6f57fbc7b3bafd82e87e262f assets/modern_industrialization/textures/item/lignite_coal_tiny_dust.png -b5c3e8f1b3993b329040f6d4affdf2aa10cdf430 assets/modern_industrialization/textures/item/liquid_air_bucket.png -b27b226191596ef081eb416303cee0ad097dbac2 assets/modern_industrialization/textures/item/lubricant_bucket.png +48fa7b06c9c7aea47e126e7ad2b06077ad31e55a assets/modern_industrialization/textures/item/liquid_air_bucket.png +b64b6af1941ab64b9619dbfea366194d8bf4f9aa assets/modern_industrialization/textures/item/lubricant_bucket.png 6efe76bcd1e93789f0ec9b1ff622be46f0484ce9 assets/modern_industrialization/textures/item/manganese_crushed_dust.png d49eb103d2fc4530cd3b352c49e7132a9643e671 assets/modern_industrialization/textures/item/manganese_dust.png -4cc2a2bf1ebeb937073c5fd85f6cbc1b557c1019 assets/modern_industrialization/textures/item/manganese_sulfuric_solution_bucket.png +9728f7e3195962806777a708a100468ee76ab555 assets/modern_industrialization/textures/item/manganese_sulfuric_solution_bucket.png 76b2aae994c2d28b30f2e17839e9330b06548c2f assets/modern_industrialization/textures/item/manganese_tiny_dust.png -3a254274e5ec892cc3462814d8d0ffb538fb4f56 assets/modern_industrialization/textures/item/methane_bucket.png +c57d207ebac5b0644a96b78eed74f1285666abfb assets/modern_industrialization/textures/item/methane_bucket.png 4a5c092aad98ec4daff392e75169ba16804f64d0 assets/modern_industrialization/textures/item/mixed_ingot_blastproof.png 7808fcde5de6799e15b45cb1ba94f8097312cd2f assets/modern_industrialization/textures/item/mixed_ingot_iridium.png fcb85d47b6b0a332fb7cb2615ac9dc11f78eca70 assets/modern_industrialization/textures/item/mixed_plate_nuclear.png -761a851f5f12320e90be96d4d7b6c22372738c67 assets/modern_industrialization/textures/item/molten_redstone_bucket.png -f26092ec186038a7e26211739d09221b455f13c1 assets/modern_industrialization/textures/item/monazite_crushed_dust.png -983f94e025b276871958880744ba8248a882b722 assets/modern_industrialization/textures/item/monazite_dust.png -af39d8addcbdf5a10528da00634aa96c62ccb7d9 assets/modern_industrialization/textures/item/monazite_tiny_dust.png -ead0af7411b021d23213f64fc48a345b75b330a0 assets/modern_industrialization/textures/item/naphtha_bucket.png +ade7960786d6550f634516a717e89dadc2d0afc3 assets/modern_industrialization/textures/item/molten_redstone_bucket.png +ac2dfc27293cb4e46e36059259cd1533f339c77a assets/modern_industrialization/textures/item/monazite_crushed_dust.png +e5f66611586d1d9bbd075ba284a342771def6624 assets/modern_industrialization/textures/item/monazite_dust.png +579d797b61ad5dded03da60e18e7f834d1b7320e assets/modern_industrialization/textures/item/monazite_tiny_dust.png +89e8fe0c18a75406b45f347ea0ec56b0ead335cb assets/modern_industrialization/textures/item/naphtha_bucket.png 8148b3fdb8c009352c031c284c0027f53d2a820c assets/modern_industrialization/textures/item/neodymium_dust.png 011b5bd68ecea06f21b644cc18e57c39eeaa13c9 assets/modern_industrialization/textures/item/neodymium_tiny_dust.png 887600a4d0a0dec9030cf4adf89243bb6ce6a4f4 assets/modern_industrialization/textures/item/nickel_double_ingot.png @@ -548,12 +548,12 @@ ead0af7411b021d23213f64fc48a345b75b330a0 assets/modern_industrialization/texture 87b16f6aff7b9c71a980ac1e8954d433e7de9909 assets/modern_industrialization/textures/item/nickel_nugget.png 17b057a314704a552e932717ddc7d09e565f1f58 assets/modern_industrialization/textures/item/nickel_plate.png d91738223f6f61f63e6000cf0888fa674302b0cd assets/modern_industrialization/textures/item/nickel_tiny_dust.png -6e3847e6d1a08cc68929d1bf5bd6374c25937c05 assets/modern_industrialization/textures/item/nitrogen_bucket.png +bcf16e0a9d5dfed62a5abf325ea3ea7a8399fb92 assets/modern_industrialization/textures/item/nitrogen_bucket.png 87593bb20681ccbfcc68a5b0e97e8ed6b58c7631 assets/modern_industrialization/textures/item/nuclear_alloy_large_plate.png 9fe3e49c0c603ed8388463ca2ea091e797640904 assets/modern_industrialization/textures/item/nuclear_alloy_plate.png -4e41cb523ed25422a3c70f533b7b0ee91840f0a7 assets/modern_industrialization/textures/item/nylon_bucket.png -ced8e2d3f9f4f73262028ee168a3a584fd02d0f6 assets/modern_industrialization/textures/item/oxygen_bucket.png -8d814efedd988bf559a7aec3daec33c8cc999b79 assets/modern_industrialization/textures/item/plant_oil_bucket.png +447b1a9ddc3c7d33d3df22c01f150fcd49e71492 assets/modern_industrialization/textures/item/nylon_bucket.png +c46d0247fcea81aa3cedc708ec8a5616c9c862eb assets/modern_industrialization/textures/item/oxygen_bucket.png +1c5fbd049af44d08ee06494468401b0a5f10ccef assets/modern_industrialization/textures/item/plant_oil_bucket.png dcab846d26fd0f9ee4d95470c2f67effe1f7d491 assets/modern_industrialization/textures/item/platinum_double_ingot.png a989b23855bb4e28cc441170eb51e7b78773cb0a assets/modern_industrialization/textures/item/platinum_dust.png 3666a271088e7ec66ef3a80fced5981ed0caf799 assets/modern_industrialization/textures/item/platinum_fine_wire.png @@ -561,7 +561,7 @@ aca7b29b69cc9d60985298ebeec764e608def83b assets/modern_industrialization/texture ad2f604bd9f861513773286f746d96e1ef29bbcb assets/modern_industrialization/textures/item/platinum_ingot.png 4b6b0d790348571c5ded8f3d53148731918c0696 assets/modern_industrialization/textures/item/platinum_nugget.png 9e0e3eedb8685cee3924b282ebf66d187929d182 assets/modern_industrialization/textures/item/platinum_plate.png -1381c0cf41f72c6093d0e6d8512e66da404b1b2a assets/modern_industrialization/textures/item/platinum_sulfuric_solution_bucket.png +c622984eb0d6605d0cab74fe79422998103dfcdd assets/modern_industrialization/textures/item/platinum_sulfuric_solution_bucket.png 7526ba31dce033242a2b3d77e4c5d551e2120543 assets/modern_industrialization/textures/item/platinum_tiny_dust.png a7a03cbd163a12e7e9d8e4a66be5c275c4a0c211 assets/modern_industrialization/textures/item/platinum_wire.png 495f0c2e07345973cf6371bea83fad31a20ef85b assets/modern_industrialization/textures/item/plutonium_battery.png @@ -569,25 +569,25 @@ a7a03cbd163a12e7e9d8e4a66be5c275c4a0c211 assets/modern_industrialization/texture 0c70440225a4af33fcc96cb7cb3b0e9582fa044d assets/modern_industrialization/textures/item/plutonium_ingot.png 192786a973131f522a508486a131d908904a39c1 assets/modern_industrialization/textures/item/plutonium_nugget.png fa523874d4b53eb55572b1bae7fec60942af4263 assets/modern_industrialization/textures/item/plutonium_tiny_dust.png -357a0f28a14ddc4fbfb002f254d24a253b60565b assets/modern_industrialization/textures/item/polyethylene_bucket.png -bdba8fa878dba5ae29e7ab41ace90e308c87b5af assets/modern_industrialization/textures/item/polyvinyl_chloride_bucket.png -cef45781c6f937e77d08ba758f7f37d858289741 assets/modern_industrialization/textures/item/propene_bucket.png -befed1fd0f029a35acd070b71de0e05d3d84b731 assets/modern_industrialization/textures/item/purified_platinum_sulfuric_solution_bucket.png +c4a233259d36bbdc9de01b70290b0a1204e387f9 assets/modern_industrialization/textures/item/polyethylene_bucket.png +02546689b78ba1ac416a684fa93aeaab6d79823a assets/modern_industrialization/textures/item/polyvinyl_chloride_bucket.png +196a8f51d062cf9f6b875720d80418208e36f6b7 assets/modern_industrialization/textures/item/propene_bucket.png +b33186d057deb9b97556e6ba856c24c91b7d0bbb assets/modern_industrialization/textures/item/purified_platinum_sulfuric_solution_bucket.png 27c2417491fe7bb6a3bebddabec52741fd52917a assets/modern_industrialization/textures/item/quartz_crushed_dust.png 3678fc7ffffe9e2ffa83f99350395f1938b7950a assets/modern_industrialization/textures/item/quartz_dust.png aeff036b79c9997916b76df25df94b590fd16fb1 assets/modern_industrialization/textures/item/quartz_tiny_dust.png d7484824c7a017954da0a5776c4fbf6c45df0fdb assets/modern_industrialization/textures/item/raw_antimony.png -b03ec08b5c976a45fb76e5e53eee7c63192c4ebe assets/modern_industrialization/textures/item/raw_biodiesel_bucket.png -f3a5c019d631fe9cf8bd2d96ce1de0aae26e3330 assets/modern_industrialization/textures/item/raw_iridium.png +4de3fd311c04237579ff7f048edb9fb58365b7d5 assets/modern_industrialization/textures/item/raw_biodiesel_bucket.png +9648a95a597092c95fb856b5b6ca616f187a8c9e assets/modern_industrialization/textures/item/raw_iridium.png 64a4dead44085d9caaf98837b00f91cce4bce59d assets/modern_industrialization/textures/item/raw_lead.png b126e15846928a9ab9105e3ea1cd1f6b299d3f57 assets/modern_industrialization/textures/item/raw_nickel.png 12cd5c01e7fc484fd847ef53e6a9fdf382b775b8 assets/modern_industrialization/textures/item/raw_platinum.png 3319cae5a4e15d79962257b1decd4fb1587a8b5f assets/modern_industrialization/textures/item/raw_silver.png -f4cf7ed352bb4921a51f8c9ac10d585992c8fdf8 assets/modern_industrialization/textures/item/raw_synthetic_oil_bucket.png +069c982b70c2b88da225fb87a5613576693d32a5 assets/modern_industrialization/textures/item/raw_synthetic_oil_bucket.png 6e121fdb5cfcdaa4dda6cca5977d7bdc5134d28a assets/modern_industrialization/textures/item/raw_tin.png 424ae1fc318480d230fef913c5c8e7193c210573 assets/modern_industrialization/textures/item/raw_titanium.png d7f07c3fb778783324f025cf1e0ed951da81a147 assets/modern_industrialization/textures/item/raw_tungsten.png -771ab601af798366544c58064237dcbf2cbff423 assets/modern_industrialization/textures/item/raw_uranium.png +0cde06f3cc4ae52d79fcdbc7c74000da5b34beae assets/modern_industrialization/textures/item/raw_uranium.png 712c2c91791a5ffbce7b83465e8e9f5cb0d1d770 assets/modern_industrialization/textures/item/redstone_battery.png 023eb382303e2779225092d10019099dd59ecfe7 assets/modern_industrialization/textures/item/redstone_crushed_dust.png a67576c12174a2ccf0e569c5f1b1c48817e2221c assets/modern_industrialization/textures/item/redstone_tiny_dust.png @@ -596,7 +596,7 @@ dd0aca34d8e5468fed5da7860d3433eb4ac4ce51 assets/modern_industrialization/texture 2d244ac4d11902d2c7726f158421c9ef40052e78 assets/modern_industrialization/textures/item/salt_crushed_dust.png e35f2f6d5ea9617cab4671efc3ead45f53ae3504 assets/modern_industrialization/textures/item/salt_dust.png dd6a2792d0717cb0ef872f44fb88dd2614152078 assets/modern_industrialization/textures/item/salt_tiny_dust.png -d6643d37780f3966b4ef139be06c5be505e9545a assets/modern_industrialization/textures/item/shale_oil_bucket.png +913f5cb00cfdf4b753bc4820f90499b31ae15d4a assets/modern_industrialization/textures/item/shale_oil_bucket.png a205ae97936ca212b787b0a20824839de73f83dc assets/modern_industrialization/textures/item/silicon_battery.png 597c43597406c9fa3a3431f2596d3d7ae5f59746 assets/modern_industrialization/textures/item/silicon_double_ingot.png 4e853865aa31a431c629768a6f98e59f93f334d0 assets/modern_industrialization/textures/item/silicon_dust.png @@ -615,9 +615,9 @@ f94808f76fd064dbf823d9940f9ca33e8d1b7b99 assets/modern_industrialization/texture cc9527defcd8fea179700e2a6d4fd1a09b7b4a75 assets/modern_industrialization/textures/item/silver_wire.png d0816874c8c3d070e2b3824d307e115ca1bd80fd assets/modern_industrialization/textures/item/sodium_battery.png 6fdbd139be413488acdfa6a309d0ac4b51f1b38b assets/modern_industrialization/textures/item/sodium_dust.png -7bcb627874e050ede6830541eca722b33399b17a assets/modern_industrialization/textures/item/sodium_hydroxide_bucket.png +f6d6bccfa079e26de421755290f331bb62723271 assets/modern_industrialization/textures/item/sodium_hydroxide_bucket.png 9a11e6d91be83429a436f7b0a8115140dc570dbc assets/modern_industrialization/textures/item/sodium_tiny_dust.png -2442eab9505fd524b321619fb9b5fde1c8e225bf assets/modern_industrialization/textures/item/soldering_alloy_bucket.png +37457230818d987e2ad953fff2a3e8399ec20f59 assets/modern_industrialization/textures/item/soldering_alloy_bucket.png 73d0729f481d8ad38ab8544f31bfddd868627a9e assets/modern_industrialization/textures/item/soldering_alloy_dust.png c5977bd615c11eb75955215d33c06e03bc60633e assets/modern_industrialization/textures/item/soldering_alloy_tiny_dust.png 5c4a59ef0a57ce5510eadd90590b3c6dd888a304 assets/modern_industrialization/textures/item/stainless_steel_blade.png @@ -639,9 +639,9 @@ c3406d50860813be937b5a37c04a058c4b48f77f assets/modern_industrialization/texture c8677e0309f19b69280fdf25fa05f8ffcbc338af assets/modern_industrialization/textures/item/stainless_steel_rotor.png bf2477ab2892ed79a49b2a426d13f98dce56d16a assets/modern_industrialization/textures/item/stainless_steel_tiny_dust.png e62bfd08cf7c0aef85ef17a61fd1c5a82380016b assets/modern_industrialization/textures/item/steam_bucket.png -59eca3c5c4f40227fd0b4f426cf09a26eefb84e6 assets/modern_industrialization/textures/item/steam_cracked_heavy_fuel_bucket.png -bbf5e1b9fb4f077a3446491f3ab751b9deebcff3 assets/modern_industrialization/textures/item/steam_cracked_light_fuel_bucket.png -17ae6b1fd3e9469af40f8d8aa47918fc5a895b0d assets/modern_industrialization/textures/item/steam_cracked_naphtha_bucket.png +d020c870123b0118c35cf3487746d828ec5781d5 assets/modern_industrialization/textures/item/steam_cracked_heavy_fuel_bucket.png +0e227712930858e22be3d247018a0714cc09b858 assets/modern_industrialization/textures/item/steam_cracked_light_fuel_bucket.png +098ab93f1dfb9e2e6164f58b6aea54cd5b0d6915 assets/modern_industrialization/textures/item/steam_cracked_naphtha_bucket.png 638b8b5a67593708802fe09a59bd9354958ddce2 assets/modern_industrialization/textures/item/steel_bolt.png 52413ebbc40bc8ffc13bc9a75b602bc521f07775 assets/modern_industrialization/textures/item/steel_curved_plate.png dc36b7e8337650fcc6a13b224963ab306bd5e394 assets/modern_industrialization/textures/item/steel_double_ingot.png @@ -657,15 +657,15 @@ f7e39e0471b975ee3437d76fb3aa30d4cda6725b assets/modern_industrialization/texture 55af2c11ca064ff4b5d470aab10d1b491e1e30f4 assets/modern_industrialization/textures/item/steel_rod.png e3c597359c183fa1c0b815e045d0a556b5bd7829 assets/modern_industrialization/textures/item/steel_rod_magnetic.png 7aa0449e2917c556c7d820ae10bb0ea71187c5a0 assets/modern_industrialization/textures/item/steel_tiny_dust.png -264b1ac04da7849979f300f6812485661054dfbf assets/modern_industrialization/textures/item/styrene_bucket.png -6f2062783cf33532c38e1c1a27d15047d8d94fe1 assets/modern_industrialization/textures/item/styrene_butadiene_bucket.png -213dbdcca1f73f3f71adcf7f892dcbcde4bbbeaf assets/modern_industrialization/textures/item/styrene_butadiene_rubber_bucket.png -442cc807941fb11362930c0e3c6344895417e8e2 assets/modern_industrialization/textures/item/sugar_solution_bucket.png -a368bc4709b26ded023de27ab5cd283713eca733 assets/modern_industrialization/textures/item/sulfuric_acid_bucket.png -eedc966983e6847adbb1fec6dec2c25d15f936b9 assets/modern_industrialization/textures/item/sulfuric_crude_oil_bucket.png -e7482df8fdcda035391574ed22e9ea83f9fdeaae assets/modern_industrialization/textures/item/sulfuric_heavy_fuel_bucket.png -bdeebd80a070c187fb3358fa74794e5a95782db9 assets/modern_industrialization/textures/item/sulfuric_light_fuel_bucket.png -c17a320f54a5fae4bfa3a5884ed013b3c13b9e9e assets/modern_industrialization/textures/item/sulfuric_naphtha_bucket.png +03de0d343fb410d12db0e9535693b7fb433e9b47 assets/modern_industrialization/textures/item/styrene_bucket.png +b8b9ddd4362c863cf47770ec64f0f397be128b98 assets/modern_industrialization/textures/item/styrene_butadiene_bucket.png +5600e15e8bfbd22bd835f3b213519d5fbc09bc16 assets/modern_industrialization/textures/item/styrene_butadiene_rubber_bucket.png +23126154abe3e0b7075db723eaf3c67dde99725e assets/modern_industrialization/textures/item/sugar_solution_bucket.png +ce67ba0f13e52e64a76e1e1d046733b119b84806 assets/modern_industrialization/textures/item/sulfuric_acid_bucket.png +8762e8b181a608606a09d1b0481b84ec148f921d assets/modern_industrialization/textures/item/sulfuric_crude_oil_bucket.png +0fbfdcab1bd2a2426090917d20cf5e543334d783 assets/modern_industrialization/textures/item/sulfuric_heavy_fuel_bucket.png +7c0d450e9b231c80609c02486ca66f418b8fed61 assets/modern_industrialization/textures/item/sulfuric_light_fuel_bucket.png +c0aaf39072b9f1ff42d24a59928cbfc8c50c9cc4 assets/modern_industrialization/textures/item/sulfuric_naphtha_bucket.png 72c1322013529f2f2fc865798e8ebdb517faa90a assets/modern_industrialization/textures/item/sulfur_dust.png 49ecb19907c53f20a6920ddbf22e81a8988aeb63 assets/modern_industrialization/textures/item/sulfur_tiny_dust.png 6e7f406e0187125016d7ba2a80fcaaaa3185894d assets/modern_industrialization/textures/item/superconductor_double_ingot.png @@ -709,8 +709,8 @@ fbcb6a9d987663d99c96c28a452c19a679b3b2a0 assets/modern_industrialization/texture 99850806daa442ce37a57d6076df0e2b46637ee2 assets/modern_industrialization/textures/item/titanium_rod.png 9967f1c8ae239aca03cb449baae4acb237ad10dc assets/modern_industrialization/textures/item/titanium_rotor.png 2171f78465bb468f55f5d8923cc0289d175e9deb assets/modern_industrialization/textures/item/titanium_tiny_dust.png -5df337ce9261727df2fa0c2ef5c6697573aab091 assets/modern_industrialization/textures/item/toluene_bucket.png -e494eb9409ac151ae4b9e20e1b54ac8046cc9731 assets/modern_industrialization/textures/item/tritium_bucket.png +dab227163713b63b50cd571cf52efe5a4d9c13c2 assets/modern_industrialization/textures/item/toluene_bucket.png +93b249e7d98ffccce9cac2dab3c6630b16953d1d assets/modern_industrialization/textures/item/tritium_bucket.png 221649d7fa3c6141a22f19ecaeeeb298442dd067 assets/modern_industrialization/textures/item/tungsten_double_ingot.png 1199c26fd21df2105b9da2b2a48a7d4f0024129e assets/modern_industrialization/textures/item/tungsten_dust.png 4f45d87bd2da1c365a7fbf2542ede65316296fe9 assets/modern_industrialization/textures/item/tungsten_ingot.png @@ -728,14 +728,14 @@ bae0ea90ccf6eb5e17f04e1c91c9c21f68de2338 assets/modern_industrialization/texture 87d6042d782f862fbb71af9cee132ed37c9ac722 assets/modern_industrialization/textures/item/uranium_238_tiny_dust.png 3f9a1ac183f9c4fee80d18d6a88f43a908746d11 assets/modern_industrialization/textures/item/uranium_dust.png 832d283ed5c6728786d88a3da3a86d89686a8d18 assets/modern_industrialization/textures/item/uranium_fuel_rod.png -fd31ab27b65d16b1e95b7288d37ebf619272d48c assets/modern_industrialization/textures/item/uranium_fuel_rod_depleted.png +e4ca3c52c0a38968efa0f144f9bb88cf70e60dfd assets/modern_industrialization/textures/item/uranium_fuel_rod_depleted.png 7413ad09a31e96146e3fb06fad742c5c7d6f3753 assets/modern_industrialization/textures/item/uranium_fuel_rod_double.png c2225be18236d4988404774b8761e8b0b52398cd assets/modern_industrialization/textures/item/uranium_fuel_rod_quad.png d732d54032aeaa118a167d504bc59c7e4f1acf0c assets/modern_industrialization/textures/item/uranium_ingot.png cbbacda4fb1d84115f49965912a7a382a20d46ab assets/modern_industrialization/textures/item/uranium_nugget.png 68b72a8e21c1a9eb2c87de4222319b201e7d3ca1 assets/modern_industrialization/textures/item/uranium_rod.png 87717668e5c44edfca06d276ae8525659d92a760 assets/modern_industrialization/textures/item/uranium_tiny_dust.png -a13e27ac559c1f8b6fe2b868aedbbf8df73da311 assets/modern_industrialization/textures/item/uu_matter_bucket.png -fc39f3a1b2048fd70d02fa0a5bfb9fbbaf66e8b9 assets/modern_industrialization/textures/item/vinyl_chloride_bucket.png +fab60403925b6593b98103c88f5fb28c566d95cb assets/modern_industrialization/textures/item/uu_matter_bucket.png +ec449bdd3d78eecb262a1b2829d723406a5d7a4a assets/modern_industrialization/textures/item/vinyl_chloride_bucket.png 84a51fcd5d05efa3a4cbca3db76682fc79fc0197 assets/modern_industrialization/textures/item/yttrium_dust.png 3ce9d045de4f1890aee86b7ac641f6514155644c assets/modern_industrialization/textures/item/yttrium_tiny_dust.png diff --git a/src/generated/resources/.cache/5bd35c4697ddab07a78a22a127c645fe1d695c45 b/src/generated/resources/.cache/5bd35c4697ddab07a78a22a127c645fe1d695c45 index 3e315f375..250836d03 100644 --- a/src/generated/resources/.cache/5bd35c4697ddab07a78a22a127c645fe1d695c45 +++ b/src/generated/resources/.cache/5bd35c4697ddab07a78a22a127c645fe1d695c45 @@ -1,4 +1,4 @@ -// 1.21.1 2025-11-18T00:08:48.8815209 Tags for minecraft:block mod id modern_industrialization +// 26.1-snapshot-4 2026-02-03T21:47:16.5910261 Tags for minecraft:block mod id modern_industrialization ef72297aa0ecfbc2672c0b74167d4bf1fa4b262e data/c/tags/block/ores.json b74bc7a6e8507c54ded11660bf60f4e7e06910a0 data/c/tags/block/ores/antimony.json 692748c1f1e0425903fdf4da21c318c4c4a739bb data/c/tags/block/ores/bauxite.json diff --git a/src/generated/resources/.cache/69f2a4ed81790f5f06728c7240caed3977f77613 b/src/generated/resources/.cache/69f2a4ed81790f5f06728c7240caed3977f77613 deleted file mode 100644 index 0f322c194..000000000 --- a/src/generated/resources/.cache/69f2a4ed81790f5f06728c7240caed3977f77613 +++ /dev/null @@ -1,24 +0,0 @@ -// 1.21.1 2024-09-04T12:33:40.3882688 Machine Casings -8d30b453b942ca162a605262040ae30b3e5a1a65 assets/modern_industrialization/models/machine_casing/bricked_bronze.json -5d7b5c9dafe6ca0178d07e71a4d29dabbae51a47 assets/modern_industrialization/models/machine_casing/bricked_steel.json -6936368e509cea5df132d2b278a4bca486b8dc07 assets/modern_industrialization/models/machine_casing/bricks.json -33854fbdc9b3ffb6d01f19eac18e72d38c5cb7d7 assets/modern_industrialization/models/machine_casing/bronze.json -a4959bd4fb4baf60e39ebc625b0f8cc38f75b647 assets/modern_industrialization/models/machine_casing/bronze_plated_bricks.json -22b8ab5c6059b690ab9e3eccbb091c24c344c630 assets/modern_industrialization/models/machine_casing/clean_stainless_steel_machine_casing.json -c09cb0cd102c92eba08c80118206a0f9ace10e04 assets/modern_industrialization/models/machine_casing/configurable_tank.json -8bfc431f47a758acf8abd353e353efe9e02343ba assets/modern_industrialization/models/machine_casing/ev.json -9a053fc32c233c45c58b9b9f4eeaa2f02dca86ee assets/modern_industrialization/models/machine_casing/firebricks.json -fd2b37f16550692a3c67e95f68e0b8d7f687a6d2 assets/modern_industrialization/models/machine_casing/frostproof_machine_casing.json -141ae76fb05dfcc8ed7a0a47bd0893f6b5080f6c assets/modern_industrialization/models/machine_casing/heatproof_machine_casing.json -059a3d57902a83a8e3001ef2d0ab064840481bb0 assets/modern_industrialization/models/machine_casing/hv.json -99be40e93467ba8fc712e409885ab492c436fced assets/modern_industrialization/models/machine_casing/lv.json -4be9c0547846c557a32001cbf0d6e838b9ea0690 assets/modern_industrialization/models/machine_casing/mv.json -e0c94f59dc7b8bb9e370e5b2dc05a0573e6270dc assets/modern_industrialization/models/machine_casing/nuclear_casing.json -8a35dc3a282a7e61b3d1d4f5cb2240ae6ea5e521 assets/modern_industrialization/models/machine_casing/plasma_handling_iridium_machine_casing.json -89ea6dd35056a57bf684e18912d4af4b291090a0 assets/modern_industrialization/models/machine_casing/solid_titanium_machine_casing.json -53ac0ed1ea0bbfe7e9029ad0a3326f1ef1157181 assets/modern_industrialization/models/machine_casing/stainless_steel_machine_casing_pipe.json -f2776cc9ff269bd76a988bd7e70863aeb9c890f2 assets/modern_industrialization/models/machine_casing/steel.json -7adeaa8d4ef9fe76cf205bdc344f085901b87cde assets/modern_industrialization/models/machine_casing/steel_crate.json -0486c11f2b20c687f3e04bc5d1daafe698008af0 assets/modern_industrialization/models/machine_casing/superconductor.json -cc6dcff87ec6eb6461f1485d47c60ae84719c7cf assets/modern_industrialization/models/machine_casing/titanium.json -e39d72275ad17179a2ac1f3f213791208baa84c1 assets/modern_industrialization/models/machine_casing/titanium_machine_casing_pipe.json diff --git a/src/generated/resources/.cache/711a45d6d44a27f0f0d99b0e1562f597de7b3535 b/src/generated/resources/.cache/711a45d6d44a27f0f0d99b0e1562f597de7b3535 deleted file mode 100644 index 0733e815e..000000000 --- a/src/generated/resources/.cache/711a45d6d44a27f0f0d99b0e1562f597de7b3535 +++ /dev/null @@ -1,1382 +0,0 @@ -// 1.21.1 2025-11-03T22:07:21.6396439 Block States: modern_industrialization -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/acetylene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/acrylic_acid.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/acrylic_glue.json -ae3983dab1d79ddbc08d614e7d010198246cc3c0 assets/modern_industrialization/blockstates/advanced_fluid_input_hatch.json -36962723e5f05ce4bca5a229bb323690c5b1c3eb assets/modern_industrialization/blockstates/advanced_fluid_output_hatch.json -02faa49cc44a0566fb5397f438c90228497cbdf9 assets/modern_industrialization/blockstates/advanced_item_input_hatch.json -d5548213425138cf72274cca29b75a5a3989bb4a assets/modern_industrialization/blockstates/advanced_item_output_hatch.json -5c05245e5a5cf847828e6dd7afbd318d71f0b6d5 assets/modern_industrialization/blockstates/advanced_large_steam_boiler.json -0a83f13d9fd0677fa5ebaf6b6337556fcfe50699 assets/modern_industrialization/blockstates/advanced_machine_casing.json -88cd5b171381fb8d79cdfc3abb3f41104bbf5300 assets/modern_industrialization/blockstates/advanced_machine_hull.json -240a603aff0f0a29fd5388905548990e830e907d assets/modern_industrialization/blockstates/aluminum_barrel.json -058a869c42494e6dcc67f50cb2204b65ec4f8795 assets/modern_industrialization/blockstates/aluminum_block.json -6644b502ee0eb1968a870fe5f21f93c3e6a755c5 assets/modern_industrialization/blockstates/aluminum_tank.json -d4e96713df60f59a612a7bf09b1a5cad797bbda1 assets/modern_industrialization/blockstates/annealed_copper_block.json -a3f6a63f8ce02359d00ec6c6948ff23b437c536c assets/modern_industrialization/blockstates/antimony_block.json -68020eb1b3a95c83d32df8205db49b9902f9060b assets/modern_industrialization/blockstates/antimony_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/argon.json -1e5c472e9f74d605b87792445399b20701fc3e87 assets/modern_industrialization/blockstates/assembler.json -66362868004cf85b308cff31d8fdd670df2f8d91 assets/modern_industrialization/blockstates/basic_machine_hull.json -e41425b2b6a2c3166cef850f2d860c042b11ac88 assets/modern_industrialization/blockstates/battery_alloy_block.json -d7ce5010be744a9aeaf01725a3141edd6f44ba11 assets/modern_industrialization/blockstates/bauxite_block.json -0f6764933fe2d08de4d099a2e6fdc0805f2c136a assets/modern_industrialization/blockstates/bauxite_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/benzene.json -3e56f724a609223c7881979b71db0eb4b97dfe77 assets/modern_industrialization/blockstates/beryllium_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/biodiesel.json -85e9f2e3d6aff117def8e8dbe39a46c433e1bee2 assets/modern_industrialization/blockstates/blastproof_casing.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/boosted_diesel.json -e36756f184d9ce6edff025ccde5f74be4f8d0f30 assets/modern_industrialization/blockstates/bronze_barrel.json -c5b6051a3fb945aabbf49e59b26c1a659ac48fbc assets/modern_industrialization/blockstates/bronze_block.json -82f915324575fb25185a0349a80d7584bed9631c assets/modern_industrialization/blockstates/bronze_boiler.json -8026ebfbd986c340ce8f1b3b63ab5bde7f0d7354 assets/modern_industrialization/blockstates/bronze_compressor.json -f88092e7771b1a1eeea3b6428aca43b0cc46b7a1 assets/modern_industrialization/blockstates/bronze_cutting_machine.json -6d23cd795e9e7ee45ad031d25393b1af905893f5 assets/modern_industrialization/blockstates/bronze_fluid_input_hatch.json -0fc7ff598e0e545e1eb772550060e09923ecf232 assets/modern_industrialization/blockstates/bronze_fluid_output_hatch.json -79d18bc22ebd47e8035723e5740cefd59c185752 assets/modern_industrialization/blockstates/bronze_furnace.json -ec3d3d2aab9a2a0571364ffbcc659593c568d976 assets/modern_industrialization/blockstates/bronze_item_input_hatch.json -e6356d9ed72bd92b2ba469e2464966fedba66242 assets/modern_industrialization/blockstates/bronze_item_output_hatch.json -912e17f5d5f38050b577a2c2b528bf32739fe010 assets/modern_industrialization/blockstates/bronze_macerator.json -b41d7c585c1372c0e9dd2be91109c2628f735512 assets/modern_industrialization/blockstates/bronze_machine_casing.json -5db5d1b148940739665ba7f55d4a272d8d4ec1fc assets/modern_industrialization/blockstates/bronze_machine_casing_pipe.json -c940c07d4a020a1427580ca3a92929632a97a3e2 assets/modern_industrialization/blockstates/bronze_mixer.json -e265417a1a40ce606a9fc3e0dff80e7652bcd247 assets/modern_industrialization/blockstates/bronze_plated_bricks.json -7aa774f2420bd3567620a40e83fa6e815f040c2d assets/modern_industrialization/blockstates/bronze_tank.json -e15fc657e906da7e4e952358eb0bc2178e637a56 assets/modern_industrialization/blockstates/bronze_water_pump.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/butadiene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/caprolactam.json -1096989a697277939f0ff8e2c348a86d574f1c1f assets/modern_industrialization/blockstates/centrifuge.json -069d4b3308106a9e545bd8909fbca4ef044360e4 assets/modern_industrialization/blockstates/chemical_reactor.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/chlorine.json -73df7405e233ea3563e30528ebe5c94b058b9c92 assets/modern_industrialization/blockstates/chromium_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/chromium_hydrochloric_solution.json -f10e9648d0980e6bfdab55e5c540fd3455f29877 assets/modern_industrialization/blockstates/clean_stainless_steel_machine_casing.json -9f78ccb0013400270aadebb0f6e8cc3adc84627e assets/modern_industrialization/blockstates/coke_block.json -1f142b5c3a34627e22baf80107690b6e725c33e8 assets/modern_industrialization/blockstates/coke_oven.json -ca521a162c9530d8a799244690e97dfccde51ea4 assets/modern_industrialization/blockstates/configurable_chest.json -fcbd4e726d452344b91a3a1983367dc5892aa373 assets/modern_industrialization/blockstates/configurable_tank.json -480d17dab3c8e13dfcb3f0e3ad8271313b2b3fdb assets/modern_industrialization/blockstates/creative_barrel.json -d844af5de22d29a34e4363c6de2068439ee279d6 assets/modern_industrialization/blockstates/creative_storage_unit.json -b140f2da7c0d93472916977b2e9cad6e6a023bb5 assets/modern_industrialization/blockstates/creative_tank.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/creosote.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/crude_oil.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/cryofluid.json -cb89fc0e141d8d8d75c4192cf39217eec5608747 assets/modern_industrialization/blockstates/cupronickel_block.json -52cb8e5cccf5120eb31a13ee8b94536bc7b2aa37 assets/modern_industrialization/blockstates/cupronickel_coil.json -f91953b7d843d7f51a7a05571a14269715b0a826 assets/modern_industrialization/blockstates/deepslate_antimony_ore.json -eec2f626d7d00ba580e1b620fac93cc0f1dff40e assets/modern_industrialization/blockstates/deepslate_bauxite_ore.json -2653d3ad0dc046ce2d45056fd874a671c7dd588b assets/modern_industrialization/blockstates/deepslate_lead_ore.json -d3b3b77c000017a6c8f6257a8dfabdc968b9d27a assets/modern_industrialization/blockstates/deepslate_lignite_coal_ore.json -8b116556bd333a8de1212dc319a10d1e0313151d assets/modern_industrialization/blockstates/deepslate_monazite_ore.json -a05a896eb0634121b416b353a13b17bbd58cec1f assets/modern_industrialization/blockstates/deepslate_nickel_ore.json -986a98b2f7f48b8edcf053c76006d9a264ec10fe assets/modern_industrialization/blockstates/deepslate_salt_ore.json -6d5e9caa66e91a176229e0ec92ff3abb4c52fd89 assets/modern_industrialization/blockstates/deepslate_tin_ore.json -bed42136fbb643f452e1c2c90213c5ffbef4622e assets/modern_industrialization/blockstates/deepslate_tungsten_ore.json -adeee32ede1f23fc8e5f09a131efa92afcdd86b8 assets/modern_industrialization/blockstates/deepslate_uranium_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/deuterium.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/diesel.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/diethyl_ether.json -e855e68756aa1cbe0f7c8a31edd1c21c3d23e988 assets/modern_industrialization/blockstates/distillation_tower.json -ad103fc8ce8457f21562b1a11ecfd67e68829b4c assets/modern_industrialization/blockstates/distillery.json -da15d0ceb93e6c34b9cc6cc9c8caf86a36cd73b2 assets/modern_industrialization/blockstates/electric_blast_furnace.json -6f1dfc9522be847e6347b4433578ec9faa43b3d0 assets/modern_industrialization/blockstates/electric_compressor.json -a202a8882a7616db1c03c3aa6029624914fae386 assets/modern_industrialization/blockstates/electric_cutting_machine.json -ab27094884eabea12b60eb5d3469b60746fe0252 assets/modern_industrialization/blockstates/electric_furnace.json -ebd53fe72ed907011d0d2ea14ee7d15c76258f7e assets/modern_industrialization/blockstates/electric_macerator.json -8dd67afed4deedf31f8001cd412a433e665def3c assets/modern_industrialization/blockstates/electric_mixer.json -23e8bf3a24b41926c10d1bded161002773c78414 assets/modern_industrialization/blockstates/electric_packer.json -416e0e0704f2ef633b0cd07c77363cc60326aa51 assets/modern_industrialization/blockstates/electric_quarry.json -52b72f489e3cbd1ae868273507b7ddfc61f9c28d assets/modern_industrialization/blockstates/electric_unpacker.json -eaa43d0a260fa4bca79bb660d0cf5917f241a9e5 assets/modern_industrialization/blockstates/electric_water_pump.json -60e7bcbacf2dc61546d49b75246e2e13ab844967 assets/modern_industrialization/blockstates/electric_wiremill.json -e139ff5937b84a87d2ff0f5fd3c67657f7d309ea assets/modern_industrialization/blockstates/electrolyzer.json -8665f226b2e36420e780f5cfa77e2960a1f89f87 assets/modern_industrialization/blockstates/electrum_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/ethanol.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/ethylbenzene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/ethylene.json -fb6de4549b7fd3439668bfd68b2a268fc8ce62d0 assets/modern_industrialization/blockstates/ev_energy_input_hatch.json -a779cb15f5c2bf336c585e52bc804fc8f1ac2b0f assets/modern_industrialization/blockstates/ev_energy_output_hatch.json -5258f4f321ba5cd5426e56504fc1865103ad9333 assets/modern_industrialization/blockstates/ev_hv_transformer.json -6625b67663767dada090930b29bda0c48749b769 assets/modern_industrialization/blockstates/ev_storage_unit.json -306548a3c9241f6161d9f6d89cb820b83d3ceca0 assets/modern_industrialization/blockstates/ev_superconductor_transformer.json -519e186f4a213e70814c460d3d4aa6501c824dc0 assets/modern_industrialization/blockstates/fire_clay_bricks.json -80b8e70e20329dc99b31295c0981cc8e079c7c24 assets/modern_industrialization/blockstates/forge_hammer.json -451a5f64c6ada6d03aac6b187f9268d46d72a909 assets/modern_industrialization/blockstates/frostproof_machine_casing.json -627e8315f3ab1f7d079ca7a5f2ae1136fd7cfa42 assets/modern_industrialization/blockstates/fusion_chamber.json -64949c4ab7c8f6d842059c1b561a362295a31d5e assets/modern_industrialization/blockstates/fusion_reactor.json -238a6eaf807647a73f8d07e0eacd2d0781d393c7 assets/modern_industrialization/blockstates/heatproof_machine_casing.json -44d1c451cd7f9ff3f0af4957988efa18648980b8 assets/modern_industrialization/blockstates/heat_exchanger.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/heavy_fuel.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/heavy_water.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/heavy_water_steam.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/helium.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/helium_3.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/helium_plasma.json -0a9f42a68561f5f8db1df716467f01946ca8ceaa assets/modern_industrialization/blockstates/he_mox_block.json -cece964e6577967898ee618e52d843316358ff73 assets/modern_industrialization/blockstates/he_uranium_block.json -59c00be325c05ad26031a8220bb1b6d5dd6759ab assets/modern_industrialization/blockstates/highly_advanced_fluid_input_hatch.json -4f84297b1c1279306bc123b031904a7a1db88886 assets/modern_industrialization/blockstates/highly_advanced_fluid_output_hatch.json -70eee5dc6fb569e300333d4536b40d8f80638f30 assets/modern_industrialization/blockstates/highly_advanced_item_input_hatch.json -b4ddba67627ad7230e862113be97e8a9469d7da4 assets/modern_industrialization/blockstates/highly_advanced_item_output_hatch.json -c59fec2c299e3cde48bc7b3de4e27633cee5162f assets/modern_industrialization/blockstates/highly_advanced_machine_casing.json -c2dc8162ae72029a71e0ce2af13f3689e2b7b7ce assets/modern_industrialization/blockstates/highly_advanced_machine_hull.json -2b7e80fa47d1ead5be79c62f5ab3c537dbc95b5d assets/modern_industrialization/blockstates/high_pressure_advanced_large_steam_boiler.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_heavy_water.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_heavy_water_steam.json -6a67ead8ac22b915b6a2afab4cfb2acef976335c assets/modern_industrialization/blockstates/high_pressure_large_steam_boiler.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_steam.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_water.json -c7c57d86a3f3e231ce126b609952cb7bd395c03a assets/modern_industrialization/blockstates/hv_diesel_generator.json -1d26fba34db1e7846e78c0f72926f8547907c473 assets/modern_industrialization/blockstates/hv_energy_input_hatch.json -26b5adc925cbd9f7f1d01a34a7142b5a0d8ff18e assets/modern_industrialization/blockstates/hv_energy_output_hatch.json -530cbf5b7366073086c99d3bd9a1a4709e4c1809 assets/modern_industrialization/blockstates/hv_ev_transformer.json -c5ffb416bdf2b01a8ddb1f4399cfc213836a83bd assets/modern_industrialization/blockstates/hv_mv_transformer.json -852268d73912bb267fc4b76b375e69f9e5e90caa assets/modern_industrialization/blockstates/hv_steam_turbine.json -9c79b0f273aacc60ffd7d0a3920aea0a4925c597 assets/modern_industrialization/blockstates/hv_storage_unit.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/hydrochloric_acid.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/hydrogen.json -eb3b343d6e778aa681e9887b6c7028fbfffaa629 assets/modern_industrialization/blockstates/implosion_compressor.json -96ca92b0e5ec111d0da4519960effc54665cab87 assets/modern_industrialization/blockstates/industrial_tnt.json -4de098155d26e01071d4c0cd49360374de2b3bdd assets/modern_industrialization/blockstates/invar_block.json -026180b8d5da7b84692d557ff355d994f94949a7 assets/modern_industrialization/blockstates/iridium_block.json -ae3f625fcaec27c8dd08e16b15db98d143dd4865 assets/modern_industrialization/blockstates/iridium_machine_casing_pipe.json -3ec1dacd7170f183327a48f5df434331e78c5656 assets/modern_industrialization/blockstates/iridium_ore.json -d58b015f997c4f70ee0dd28a76f7cd4e131ae28b assets/modern_industrialization/blockstates/iron_barrel.json -3913c9842076a3d51a6fe9964226713f9cb8eda4 assets/modern_industrialization/blockstates/iron_tank.json -c7117a8418bd75d95449006530e8d54396fdc20b assets/modern_industrialization/blockstates/kanthal_block.json -2d97caa7b200f74d8bef0d9645de2340e27b9196 assets/modern_industrialization/blockstates/kanthal_coil.json -94ece74ae0a9197d8b049c09594e90d0775c3eb2 assets/modern_industrialization/blockstates/large_diesel_generator.json -9d500e04a1f8d086d3ed8b53e073dbfb348e1260 assets/modern_industrialization/blockstates/large_steam_boiler.json -7c9593873984aaff135e6b9076a565872aff7e8e assets/modern_industrialization/blockstates/large_steam_turbine.json -1abd4bdc8e8ee05f850f86eb2bfefa9874f82ebe assets/modern_industrialization/blockstates/large_tank.json -7228175f480e76e604ab14e37955c29a0b447f94 assets/modern_industrialization/blockstates/large_tank_hatch.json -9ec43c37f4e20e16a7295b82e0cdb0c99772b0ca assets/modern_industrialization/blockstates/lead_block.json -734459b7a888863b8d24befd0eb1cfd15e45c1f0 assets/modern_industrialization/blockstates/lead_ore.json -517c9fe8f5d81dbdb0c4f4587648b95d75928f8e assets/modern_industrialization/blockstates/le_mox_block.json -b9bd79bfebe71380068560e3aadf3de896090819 assets/modern_industrialization/blockstates/le_uranium_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/light_fuel.json -12e0af7672fc1dcd1cade9ca017b66be8e68d64a assets/modern_industrialization/blockstates/lignite_coal_block.json -7b5ebdbd397d6d28c922494f3088f6645890ca72 assets/modern_industrialization/blockstates/lignite_coal_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/liquid_air.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/lubricant.json -54cbb0ba68d0fc21e1dbc30ec385203c93fa6703 assets/modern_industrialization/blockstates/lv_diesel_generator.json -3b22f70025de46332b242e943c99a930045f821f assets/modern_industrialization/blockstates/lv_energy_input_hatch.json -98eda71a95d08a0946fc1b673630c2a942eaa7be assets/modern_industrialization/blockstates/lv_energy_output_hatch.json -e473364f1651637d408d27f90fad15b4de45dd9a assets/modern_industrialization/blockstates/lv_mv_transformer.json -b54f50643b2d0f0457e179f4c8fd560211dead9c assets/modern_industrialization/blockstates/lv_steam_turbine.json -c955f8dbd43c13170022eecd40ae5e1e8afd2941 assets/modern_industrialization/blockstates/lv_storage_unit.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/manganese_sulfuric_solution.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/methane.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/molten_redstone.json -33c1509f19bdd3c245eaeae5230d17a4d0735701 assets/modern_industrialization/blockstates/monazite_block.json -45532e044c145642f8ffeedf2bfe9daa91b32e29 assets/modern_industrialization/blockstates/monazite_ore.json -7cb0a6060cb6c4d8d72559403cbaf050a1040306 assets/modern_industrialization/blockstates/mv_diesel_generator.json -713c24432a92d775ebd072d4e89f9ee39494ef66 assets/modern_industrialization/blockstates/mv_energy_input_hatch.json -648fb87ecb751ae44a9546681a2e8872e0e466e0 assets/modern_industrialization/blockstates/mv_energy_output_hatch.json -bc6bc98f5172b5273dfdccb16a0b2cbbde97ee76 assets/modern_industrialization/blockstates/mv_hv_transformer.json -e2439bfb4740b907c3a0449c06ed2548f70ef0e5 assets/modern_industrialization/blockstates/mv_lv_transformer.json -eb37d80438264b8fdd1748dcb88403c1329c1c4c assets/modern_industrialization/blockstates/mv_steam_turbine.json -dc9c8506c4423ac7847c23ed104fb7239fc09da4 assets/modern_industrialization/blockstates/mv_storage_unit.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/naphtha.json -a0dc900cad0f510aa4e9552c9e177ef50de76ebb assets/modern_industrialization/blockstates/neodymium_block.json -28f69d2b4b234b3674726ea36119838261dda5a8 assets/modern_industrialization/blockstates/nickel_block.json -9d0875c29177dd67eae0855bdb9d26b7c2ec38d2 assets/modern_industrialization/blockstates/nickel_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/nitrogen.json -280d29021b7f0da1d787014c047912c91a4c6fac assets/modern_industrialization/blockstates/nuclear_alloy_machine_casing_pipe.json -040544242adac55040dda29ebd7292293eced64b assets/modern_industrialization/blockstates/nuclear_casing.json -60ba95a38dd7116a32c9fae4016c259e42b86c3b assets/modern_industrialization/blockstates/nuclear_fluid_hatch.json -770e3de14936b554a978788c315a4d6b2f6190ec assets/modern_industrialization/blockstates/nuclear_item_hatch.json -833ea5ea63ce64892da3f58f45ae092c4bfad49b assets/modern_industrialization/blockstates/nuclear_reactor.json -2d4a45bc464096a106a817049045f421858fa55f assets/modern_industrialization/blockstates/nuke.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/nylon.json -53d79ba77d9cd1643ffa8ca29eddd3fb9a4c2788 assets/modern_industrialization/blockstates/oil_drilling_rig.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/oxygen.json -1b3b39e38a65a7a3bc7fe1763e156c6cba7cf7b4 assets/modern_industrialization/blockstates/pipe.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/plant_oil.json -f908d12240aff610e40c93aa46d7d4f2c45bf83a assets/modern_industrialization/blockstates/plasma_handling_iridium_machine_casing.json -1df592a975df8bed030f307713397019ba01ba45 assets/modern_industrialization/blockstates/plasma_turbine.json -e5551cdf9167027fe4fc9896862a337b43218e54 assets/modern_industrialization/blockstates/platinum_block.json -bdf2146841ada242045c26005777b6ca2cc5a7eb assets/modern_industrialization/blockstates/platinum_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/platinum_sulfuric_solution.json -6ce087481e2317680b281758c06409e3e266c95a assets/modern_industrialization/blockstates/plutonium_block.json -f59bfcf4c486e35066fe1bfb0aa97098e09b13f7 assets/modern_industrialization/blockstates/polarizer.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/polyethylene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/polyvinyl_chloride.json -0c47ff4b8bc473910effc2ccf02639cba120fb23 assets/modern_industrialization/blockstates/pressurizer.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/propene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/purified_platinum_sulfuric_solution.json -d560b9e2fd95c5ab7340b43e8ec0dae5a5a97a00 assets/modern_industrialization/blockstates/quantum_barrel.json -b9e060c55b15c3d4e14733722c34b701cc5c6f08 assets/modern_industrialization/blockstates/quantum_machine_casing.json -52c92f20078a2d0514a68e9a3be203aa617c5b6d assets/modern_industrialization/blockstates/quantum_machine_hull.json -8c78fced8ca50bcaea129891295c8bd4d85e687f assets/modern_industrialization/blockstates/quantum_tank.json -0749629bba4844283e50aaf0059f891c30067b3d assets/modern_industrialization/blockstates/quartz_ore.json -7aa4f78b678fce82d83d95dbd266321153430735 assets/modern_industrialization/blockstates/raw_antimony_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/raw_biodiesel.json -a70f0e412d3eef9426d9e0ae50fff24028042107 assets/modern_industrialization/blockstates/raw_iridium_block.json -365fa71ed9f058684b879e6dc71967869db523ca assets/modern_industrialization/blockstates/raw_lead_block.json -4be58e2109fca152c6222506dc16967b2e0298ce assets/modern_industrialization/blockstates/raw_nickel_block.json -7a979f086104848985c3419660fe5f63fcfc997d assets/modern_industrialization/blockstates/raw_platinum_block.json -e8a2b4b7bc3bb988fb2df8275efa5efad4746754 assets/modern_industrialization/blockstates/raw_silver_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/raw_synthetic_oil.json -571cbf480b0505cc9a478c1521460429a09f379a assets/modern_industrialization/blockstates/raw_tin_block.json -425bc138ba6af2d8dad86e7be2dc2c119bf4735c assets/modern_industrialization/blockstates/raw_titanium_block.json -b80ce42c84c51d0028daafce8b9e4d4f10449763 assets/modern_industrialization/blockstates/raw_tungsten_block.json -0e136645d51e0e2f6a92ff362d135f8df1f506fd assets/modern_industrialization/blockstates/raw_uranium_block.json -bd5c47586e8b80cfa7c4d6c7c789a9cf1dde3997 assets/modern_industrialization/blockstates/replicator.json -d30826303ba78c5311a0141a564da95674e05919 assets/modern_industrialization/blockstates/salt_block.json -8aef7f707cda847e7948b5913767fe7f18ebea20 assets/modern_industrialization/blockstates/salt_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/shale_oil.json -d8fd6528031bcaa4bd2a45473cecbd3e4a30c7e1 assets/modern_industrialization/blockstates/silicon_block.json -4e228ba30b6130d8878ddbf35a646dc8b64519ca assets/modern_industrialization/blockstates/silver_block.json -a49fad6a9216651b3eb64deacd78c2ae7d88793d assets/modern_industrialization/blockstates/sodium_block.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sodium_hydroxide.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/soldering_alloy.json -22618031fb61f3d39a5ba4aeab4d590dac7f9865 assets/modern_industrialization/blockstates/soldering_alloy_block.json -bf2ba60376bfc7d4fd91072433d81127964e61a7 assets/modern_industrialization/blockstates/solid_titanium_machine_casing.json -2263984323657174291c17d2d3e9fcdff08151a5 assets/modern_industrialization/blockstates/stainless_steel_barrel.json -58f4e5d869918fb2421c3d9ade517aa69d4a23e9 assets/modern_industrialization/blockstates/stainless_steel_block.json -30b4a9be573291df3028bbd5851b148f0bcf9525 assets/modern_industrialization/blockstates/stainless_steel_machine_casing_pipe.json -be2186885c7880937fb9616d5e2b6f3d987bc7c1 assets/modern_industrialization/blockstates/stainless_steel_tank.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam.json -5bc3204821a24276ea1c0bacd95d4fa02bd0bd1b assets/modern_industrialization/blockstates/steam_blast_furnace.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam_cracked_heavy_fuel.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam_cracked_light_fuel.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam_cracked_naphtha.json -1ac697523697f134c8ccbb45f0b4d762261f5b55 assets/modern_industrialization/blockstates/steam_quarry.json -031b6584b62e3c9fcf30fcb89063b041bbf72402 assets/modern_industrialization/blockstates/steel_barrel.json -8c9ce0b90b0518b1d59709a7872b6b81117dc2da assets/modern_industrialization/blockstates/steel_block.json -ab3720ffbfdf8cc0ec3cca9d6ebc8707ba6e9e64 assets/modern_industrialization/blockstates/steel_boiler.json -c2a2db7aec44b16b939bf14df5b09ef1f10a669f assets/modern_industrialization/blockstates/steel_compressor.json -c0a33822905b9cca48314b5aca31eab0dbf04d62 assets/modern_industrialization/blockstates/steel_cutting_machine.json -5bd3b540aa36f7ca672b3fe5d706f73d2d7637be assets/modern_industrialization/blockstates/steel_fluid_input_hatch.json -8576ff0afcb2d480e8654fc6ec66c2edc57ff44b assets/modern_industrialization/blockstates/steel_fluid_output_hatch.json -9c8c63130d8c4e9d1c81f5241ad8989eded39a64 assets/modern_industrialization/blockstates/steel_furnace.json -fcfb0c41dd203a6991c0a8f5402188100415f5ea assets/modern_industrialization/blockstates/steel_item_input_hatch.json -60040c9c9439904df94e18a255d372004badcf3d assets/modern_industrialization/blockstates/steel_item_output_hatch.json -5427208dac33bd4fcb83f35cbcbf3517d64a69da assets/modern_industrialization/blockstates/steel_macerator.json -c08c264ee0f22b2b01a050dd89b9c65c7cc29c63 assets/modern_industrialization/blockstates/steel_machine_casing.json -9955648f3865218526757c250ed715b658065b1c assets/modern_industrialization/blockstates/steel_machine_casing_pipe.json -849704bc366c5e4ee7a7d3789eb1be3de53436fb assets/modern_industrialization/blockstates/steel_mixer.json -823c60a0216d8a6b40a6ef9079b6d57cfe0546af assets/modern_industrialization/blockstates/steel_packer.json -a32086d8ab0e801c67ca08b3fae34ed05f38e970 assets/modern_industrialization/blockstates/steel_tank.json -47b6003325d825191390205989dd57d432ce7ff6 assets/modern_industrialization/blockstates/steel_unpacker.json -ce06de5d717d245948f69d1f9e58a28bda854a66 assets/modern_industrialization/blockstates/steel_water_pump.json -6dcbbf516789f1ec7b4fb5365c767aa78c2aa379 assets/modern_industrialization/blockstates/steel_wiremill.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/styrene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/styrene_butadiene.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/styrene_butadiene_rubber.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sugar_solution.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_acid.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_crude_oil.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_heavy_fuel.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_light_fuel.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_naphtha.json -f63cdf1d62df750445f95e6b2e9622485805e8c0 assets/modern_industrialization/blockstates/sulfur_block.json -1faf71f9a44dc734b05792764e4e67103b34c685 assets/modern_industrialization/blockstates/superconductor_coil.json -4531805f1b16cfdf2bdca94d76e7e08d0f9e7e09 assets/modern_industrialization/blockstates/superconductor_energy_input_hatch.json -e2a9132a17d1bdd782d6cc5fb332c6cbacf4ca91 assets/modern_industrialization/blockstates/superconductor_energy_output_hatch.json -a53a8bd683c86a3acde06994ea383294594d1946 assets/modern_industrialization/blockstates/superconductor_ev_transformer.json -2ed9dda6d5588e560f4452458b0c5edc57d6d8f7 assets/modern_industrialization/blockstates/superconductor_storage_unit.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/synthetic_oil.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/synthetic_rubber.json -26c3a3c0fb5d2728212ae313b0975b37e9bd60c0 assets/modern_industrialization/blockstates/tin_block.json -7cecba7050191f0dfdad8e48bd1a0df28964f3a6 assets/modern_industrialization/blockstates/tin_ore.json -155e52a5bd64b52206586138867c586b40cec119 assets/modern_industrialization/blockstates/titanium_barrel.json -f0a5d40d3c51b2af064f04246b9304e4eacd0483 assets/modern_industrialization/blockstates/titanium_block.json -20e8405426b63129b35133a5477f8e508d89e155 assets/modern_industrialization/blockstates/titanium_machine_casing_pipe.json -ec864200a9016d3908a4dcccd1100cc86b8b200d assets/modern_industrialization/blockstates/titanium_ore.json -9e54e4a82a65c10ceccf0c333a46c2f4ba3b8fd0 assets/modern_industrialization/blockstates/titanium_tank.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/toluene.json -7ed4504fb8c5d81aee6a5cfd595fcd4ca85d7837 assets/modern_industrialization/blockstates/trash_can.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/tritium.json -d381b163a238f54d2be3fa3d50b10798819bce4b assets/modern_industrialization/blockstates/tungsten_block.json -0e7b7a2bef3877298780818e557d927874a3c67a assets/modern_industrialization/blockstates/tungsten_ore.json -56100c1e3cfcd74d5b3cc70797646594925d321d assets/modern_industrialization/blockstates/turbo_fluid_input_hatch.json -a752bc6c039e56c607d297d08cb554183d9d9db8 assets/modern_industrialization/blockstates/turbo_fluid_output_hatch.json -6387da92a9337b5692e8cf15e20060875b611f01 assets/modern_industrialization/blockstates/turbo_item_input_hatch.json -643629a24fb7ca31b1aa0d6767318c5cb63ac9a5 assets/modern_industrialization/blockstates/turbo_item_output_hatch.json -520126526322e5ba7b647736677b792899952810 assets/modern_industrialization/blockstates/turbo_machine_casing.json -4bc94827a2d42251fbf586ac0c7dc041019aa6ff assets/modern_industrialization/blockstates/turbo_machine_hull.json -76acc758dae161d8bd5a0a837d341ccccb8bf46c assets/modern_industrialization/blockstates/uranium_235_block.json -6822e6755c6acd3e5586ca6da0845aced7a2e80d assets/modern_industrialization/blockstates/uranium_238_block.json -8508f67c9ed13a4f4769ba69ee5c548e7708235b assets/modern_industrialization/blockstates/uranium_block.json -70028b8a955f3d666e6150edd39f20fcf91e9d03 assets/modern_industrialization/blockstates/uranium_ore.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/uu_matter.json -94c2b48a53c14e5e0499679cfd7620e1220d6995 assets/modern_industrialization/blockstates/vacuum_freezer.json -3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/vinyl_chloride.json -34095e037d403e4e3aaaf168f7d9d8d0b1a8a0f8 assets/modern_industrialization/blockstates/yttrium_block.json -48a1db3a943b3daabfed6f65a0c2c38686c44edd assets/modern_industrialization/models/block/advanced_fluid_input_hatch.json -48a1db3a943b3daabfed6f65a0c2c38686c44edd assets/modern_industrialization/models/block/advanced_fluid_output_hatch.json -7b54a58e80112bc39c1cd7f874e5bee13523870d assets/modern_industrialization/models/block/advanced_item_input_hatch.json -7b54a58e80112bc39c1cd7f874e5bee13523870d assets/modern_industrialization/models/block/advanced_item_output_hatch.json -93fd91d2f48642790f72f9c96f14743fcc77c8e6 assets/modern_industrialization/models/block/advanced_large_steam_boiler.json -94beafd19a89e6e158b3074d4173b8f83509f4f7 assets/modern_industrialization/models/block/advanced_machine_casing.json -002b76f781d2a54d6d826e14d6c2035871d509b0 assets/modern_industrialization/models/block/advanced_machine_hull.json -f42bc2df35143bc6f737f1bece445dc55567648b assets/modern_industrialization/models/block/aluminum_barrel.json -e728a336d91dd56e5469037eda168828ef25f5c2 assets/modern_industrialization/models/block/aluminum_block.json -3c58b303d67d4abaf91e8b4520abbf8bb97d0912 assets/modern_industrialization/models/block/aluminum_tank.json -20e14ac17471859bc6f69a5352988650603535e0 assets/modern_industrialization/models/block/annealed_copper_block.json -c6247389c361ab40be8f881d980d42252092f48a assets/modern_industrialization/models/block/antimony_block.json -e27dbdfbcd575239799617e6fd28f5c4af7e09cd assets/modern_industrialization/models/block/antimony_ore.json -e7d14e9a882ebe778cf8682ad2828b2d6940e0d3 assets/modern_industrialization/models/block/assembler.json -bb2e61e926a7e2a7a6b45c05dab0589d31e06223 assets/modern_industrialization/models/block/basic_machine_hull.json -f858532ce3eaf88e3b192e4b907f178cf9c72fe1 assets/modern_industrialization/models/block/battery_alloy_block.json -bac697d95dcec2c2f6ebc0740cc77aaf66b1ac98 assets/modern_industrialization/models/block/bauxite_block.json -b351f26a36ad21c68530905fce027d0889f4629c assets/modern_industrialization/models/block/bauxite_ore.json -65b3350158984c7c570ff9ca5b9d90af62b8cc13 assets/modern_industrialization/models/block/beryllium_block.json -7e5514922beb5450becc0bd6d7c693ed61320580 assets/modern_industrialization/models/block/blastproof_casing.json -9f9adb468996fbe1ab4f6cbf1647ea95fd9d8a1b assets/modern_industrialization/models/block/bronze_barrel.json -d5b5f7264ab912b75e6b85416dbbce6b33601b9e assets/modern_industrialization/models/block/bronze_block.json -80bdecd7de01d8edb0c3c0ad3cef614f5999407b assets/modern_industrialization/models/block/bronze_boiler.json -fc4c40d801444bd66d73caf5ebf324b28c873fa0 assets/modern_industrialization/models/block/bronze_compressor.json -bbbc63aba9194a148a00d810127447ee9f56f5b0 assets/modern_industrialization/models/block/bronze_cutting_machine.json -ad4d2a7c4e5866c5d0b6043edbca51e1d0b30f11 assets/modern_industrialization/models/block/bronze_fluid_input_hatch.json -ad4d2a7c4e5866c5d0b6043edbca51e1d0b30f11 assets/modern_industrialization/models/block/bronze_fluid_output_hatch.json -fcbf13537221f332b09652fe65a36fd6061cb988 assets/modern_industrialization/models/block/bronze_furnace.json -423cbe2e595c0a62e377ead15f4d51c6dcbe01aa assets/modern_industrialization/models/block/bronze_item_input_hatch.json -423cbe2e595c0a62e377ead15f4d51c6dcbe01aa assets/modern_industrialization/models/block/bronze_item_output_hatch.json -3a17547a1c9392264b195156ea7de8448513fe30 assets/modern_industrialization/models/block/bronze_macerator.json -50b0bb6357245524953fc7b5fa199446e221b463 assets/modern_industrialization/models/block/bronze_machine_casing.json -fdb1e9d4a4e4eb3bac9847085b7c5387e6e6d427 assets/modern_industrialization/models/block/bronze_machine_casing_pipe.json -206e7019e283dfde7f97cc00a021e1ab8089b582 assets/modern_industrialization/models/block/bronze_mixer.json -c2b6affcaec9358047b1d8dbd09efb5346f96efe assets/modern_industrialization/models/block/bronze_plated_bricks.json -00c5201fd068e61b80ab42dccd543f90858f4e0e assets/modern_industrialization/models/block/bronze_tank.json -162776174177af9b47e41a5b142401d0786bd5c7 assets/modern_industrialization/models/block/bronze_water_pump.json -4ba4c58e597fd0313f20ab4ed242fe8df393a15a assets/modern_industrialization/models/block/centrifuge.json -ef6b47d808d76d351c726a6978c8194dc3f3355f assets/modern_industrialization/models/block/chemical_reactor.json -ac84b02b726259c30cc836b21907c7c8291d7118 assets/modern_industrialization/models/block/chromium_block.json -0d7d29581e59d503aaffd6b6d04dcf8c61712019 assets/modern_industrialization/models/block/clean_stainless_steel_machine_casing.json -82a7228cc4c0bea7823cc3932eb2e4be32f7fdf5 assets/modern_industrialization/models/block/coke_block.json -2fd672178a4ab2c998c097e8b2ea8c1dfcebdffb assets/modern_industrialization/models/block/coke_oven.json -b87702849af4028fe7486c5274fe674a756ca66e assets/modern_industrialization/models/block/configurable_chest.json -e72c27ebbe7c8492907063edee0bafd30e857a50 assets/modern_industrialization/models/block/configurable_tank.json -8800737ea102f72ad199abf7c0cf71c5e6503790 assets/modern_industrialization/models/block/creative_barrel.json -d6a2d213e68109d36402344a0b87881eea42b916 assets/modern_industrialization/models/block/creative_storage_unit.json -62ed1a39da3ef75ca5804a45defbed771a6f5b22 assets/modern_industrialization/models/block/creative_tank.json -db13081313160f83ef961d483c991cb8263b06ce assets/modern_industrialization/models/block/cupronickel_block.json -4d63b03ee3b7b9da07f62a21a75920133a54b32d assets/modern_industrialization/models/block/cupronickel_coil.json -aa927f541bf18e5ec982db667f7a9d0de7a66f03 assets/modern_industrialization/models/block/deepslate_antimony_ore.json -472509658c89774701d5f2deff18b33fa9b650ce assets/modern_industrialization/models/block/deepslate_bauxite_ore.json -837a2b1bf031f0b06f06ad28d5a1ae347a3caa4b assets/modern_industrialization/models/block/deepslate_lead_ore.json -76650a64aa6a5a5af644fd5098d01e0c33b78662 assets/modern_industrialization/models/block/deepslate_lignite_coal_ore.json -02122b6e2904bf5de4e4fb7f67c159f0abd2a516 assets/modern_industrialization/models/block/deepslate_monazite_ore.json -1e347b8cf30a498f611d3e117f73fc48842d7a18 assets/modern_industrialization/models/block/deepslate_nickel_ore.json -5f47130eb629a1223cd779af9091877a07fb78fe assets/modern_industrialization/models/block/deepslate_salt_ore.json -45a82df152acf0433444b8693ff7c95714fcc692 assets/modern_industrialization/models/block/deepslate_tin_ore.json -16cdc7379ed8bae7ec87980758503d79e7ed8e69 assets/modern_industrialization/models/block/deepslate_tungsten_ore.json -8402dacba3bd46fa0c3d5075059c68de0adc60fb assets/modern_industrialization/models/block/deepslate_uranium_ore.json -d1e0ba127e5555e688fcc7deeed7653032cd79d2 assets/modern_industrialization/models/block/distillation_tower.json -675a6da06c5a4dc53c0d1de3de4840a1b5ee1408 assets/modern_industrialization/models/block/distillery.json -967b3dd1a22ea32bd621bc5284745a4916615782 assets/modern_industrialization/models/block/electric_blast_furnace.json -d2134675059339cc83590306ce01c9f627377475 assets/modern_industrialization/models/block/electric_compressor.json -43546b03a3f23f9dd78b9803cbdfa78b4440881d assets/modern_industrialization/models/block/electric_cutting_machine.json -ddbcb6d296dfd0f446655143efc6eba6b8584421 assets/modern_industrialization/models/block/electric_furnace.json -a95ecc7c7fa7ecb22ee696afe3cd3b4969ea28ab assets/modern_industrialization/models/block/electric_macerator.json -c49e8540412f1b61e23850bc82b9254d498ce727 assets/modern_industrialization/models/block/electric_mixer.json -51ff5d8c2edfcb40c45f48d3171bf0d79cbb4b2a assets/modern_industrialization/models/block/electric_packer.json -73387215e1e6045a0175bd635b15ea26168e34d7 assets/modern_industrialization/models/block/electric_quarry.json -0ae107077da652ce41790160c4f2b67d1cc668bb assets/modern_industrialization/models/block/electric_unpacker.json -6218d3f07b5f030bc1ab91805c82bd58edb58f9d assets/modern_industrialization/models/block/electric_water_pump.json -a23ea9c9a1aa2e874e45965750a85c46d94370d3 assets/modern_industrialization/models/block/electric_wiremill.json -23c913dea92460f368448d67dc7dc65368cbc791 assets/modern_industrialization/models/block/electrolyzer.json -8f7fdf38a5a38abe96f4ed60c3beb9e5469c2dfb assets/modern_industrialization/models/block/electrum_block.json -96bdb15ee0f386075d8e59b1a3c8c566a9312a4a assets/modern_industrialization/models/block/ev_energy_input_hatch.json -1a29031bf59b72fdeb76aa2068ff6dd988d62a59 assets/modern_industrialization/models/block/ev_energy_output_hatch.json -190a8ff3a02319ea8f0c54cf11af3daeedc041b4 assets/modern_industrialization/models/block/ev_hv_transformer.json -0744aa4a1d15d6ed1b3522840be346d0fc5de098 assets/modern_industrialization/models/block/ev_storage_unit.json -3ad3670c50700fcd970092942dc78b8ff2fe3e1d assets/modern_industrialization/models/block/ev_superconductor_transformer.json -c97b941813053f0f97929e162a3d8a2a778a16da assets/modern_industrialization/models/block/fire_clay_bricks.json -145a7a796a7e416b055ae7bcf53ab94c57ef6496 assets/modern_industrialization/models/block/frostproof_machine_casing.json -14ee3a00e68ce939e494b84434675dd95dec1185 assets/modern_industrialization/models/block/fusion_chamber.json -d1956f2daccfd3709e8f63ffa1c8fcbfcddce52c assets/modern_industrialization/models/block/fusion_reactor.json -8d0754b1515c4907b7aff0c284120450f13d92f0 assets/modern_industrialization/models/block/heatproof_machine_casing.json -ab50caeed935678a53e7692192bd4949edb7cfcb assets/modern_industrialization/models/block/heat_exchanger.json -ecb7bf7f373eb2b2118a7428242a596568db0938 assets/modern_industrialization/models/block/he_mox_block.json -9da1bf56d81c8ea40fa6ea0216ddc48ad9217db1 assets/modern_industrialization/models/block/he_uranium_block.json -fbf0a45b8fb8de52370ca06b053bd7db93f9adcd assets/modern_industrialization/models/block/highly_advanced_fluid_input_hatch.json -fbf0a45b8fb8de52370ca06b053bd7db93f9adcd assets/modern_industrialization/models/block/highly_advanced_fluid_output_hatch.json -ebef8f71aeb8cae0098ff17b138ae0b4fe52eb11 assets/modern_industrialization/models/block/highly_advanced_item_input_hatch.json -ebef8f71aeb8cae0098ff17b138ae0b4fe52eb11 assets/modern_industrialization/models/block/highly_advanced_item_output_hatch.json -153c39f640ed563874e234327e0c2f951e5a2a6a assets/modern_industrialization/models/block/highly_advanced_machine_casing.json -786f6c2882c16adc1b326ec351cbdd035bce27c9 assets/modern_industrialization/models/block/highly_advanced_machine_hull.json -33deb7b0ac5733c046d3ecffe4fca1623d8095c5 assets/modern_industrialization/models/block/high_pressure_advanced_large_steam_boiler.json -33deb7b0ac5733c046d3ecffe4fca1623d8095c5 assets/modern_industrialization/models/block/high_pressure_large_steam_boiler.json -6d86231dc00c576af126a068307aae5faa94a6e8 assets/modern_industrialization/models/block/hv_diesel_generator.json -eaded26686ae35a19fac5430956ed5d8a109b11a assets/modern_industrialization/models/block/hv_energy_input_hatch.json -8d202cc26d634033390db3f3ac62dedb7e34ec78 assets/modern_industrialization/models/block/hv_energy_output_hatch.json -1e707a8a3ad72c28a3ea58976ca55715851e0127 assets/modern_industrialization/models/block/hv_ev_transformer.json -0b0e65eb9dd77abcd824049266c93137840b3858 assets/modern_industrialization/models/block/hv_mv_transformer.json -b39ed2fe9882040de0eb2b126dc94c6b54579ef5 assets/modern_industrialization/models/block/hv_steam_turbine.json -dafda7585008dc421f4e344044c5badf3e06c6c9 assets/modern_industrialization/models/block/hv_storage_unit.json -9d6257f68328b1d3a2cefb3403ea4af667e29457 assets/modern_industrialization/models/block/implosion_compressor.json -1353f6a2bb4e2afdda7aa23a047d5d94b2544e40 assets/modern_industrialization/models/block/invar_block.json -505372cd93acd72c5ac0b6d8b8127e1af6dbca0e assets/modern_industrialization/models/block/iridium_block.json -8d443e3f8662065592fc8aebc302137ed40f9a67 assets/modern_industrialization/models/block/iridium_machine_casing_pipe.json -dfe4d07752908f2bcd51bac04d8573e9645e7d41 assets/modern_industrialization/models/block/iridium_ore.json -b430c02e3babaf5d4f9c38e3dec968e76cbe2ade assets/modern_industrialization/models/block/iron_barrel.json -dd21c312dbcc04197af43ef8cb178f4609910091 assets/modern_industrialization/models/block/iron_tank.json -990da395b37e42b1023000b6f101381c4e3ce0f2 assets/modern_industrialization/models/block/kanthal_block.json -546f8b06506b56832a8afe1295a138d0ce79d585 assets/modern_industrialization/models/block/kanthal_coil.json -ae1e2610888c48412da42d07b576b8ead8af1951 assets/modern_industrialization/models/block/large_diesel_generator.json -93fd91d2f48642790f72f9c96f14743fcc77c8e6 assets/modern_industrialization/models/block/large_steam_boiler.json -3feb3c49399e8ba2ae4de4a2b77d621dc9c67815 assets/modern_industrialization/models/block/large_steam_turbine.json -b81a6f11827e4bae042f9b900ce5e04108fba0f5 assets/modern_industrialization/models/block/large_tank.json -3b945e095ce4bf2f0a1d9c65f58bbc5bb3bc9bfa assets/modern_industrialization/models/block/large_tank_hatch.json -b254aa7b8b16d49839e34f87cdedde6ed48ded9a assets/modern_industrialization/models/block/lead_block.json -3e1077467f6eb0d79a15a1e82874593c4ddfde2c assets/modern_industrialization/models/block/lead_ore.json -86d8cdfd599a52d74390ebabe0d359aacb419825 assets/modern_industrialization/models/block/le_mox_block.json -81aac20fdcb554407321015c807339aeeaa23f22 assets/modern_industrialization/models/block/le_uranium_block.json -4554c9460971256668db5f3f9223b65921c97dcf assets/modern_industrialization/models/block/lignite_coal_block.json -fb16d63006d1f6f298daabe9a2e73656edca43d9 assets/modern_industrialization/models/block/lignite_coal_ore.json -ec135a24ccace0fe4d8ddcb917d661ec4117da1c assets/modern_industrialization/models/block/lv_diesel_generator.json -9c4f88bd02e35e117487c6b328457a61df625910 assets/modern_industrialization/models/block/lv_energy_input_hatch.json -797839a215d23e88bf3d70f04b97e0a28a3f1613 assets/modern_industrialization/models/block/lv_energy_output_hatch.json -d529c9f164d425bf8fd524a1df335d6064bbcc26 assets/modern_industrialization/models/block/lv_mv_transformer.json -f97cbd63ee560e5bf918608a086a04a6771ff8b0 assets/modern_industrialization/models/block/lv_steam_turbine.json -892e130079970a50cd54a973d5f47cc2f174deb7 assets/modern_industrialization/models/block/lv_storage_unit.json -933f4e066f0c245b2ec3de8fb536c9ac589dc1b6 assets/modern_industrialization/models/block/monazite_block.json -7b77c1d55333db12ed47a413cb0909b0bf638499 assets/modern_industrialization/models/block/monazite_ore.json -8dedde6462011737bc09cfc42ec1f29c55175694 assets/modern_industrialization/models/block/mv_diesel_generator.json -af592e7ebdcbe8347c6f9e24e748d0dc2685faef assets/modern_industrialization/models/block/mv_energy_input_hatch.json -a3d8de4558b98046e163ac28a9f59a7aeb34ff39 assets/modern_industrialization/models/block/mv_energy_output_hatch.json -d02fdc3d9eea102746be906201e2306ccc8296c3 assets/modern_industrialization/models/block/mv_hv_transformer.json -62101046759cc3c798c7fde7be78269b686732e4 assets/modern_industrialization/models/block/mv_lv_transformer.json -0d46cdb3b576ab622390b5fec418acaba49f7ce3 assets/modern_industrialization/models/block/mv_steam_turbine.json -55cfb6945d384117a6e3964f9aa956ba5575b443 assets/modern_industrialization/models/block/mv_storage_unit.json -0a1155636b1bd42db67300be8b6e6cd63faefd01 assets/modern_industrialization/models/block/neodymium_block.json -2f726c4d8306fa0e1ed5a79a40325e2f6f4edd17 assets/modern_industrialization/models/block/nickel_block.json -9ac06875f6cb2c4f9dfad0d66fa5934f2d453934 assets/modern_industrialization/models/block/nickel_ore.json -a5bf0d483bd388437a2acc44c462f0cd23d21abf assets/modern_industrialization/models/block/nuclear_alloy_machine_casing_pipe.json -21351a04a8ec395f2032b26756facc61c2d500d4 assets/modern_industrialization/models/block/nuclear_casing.json -cf0e4cd5c158ec3c502385c90c4d002823e9870f assets/modern_industrialization/models/block/nuclear_fluid_hatch.json -cd43cf95d48f9707ba46018f51d99468d22065c0 assets/modern_industrialization/models/block/nuclear_item_hatch.json -b4cd91c567a68b12962302ee0500b568a69e3166 assets/modern_industrialization/models/block/nuclear_reactor.json -eb3d2b2461a7f0146eccf5b6c130680db5fbfe0c assets/modern_industrialization/models/block/oil_drilling_rig.json -ae3043647189b4168f1661d21536109d16f62f21 assets/modern_industrialization/models/block/pipe.json -0d08a83ccbed27eeed8eeb5636e1de1852fe9a21 assets/modern_industrialization/models/block/plasma_handling_iridium_machine_casing.json -5e46c71fac42b1683e8242af6eabc719184727ad assets/modern_industrialization/models/block/plasma_turbine.json -0ec7ff0e12d2fd5ec9ed24e3e326181efa9a9616 assets/modern_industrialization/models/block/platinum_block.json -a3f477e1899e504378b58326dfad80ed82c7226c assets/modern_industrialization/models/block/platinum_ore.json -ba77e9568a6125ea28772dc26f0e4e103726ce56 assets/modern_industrialization/models/block/plutonium_block.json -8c358b91495903bb6a2876607237f16bc2a2c278 assets/modern_industrialization/models/block/polarizer.json -1f91125c67021acfc2fb55bdc43f1a608b467ebf assets/modern_industrialization/models/block/pressurizer.json -d0f9a201d36d642258f6884efa1f9304825783c9 assets/modern_industrialization/models/block/quantum_barrel.json -4dbbc1171de5747d849f3ad5bbc0907604326de5 assets/modern_industrialization/models/block/quantum_machine_casing.json -8646c16b69635cd935f4e4eed14fda9d836815b9 assets/modern_industrialization/models/block/quantum_machine_hull.json -ddc3043aede64014ee4c375f5e12999f0a367054 assets/modern_industrialization/models/block/quantum_tank.json -bccf5af67694d7206ab5ef24e7a7332906e21741 assets/modern_industrialization/models/block/quartz_ore.json -1dcf992113553b3f5f703b1679f0ce428a7b41c5 assets/modern_industrialization/models/block/raw_antimony_block.json -458f1641b72f23074cfb69faa708e53e9f1d0e5f assets/modern_industrialization/models/block/raw_iridium_block.json -a9bd3235187f6c19bb64135f6cbd4c2f4ab220f7 assets/modern_industrialization/models/block/raw_lead_block.json -50a291b5249d1e7026c241318ffe856a88bad4ef assets/modern_industrialization/models/block/raw_nickel_block.json -9e452568f292f7df92e27e2e2d7d1019d46c6ded assets/modern_industrialization/models/block/raw_platinum_block.json -5980547a8f0a0a4f021b11ee37bcb05156e23f05 assets/modern_industrialization/models/block/raw_silver_block.json -2d5aa6165fef56182777c7dd202c4396fb013a14 assets/modern_industrialization/models/block/raw_tin_block.json -5268a9521ce8935af1edd7d1369e814426dad6b6 assets/modern_industrialization/models/block/raw_titanium_block.json -ac0899e0a3f94220a1edfabc459f73b4224381a6 assets/modern_industrialization/models/block/raw_tungsten_block.json -8bc7b44a48896332735880ad5da22273cb1332a3 assets/modern_industrialization/models/block/raw_uranium_block.json -e467f3ca4428183e6937e4354ba8b890539c2ea8 assets/modern_industrialization/models/block/replicator.json -aca87775b774129f5214345b2c377ac950d878f1 assets/modern_industrialization/models/block/salt_block.json -c135f62e65f9f233cfa98f0c25877a2975ec4cb7 assets/modern_industrialization/models/block/salt_ore.json -64a99c034f25a419e7df92994c6edb91bf0959ad assets/modern_industrialization/models/block/silicon_block.json -f795acae8059460aa1f2d1c5228d902560fbea52 assets/modern_industrialization/models/block/silver_block.json -eb5dda338fca25537f81ba96064344263140cfe1 assets/modern_industrialization/models/block/sodium_block.json -a20e16ff555c023883a15b1a70435c90bc663506 assets/modern_industrialization/models/block/soldering_alloy_block.json -4bdb453c6ae656b228519904df539c4baf1fecd3 assets/modern_industrialization/models/block/solid_titanium_machine_casing.json -e8704a9204a8312b6086256bfc660237e5607cf5 assets/modern_industrialization/models/block/stainless_steel_barrel.json -cd8a0e1abd8d88890fa1f940abef5d21f9bc1a6c assets/modern_industrialization/models/block/stainless_steel_block.json -b3d6e84fc427386ccde8c2dc2b1997d631af70c5 assets/modern_industrialization/models/block/stainless_steel_machine_casing_pipe.json -eaa8e31b9c55f2127b9ff4cf6171b3cf9584b713 assets/modern_industrialization/models/block/stainless_steel_tank.json -45d02a967333fe057e8533dea412a9fa55f9f431 assets/modern_industrialization/models/block/steam_blast_furnace.json -0cf706217ae2512be93e03de5866477b3c4b93a0 assets/modern_industrialization/models/block/steam_quarry.json -32b0115ad2662e47a7765a6fd8e74495ab8642f3 assets/modern_industrialization/models/block/steel_barrel.json -0cfc46526f65b8af6cb7a9812414c836586b714d assets/modern_industrialization/models/block/steel_block.json -7701155cef7b9191a1b215c905a6df63b2325a25 assets/modern_industrialization/models/block/steel_boiler.json -5580e0f63eb37d222afe4d620bd3edddfc5113a5 assets/modern_industrialization/models/block/steel_compressor.json -82507198ee3f74c7a54be2619d436ac24246de97 assets/modern_industrialization/models/block/steel_cutting_machine.json -067308cf05ea72d054ccf6816a595a09e6aa5875 assets/modern_industrialization/models/block/steel_fluid_input_hatch.json -067308cf05ea72d054ccf6816a595a09e6aa5875 assets/modern_industrialization/models/block/steel_fluid_output_hatch.json -8855d0bf67d7a39cb198bb97aab3a278896f4d10 assets/modern_industrialization/models/block/steel_furnace.json -ea11153b3a4644d2bdfe17c2cc7a8fe6a2f906dc assets/modern_industrialization/models/block/steel_item_input_hatch.json -ea11153b3a4644d2bdfe17c2cc7a8fe6a2f906dc assets/modern_industrialization/models/block/steel_item_output_hatch.json -b1285669b280d1cd54baa0696bba6febafcced11 assets/modern_industrialization/models/block/steel_macerator.json -5142699818c93340fc0d7733fb66b183a283abe4 assets/modern_industrialization/models/block/steel_machine_casing.json -27078fb186d9f8b271288c396d62fa478073be7b assets/modern_industrialization/models/block/steel_machine_casing_pipe.json -f137b0a97cce5f3fb68b11c9298862f9a0ed1fec assets/modern_industrialization/models/block/steel_mixer.json -9ce8a65b1663b109980f885035efca2665b27c47 assets/modern_industrialization/models/block/steel_packer.json -8502851428d725e47735dbca39f03a77d4ff3903 assets/modern_industrialization/models/block/steel_tank.json -bd3185536a614035ffd7f762b8477cda0d93ff94 assets/modern_industrialization/models/block/steel_unpacker.json -198c588103a3012d9130e7a0ed8e215a27eab704 assets/modern_industrialization/models/block/steel_water_pump.json -6580896943d13d5dccb6b4f827720717361e3a20 assets/modern_industrialization/models/block/steel_wiremill.json -6718fdfcb1b39f1bc76b3b315c99592dbcc1e6a7 assets/modern_industrialization/models/block/sulfur_block.json -00551e5444f51ff8da2f899b92d09d3835e99ad3 assets/modern_industrialization/models/block/superconductor_coil.json -d23c4fa886ab91120d7537da9707c62d3563cc6d assets/modern_industrialization/models/block/superconductor_energy_input_hatch.json -3469b9d60ee9501cf89751f7c9c570d912ad61c8 assets/modern_industrialization/models/block/superconductor_energy_output_hatch.json -30087ce3e338bf49e95739fbbcd3c62e6ce1c946 assets/modern_industrialization/models/block/superconductor_ev_transformer.json -53fedbbff71399b6e82df83115b9c3289a9ed85d assets/modern_industrialization/models/block/superconductor_storage_unit.json -8fe7101d68e71ccde4244c1a71a3ae35fc9e86a0 assets/modern_industrialization/models/block/tin_block.json -30c37e2492bc63a054c7c2e2c8ca992216fdee0f assets/modern_industrialization/models/block/tin_ore.json -6514edf512e0db6b42df7b659073c7ea16af717f assets/modern_industrialization/models/block/titanium_barrel.json -60cd8dee147846596a3a30dd7f639f1ae5283eae assets/modern_industrialization/models/block/titanium_block.json -2b5c41809012aee4b5751471a8d6a7a1cc83339c assets/modern_industrialization/models/block/titanium_machine_casing_pipe.json -283664c9adac445b1dc7dfd244d1a9d2093ae2b3 assets/modern_industrialization/models/block/titanium_ore.json -c02793a41ef9e134c2654f5d30fbac747a0f65b2 assets/modern_industrialization/models/block/titanium_tank.json -b0b465db24b114dc31928151c3dc511d4c453a14 assets/modern_industrialization/models/block/trash_can.json -c50e8627603cb6bbc3a13f8e4e9a18e50155be1a assets/modern_industrialization/models/block/tungsten_block.json -9df2b6a100256bb643a58bc3889cee745a2f9dff assets/modern_industrialization/models/block/tungsten_ore.json -fa1b412a0e03b138e1e239a62dcf3726475c5ec3 assets/modern_industrialization/models/block/turbo_fluid_input_hatch.json -fa1b412a0e03b138e1e239a62dcf3726475c5ec3 assets/modern_industrialization/models/block/turbo_fluid_output_hatch.json -ec824a8fb63f5270dc567b1c8b45db37be53b82e assets/modern_industrialization/models/block/turbo_item_input_hatch.json -ec824a8fb63f5270dc567b1c8b45db37be53b82e assets/modern_industrialization/models/block/turbo_item_output_hatch.json -96252487e6215e02449605a78aa068f6ae5de3f3 assets/modern_industrialization/models/block/turbo_machine_casing.json -3c48c745530de291fab1f24f7c0f665e7402fccb assets/modern_industrialization/models/block/turbo_machine_hull.json -29cfd8f5c946fc4d0bc9acb5d53dfb136ca7fedd assets/modern_industrialization/models/block/uranium_235_block.json -feb5154d9b44ab2568facccc6ff78286be758758 assets/modern_industrialization/models/block/uranium_238_block.json -707157e9c4340dd00a43696deeee4eb20f69a87d assets/modern_industrialization/models/block/uranium_block.json -1e9d64a11b7d92fd4d6987048cd3e85b1ccf23ac assets/modern_industrialization/models/block/uranium_ore.json -16108b4c87d50b8c7fc0f74e47ea0d3137e68290 assets/modern_industrialization/models/block/vacuum_freezer.json -f1b2a93d56d1af0a2bd1d73ffcdd93e14293fb35 assets/modern_industrialization/models/block/yttrium_block.json -dce2e0175bff04f24fcf72f3cfec6e338d41b981 assets/modern_industrialization/models/item/acetylene_bucket.json -6badf6f5348a1c893f8effc6336f0a04f39b2adf assets/modern_industrialization/models/item/acrylic_acid_bucket.json -7e46eab2a8b46937f2e372a97b948ce7db95f139 assets/modern_industrialization/models/item/acrylic_glue_bucket.json -b1ef158e303ac5df7420e04f61cee4dcd5acca3f assets/modern_industrialization/models/item/advanced_fluid_input_hatch.json -28b1db1497cb012189c348a3b970a742f325a3b4 assets/modern_industrialization/models/item/advanced_fluid_output_hatch.json -276da5aea75b6cb2e46d772bb7950fdb137b9d03 assets/modern_industrialization/models/item/advanced_item_input_hatch.json -764d542574e16b5e8742aeac5af6bafc3a2a764e assets/modern_industrialization/models/item/advanced_item_output_hatch.json -f83d4b8e38d9dc806aa255045e69286878bb9a9d assets/modern_industrialization/models/item/advanced_large_steam_boiler.json -36ba28c7dd411955433dfd63ebfd2b34ab0186df assets/modern_industrialization/models/item/advanced_machine_casing.json -914036cf1b4ac743812bc92b1164f383d70f86d3 assets/modern_industrialization/models/item/advanced_machine_hull.json -0720e7078600ec3441fb6b74685f74b127afd5be assets/modern_industrialization/models/item/advanced_motor.json -fb8bd590ab2e881400b6a89e3c5906ca1dc3f23c assets/modern_industrialization/models/item/advanced_pump.json -f2aaa918ae9e85ddf85d0339a6c5dd25ec2e2eff assets/modern_industrialization/models/item/advanced_upgrade.json -522b05a10c173850a4555938ae041b5b92bf5b6b assets/modern_industrialization/models/item/air_intake.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/aluminum_barrel.json -d231b21606d8b2f8427cfdd09bd4fe1d3a2c2b0c assets/modern_industrialization/models/item/aluminum_blade.json -0d8f07b0ec1fa44e80b86ef32c05e5ebd1435789 assets/modern_industrialization/models/item/aluminum_block.json -fc3fae3f916040564d478c58d84a81ef00f00e16 assets/modern_industrialization/models/item/aluminum_bolt.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/aluminum_cable.json -dc08d767b3d0c73e1b3f901b2cc367ad204649a0 assets/modern_industrialization/models/item/aluminum_curved_plate.json -b49e2cb6a101e72918febafab2cda5be906e1abc assets/modern_industrialization/models/item/aluminum_double_ingot.json -a79750d50007d94a2d3e520eaabc30ba4ed62391 assets/modern_industrialization/models/item/aluminum_drill.json -d7a542f1efc4c478428fd044c451bfd85c8c9ad2 assets/modern_industrialization/models/item/aluminum_drill_head.json -e7ee9d717820f85fa943e64622c31e01ce5205ad assets/modern_industrialization/models/item/aluminum_dust.json -d0ac6bf8fe61a19f56bcc3836a4157efd9b654ba assets/modern_industrialization/models/item/aluminum_gear.json -bff3ba0049473aadc6213708ea1764e09cfc40b1 assets/modern_industrialization/models/item/aluminum_ingot.json -ac69f2c6ba8582f18c1b14f1070ce359895e1765 assets/modern_industrialization/models/item/aluminum_large_plate.json -5cb2a0e972a780c04385fd728e55bf9ca9f01556 assets/modern_industrialization/models/item/aluminum_nugget.json -5078f10fe0416f6e7ef7b7212acff35c7225bb2d assets/modern_industrialization/models/item/aluminum_plate.json -dad3ffa80af5b67a9188fbc8365b53258b56419c assets/modern_industrialization/models/item/aluminum_ring.json -83be21ee23d4c6fdb5c0e30d0bc75f49462fa7ab assets/modern_industrialization/models/item/aluminum_rod.json -1ce4da69343a739a73cdf521ec8600a1c38f29bf assets/modern_industrialization/models/item/aluminum_rotor.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/aluminum_tank.json -8b573bb743a3229eecde70f38c5ffc892035f5be assets/modern_industrialization/models/item/aluminum_tiny_dust.json -ca798b277fc35b7b81d0d696543c43a074d6cdcc assets/modern_industrialization/models/item/aluminum_wire.json -d358584fb8edb5efd4d74f1155013676f6aa836f assets/modern_industrialization/models/item/analog_circuit.json -0b470236a38160ab49036332dba2fab759dd2a0b assets/modern_industrialization/models/item/analog_circuit_board.json -c71e7bda78381ddaeefa285c6ba98f0baf9bf785 assets/modern_industrialization/models/item/and_gate.json -8f9669ec49a9ac8b75a3356461d8943754ead7bd assets/modern_industrialization/models/item/annealed_copper_block.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/annealed_copper_cable.json -9777200fcffbada06609aeb6f19f8a60b11372b7 assets/modern_industrialization/models/item/annealed_copper_double_ingot.json -04ea0ad78c693effa183a62c1db6f06c81d30e19 assets/modern_industrialization/models/item/annealed_copper_dust.json -2e32dce5ca4ae8c4da634ce61aa89caaac8419a2 assets/modern_industrialization/models/item/annealed_copper_hot_ingot.json -69a3fb1b5983b6bc2afd9f5e7408bc1dbaa74af9 assets/modern_industrialization/models/item/annealed_copper_ingot.json -459893ba0e2c9ba7713328a37d8165fe74e4b001 assets/modern_industrialization/models/item/annealed_copper_nugget.json -02efd677a63b07cd938d7763645659974f0eff40 assets/modern_industrialization/models/item/annealed_copper_plate.json -04949a99063fdbf357618771c9acc9648e5e5659 assets/modern_industrialization/models/item/annealed_copper_tiny_dust.json -7cad7e8c054b9fa29b945f36e981ed856ca2116a assets/modern_industrialization/models/item/annealed_copper_wire.json -78f74d60219c8cae375d1ce11c341736f1609f35 assets/modern_industrialization/models/item/antimony_block.json -28b35e5663b91c3fc47a2f085cc9203bd0b7aec5 assets/modern_industrialization/models/item/antimony_dust.json -36e9c08761e0e93f2b1e078c3218f03f25fdec01 assets/modern_industrialization/models/item/antimony_ingot.json -ffcf4dd7e6d55d04e9cf6ff8dc73be6fdf29147b assets/modern_industrialization/models/item/antimony_nugget.json -bc15a266de6c94098a0a039c5af7548c60cecef4 assets/modern_industrialization/models/item/antimony_ore.json -beb18594dc970bea4080d6c82c2a5149a6f24a86 assets/modern_industrialization/models/item/antimony_tiny_dust.json -f70946c629d4261cf0d3b3753ae2b60e9cf2c5f7 assets/modern_industrialization/models/item/argon_bucket.json -f209ffb49938aaa4185a58c6cf6beed0d2dc8000 assets/modern_industrialization/models/item/arithmetic_logic_unit.json -05831fc5e66a0d6cbe669a13b4be93097f5819db assets/modern_industrialization/models/item/assembler.json -4a96d568fbd3279e20dcdbc3c63399f999ad66f8 assets/modern_industrialization/models/item/basic_machine_hull.json -3fd0294126a8ef9da39bf99ec66d731d48e7217f assets/modern_industrialization/models/item/basic_upgrade.json -84f5466d3f5a3de1d48fcb9e95e38a4eec061652 assets/modern_industrialization/models/item/battery_alloy_block.json -029c0a00a33c288036bb01972aa2d30e683c1d01 assets/modern_industrialization/models/item/battery_alloy_curved_plate.json -898b3e6a1e373ea890944de791266e3e70d3dbbb assets/modern_industrialization/models/item/battery_alloy_double_ingot.json -b48f7c24e370377009f6875c44115c810bae4e08 assets/modern_industrialization/models/item/battery_alloy_dust.json -f8ac1a13c2bb6537c08723c9c7cc6067d1e7ef95 assets/modern_industrialization/models/item/battery_alloy_ingot.json -182fa0d43351b70205495e0c752d6d334f4dacf8 assets/modern_industrialization/models/item/battery_alloy_nugget.json -fa8f0368d71b0ebd4c74992af6421c8a7eee1742 assets/modern_industrialization/models/item/battery_alloy_plate.json -cbe0e6cae9a4b7fc174034e24a3cc64dce2b7a5e assets/modern_industrialization/models/item/battery_alloy_tiny_dust.json -703c9cb45e5eb96b2d10fe8b05251ca85110b686 assets/modern_industrialization/models/item/bauxite_block.json -98da5b489ac53722c27a71e652f19a715187b0a0 assets/modern_industrialization/models/item/bauxite_crushed_dust.json -dd2624938e4829e4ff585f49f6fd80076bae17c4 assets/modern_industrialization/models/item/bauxite_dust.json -aea1a01414d7e22a7fb8e119420108cd36c69e7a assets/modern_industrialization/models/item/bauxite_ore.json -7b3b546a2b59527cfeb2470a560f6e49791a33b3 assets/modern_industrialization/models/item/bauxite_tiny_dust.json -0e6f208232f5a3a1c2dd3f3b7523bab0caaf8aa3 assets/modern_industrialization/models/item/benzene_bucket.json -f7d61bae2a4b10325b655e0af164a1adf27ddb71 assets/modern_industrialization/models/item/beryllium_block.json -4a1f29429da025a2becdbeedc24abc0d14535456 assets/modern_industrialization/models/item/beryllium_double_ingot.json -0ea902fae8567dbe04abd61266700c5ca9ad9100 assets/modern_industrialization/models/item/beryllium_dust.json -a1131028929d4efcd018039ef3a7baf640abd7a1 assets/modern_industrialization/models/item/beryllium_ingot.json -3c281bef16b4324519f319899ff0c1525a45ccb5 assets/modern_industrialization/models/item/beryllium_nugget.json -17e869a2231fd4ffdc2f3ecafded86087e287d7e assets/modern_industrialization/models/item/beryllium_plate.json -dddfe65c9c9146e490e4f568660f043eeceaee06 assets/modern_industrialization/models/item/beryllium_tiny_dust.json -88ab7b5b9b63727a59353a69d1b74930cd453417 assets/modern_industrialization/models/item/biodiesel_bucket.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/black_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/black_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/black_me_wire.json -74b745780bb3cc795d854153ae60633abc5fc145 assets/modern_industrialization/models/item/blastproof_alloy_curved_plate.json -724e39462c98d46483c58e2468d39c44a4d86593 assets/modern_industrialization/models/item/blastproof_alloy_ingot.json -1b4b86db3c8fd45e3a04d04070e44869b854a7be assets/modern_industrialization/models/item/blastproof_alloy_large_plate.json -344d054b75b0195b0a5003426f6b0b44bc0f9625 assets/modern_industrialization/models/item/blastproof_alloy_plate.json -f4a8542b7030e33d909ba7039a5c75469608cc62 assets/modern_industrialization/models/item/blastproof_casing.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/blue_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/blue_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/blue_me_wire.json -91e112e43ef49f5d04422865e426f074589e0c90 assets/modern_industrialization/models/item/boosted_diesel_bucket.json -5a6f1a18054f8f4e1a528e5bd5aa6c9390dad940 assets/modern_industrialization/models/item/brick_dust.json -65048eea86e002ad676e36c3f918694a4377895b assets/modern_industrialization/models/item/brick_tiny_dust.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/bronze_barrel.json -43f28a84aa0bc44fbe15bdf2a9ac0d7d9106d572 assets/modern_industrialization/models/item/bronze_blade.json -f4b26c8d2f7b87592dcdbda0e4b00d4dc78022b9 assets/modern_industrialization/models/item/bronze_block.json -c79f0536606c5135521e28a9679ce3d9f22e31e6 assets/modern_industrialization/models/item/bronze_boiler.json -0d57e1875c533c312d9a708af29fbbafe450a4ae assets/modern_industrialization/models/item/bronze_bolt.json -a34a680c5b5ef2d4e08a68f23b4993e3952eb32c assets/modern_industrialization/models/item/bronze_compressor.json -43632e937c7f9e697b0b001e92af2cadaf1eee42 assets/modern_industrialization/models/item/bronze_curved_plate.json -422a0635b8b1d749f1a508110003d2ed5bdc0cc4 assets/modern_industrialization/models/item/bronze_cutting_machine.json -e0dfa05fe40c6b944ebf35312f04187f73755766 assets/modern_industrialization/models/item/bronze_double_ingot.json -596e3990a06c07756cbf6ce6cf5c7dae95d36ac1 assets/modern_industrialization/models/item/bronze_drill.json -dc9a8116a0d8754e3ca14ab7a8bdafa096b9834b assets/modern_industrialization/models/item/bronze_drill_head.json -5a0599ae7b3c0576c2927ab36bc58b752ce7a729 assets/modern_industrialization/models/item/bronze_dust.json -07c11e213d0e6e61ce9730ec67a5d19b58211a70 assets/modern_industrialization/models/item/bronze_fluid_input_hatch.json -4664e05a0e626fbbf7af607d015ade7fedca8513 assets/modern_industrialization/models/item/bronze_fluid_output_hatch.json -cfcef4ad5fe88d60a44f6efbc48ff325690dffe0 assets/modern_industrialization/models/item/bronze_furnace.json -5ed5003f95d61a862fbbb111bafa9e639ba41ba3 assets/modern_industrialization/models/item/bronze_gear.json -0ab7adf8dd2fb8a3c38edfd8c99c700aa2b28867 assets/modern_industrialization/models/item/bronze_ingot.json -9ed9caa5f01e527e18f015718e536c39f5f557a1 assets/modern_industrialization/models/item/bronze_item_input_hatch.json -8c9e28ea0dbbbf259ef082b361da67715da31da0 assets/modern_industrialization/models/item/bronze_item_output_hatch.json -8afb2dac4ec0d55e88bf1c3238d22d5485a6d970 assets/modern_industrialization/models/item/bronze_macerator.json -71be49931fd2cf00550d9be0b011a671b3974fe2 assets/modern_industrialization/models/item/bronze_machine_casing.json -d047766e6fed1745c470bb262597bcbc166b9fb3 assets/modern_industrialization/models/item/bronze_machine_casing_pipe.json -0a5a715937c998877478cf3d9130187bb1ad392e assets/modern_industrialization/models/item/bronze_mixer.json -61ec64be67286ec70edd75fa05beda790041e110 assets/modern_industrialization/models/item/bronze_nugget.json -72363faccd68ca144aad34d74e1fb1021d25cbc4 assets/modern_industrialization/models/item/bronze_plate.json -450778372d5037417783f2b7459ea3c201f7834c assets/modern_industrialization/models/item/bronze_plated_bricks.json -3f108cc2671fab278dee23d155c533531a5779f5 assets/modern_industrialization/models/item/bronze_ring.json -e06e8a7aceabb8b13570f2e93b10925afd69fa5e assets/modern_industrialization/models/item/bronze_rod.json -dae45f66a1e8bfb79a4dc9a7aaabff0860364fc1 assets/modern_industrialization/models/item/bronze_rotor.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/bronze_tank.json -2fa930c2ffdddf16f479646d58df6c1e8a22fb0f assets/modern_industrialization/models/item/bronze_tiny_dust.json -d36a3d28fa529697aeaad332ced7e5dcb674957a assets/modern_industrialization/models/item/bronze_water_pump.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/brown_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/brown_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/brown_me_wire.json -8585c7b1dfca4fe6661527a7c2e3f766b82c8148 assets/modern_industrialization/models/item/butadiene_bucket.json -9b451d8abb57fa3935acec5c6f233ed3b48a7371 assets/modern_industrialization/models/item/cadmium_battery.json -75b32ed310a3e0580179a083927c7dab1ad8945b assets/modern_industrialization/models/item/cadmium_control_rod.json -f3875b5e468897e0eaf9e779a683946c0a2a0cbc assets/modern_industrialization/models/item/cadmium_double_ingot.json -ec004a5f11c51c0cb42be785cb9fcb5cc7906630 assets/modern_industrialization/models/item/cadmium_dust.json -91e2e16610cb8a1d6fcc0443692b547644efeedb assets/modern_industrialization/models/item/cadmium_ingot.json -dd25facc43234e43230c75a920b403857c25230d assets/modern_industrialization/models/item/cadmium_plate.json -4c9b56458b28f14875a69fcdca70e67e11931edf assets/modern_industrialization/models/item/cadmium_rod.json -2a461461ffe7164d68b9544fe2c4a3c45f3f6c99 assets/modern_industrialization/models/item/cadmium_tiny_dust.json -bec852e53b085ef75b9594ceb074e02555878619 assets/modern_industrialization/models/item/capacitor.json -7ff9024457eab79e611ab3a67131f09d78d8f415 assets/modern_industrialization/models/item/caprolactam_bucket.json -d47ad816ee503498c6baeb7ea2f35792ba6f85c5 assets/modern_industrialization/models/item/carbon_dust.json -4d5790e967e2bedcbbd40453dc71ff6530673216 assets/modern_industrialization/models/item/carbon_large_plate.json -aa191ae062076bef770fa9b9c08ba2804899cf8e assets/modern_industrialization/models/item/carbon_plate.json -eb1dcc0c525b640a8aab9b418b3ba32ab71e0454 assets/modern_industrialization/models/item/carbon_tiny_dust.json -5e973978cf07ab3feb329ff15ee5afaf8f3701d6 assets/modern_industrialization/models/item/centrifuge.json -94256d474f1ba0c98037b4e7df418d840dccdd8b assets/modern_industrialization/models/item/chemical_reactor.json -d458cbfe033debef78a97e462c2509d5b612f358 assets/modern_industrialization/models/item/chlorine_bucket.json -e97e28b067d2d77b72c0984e05e1c42162a47c87 assets/modern_industrialization/models/item/chromium_block.json -2e0b139f203fd02dfc55ba7a306e5f1363ef66ae assets/modern_industrialization/models/item/chromium_crushed_dust.json -b0f5048bf91a061a025d5e31d65322b629a3d9ac assets/modern_industrialization/models/item/chromium_double_ingot.json -ce18330d79407fb6e212d857b2186e47a376d42e assets/modern_industrialization/models/item/chromium_dust.json -05c03a1a984a2b6ad984c7796d870bd7e6e2e62c assets/modern_industrialization/models/item/chromium_hot_ingot.json -817e904df96339ebd0328e826a3022294af8ab8d assets/modern_industrialization/models/item/chromium_hydrochloric_solution_bucket.json -76ed1c41604111043a5a4e0848f4a843b71ce62a assets/modern_industrialization/models/item/chromium_ingot.json -47c31f5e91bc74971b257d7acae97550a83929f6 assets/modern_industrialization/models/item/chromium_nugget.json -ad2cdab241bc584573426f40eff59b2e56804711 assets/modern_industrialization/models/item/chromium_plate.json -6d76d5ad078fd1157629f70c65ba9455f6f43894 assets/modern_industrialization/models/item/chromium_tiny_dust.json -2c6efd8f60a7b9e36db4c4731b8b58ac24508f4f assets/modern_industrialization/models/item/clean_stainless_steel_machine_casing.json -d1a750a1d4990f1cf80ad7127672b3bad9475907 assets/modern_industrialization/models/item/coal_crushed_dust.json -4eed2824a76ead712cdbda1de0ebb6068ddc2f2a assets/modern_industrialization/models/item/coal_dust.json -ba18891a720c75aff5f619f8c0f3504f3e19f4fc assets/modern_industrialization/models/item/coal_tiny_dust.json -63f85ac2c6aae4dbeefe687e5d7a6aca8305d5a9 assets/modern_industrialization/models/item/coke.json -ee2b0d684643fd11279ff13112545b1e104f8b57 assets/modern_industrialization/models/item/coke_block.json -3359b982919385b6fd4a515022034659f0a25893 assets/modern_industrialization/models/item/coke_dust.json -b9abd302cdc564ebdc666534f45ca48ad1e091b9 assets/modern_industrialization/models/item/coke_oven.json -896023b592590d6c3af5e715a374b0b870fe8190 assets/modern_industrialization/models/item/configurable_chest.json -e71d3138e16ff9e95bed8181bd00ca9ee6efea04 assets/modern_industrialization/models/item/configurable_tank.json -ad6c4d793785e51b2f4a2b692ea4ee4724989cf0 assets/modern_industrialization/models/item/config_card.json -7c33dc1bd1b95b82ccbd20376a231e7c3a51d641 assets/modern_industrialization/models/item/conveyor.json -07256ea71ac0e13fc42622b80619fa1d58e12e0d assets/modern_industrialization/models/item/cooling_cell.json -1eb7d9279c309ee2c9ad9860170f5277339a454e assets/modern_industrialization/models/item/copper_blade.json -ead2577a2096849a73bbb94e0d77e196e7f6966e assets/modern_industrialization/models/item/copper_bolt.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/copper_cable.json -43eded904be942339a32d1aeb12e21a72f1dbdb6 assets/modern_industrialization/models/item/copper_curved_plate.json -c774b34c3d500fa0666d8fb2e59dafce41b7a978 assets/modern_industrialization/models/item/copper_double_ingot.json -d22504da08789adb397e38de074906a853002f6f assets/modern_industrialization/models/item/copper_drill.json -ff6f1b77113401cf0f756486a0c19387562d14a6 assets/modern_industrialization/models/item/copper_drill_head.json -603c08f3315ed2f3165f217a57ccfe68d1b862fe assets/modern_industrialization/models/item/copper_dust.json -ef70787d2a2c7954e3f414d0f8ff2b6a2df9573d assets/modern_industrialization/models/item/copper_fine_wire.json -b20868b6364bc24176fcdf13ca20b5840ccca960 assets/modern_industrialization/models/item/copper_gear.json -ee869c39ed91b5ef7305291bb507028ee0a4b546 assets/modern_industrialization/models/item/copper_nugget.json -1badb2f75f3e73921d3f0b40cfd1bf0750c37947 assets/modern_industrialization/models/item/copper_plate.json -9299eaffbf28ee57d84cea90368e0fd883faf00d assets/modern_industrialization/models/item/copper_ring.json -8a6f78afe94b7aaaab21ea44bbbf1047ada68e8c assets/modern_industrialization/models/item/copper_rod.json -15b7bf45b0833dcfc9e011f13ade56a1fbc672e5 assets/modern_industrialization/models/item/copper_rotor.json -c506cb9ef746f24b88c54967016d3051f323bc50 assets/modern_industrialization/models/item/copper_tiny_dust.json -31c39e54a859ac16bf46da8d400c9b64b1ace687 assets/modern_industrialization/models/item/copper_wire.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/creative_barrel.json -3b08fb93b7c4c8ce29b18cd344e8545f06c68d60 assets/modern_industrialization/models/item/creative_storage_unit.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/creative_tank.json -04b59de0d78b9c577265d632dd15b371acfe65e4 assets/modern_industrialization/models/item/creosote_bucket.json -774cec67513c9a2ba80edb7a7965f29fc57081c8 assets/modern_industrialization/models/item/crude_oil_bucket.json -f6cb543e7af31b09e575a5c7fa5f6bbc0cea32f2 assets/modern_industrialization/models/item/cryofluid_bucket.json -e2803151060d06c55613f8a694becab5595867fe assets/modern_industrialization/models/item/cupronickel_block.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/cupronickel_cable.json -63131d13be45bb5dd99bbe030df580e12ea8fe37 assets/modern_industrialization/models/item/cupronickel_coil.json -23f2381ee2300232089a46130e3b36687b0dad60 assets/modern_industrialization/models/item/cupronickel_double_ingot.json -448f3aa008725b8594b7909b1fc685236c91d7f9 assets/modern_industrialization/models/item/cupronickel_dust.json -cdd15f14ab985511e901ff8e853d91f0f19ac326 assets/modern_industrialization/models/item/cupronickel_ingot.json -5cbdcc526439f4bc667e851304acfa4fb1091de0 assets/modern_industrialization/models/item/cupronickel_nugget.json -abf5e2a6bc7fc6782be658144e24e795b53cbf78 assets/modern_industrialization/models/item/cupronickel_plate.json -5bb485a6b9c3e1dcb68f1feae50f098e8ccfdf80 assets/modern_industrialization/models/item/cupronickel_tiny_dust.json -579852e5338bf7dbb5876c24687649c0438dd066 assets/modern_industrialization/models/item/cupronickel_wire.json -825ca7f79d08d70bed96fa71b861254944893278 assets/modern_industrialization/models/item/cupronickel_wire_magnetic.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/cyan_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/cyan_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/cyan_me_wire.json -afb2d2b86eae250f720ff132525a80fdc090631d assets/modern_industrialization/models/item/deepslate_antimony_ore.json -c7a7f0c04875f5c21ff2502688f5005966188596 assets/modern_industrialization/models/item/deepslate_bauxite_ore.json -7761551311ee4d792a8be1181dc9142a6af0404d assets/modern_industrialization/models/item/deepslate_lead_ore.json -dc98497dc9be7ec66cc10ff9118bb61d97d7e031 assets/modern_industrialization/models/item/deepslate_lignite_coal_ore.json -d9da917c81343cb7aac0e4aca53d2bd61ecc5336 assets/modern_industrialization/models/item/deepslate_monazite_ore.json -aa03491b567f6bed840afc56c125264663aff3af assets/modern_industrialization/models/item/deepslate_nickel_ore.json -473debb4d09119a857c2214ade7ffc74638bdc2f assets/modern_industrialization/models/item/deepslate_salt_ore.json -8010a2c9b63e536b10652f4c97e5f825cbe07a31 assets/modern_industrialization/models/item/deepslate_tin_ore.json -848454cdb9bb891efffb7639cf8436e00a402880 assets/modern_industrialization/models/item/deepslate_tungsten_ore.json -e1d95cd79ed8f58df8640428b62b4b9275f1ee6e assets/modern_industrialization/models/item/deepslate_uranium_ore.json -1fd4aa65ba03a6c8e42e5cfcf80341085a66eb36 assets/modern_industrialization/models/item/deuterium_bucket.json -09e4c1bc8228aa89766242df5bc7cb1a9ce00d11 assets/modern_industrialization/models/item/diamond_crushed_dust.json -e3bc28612c50b2746675ef65e11c004020a3779f assets/modern_industrialization/models/item/diamond_dust.json -9ab3f8974b20df0bdc26ded8e83503045ff73d44 assets/modern_industrialization/models/item/diamond_hammer.json -07821f9d42e5b786ae5da5b2796fb5e082841095 assets/modern_industrialization/models/item/diamond_large_plate.json -b31c1df51585ea1fe1b7a57c51583ccb40346e81 assets/modern_industrialization/models/item/diamond_plate.json -1e2bef64806b57fad677d9299cb1cfd1aa789da4 assets/modern_industrialization/models/item/diamond_tiny_dust.json -7bd58f83ddef889903b19ac9280f642a91e68088 assets/modern_industrialization/models/item/diesel_bucket.json -217715582c32ee1f099da1dd3710fdfdcb6328bf assets/modern_industrialization/models/item/diesel_chainsaw.json -fae73d74b3b781e5a2efd136d219058ee3852a40 assets/modern_industrialization/models/item/diesel_jetpack.json -98532e4a26430f090aa318673fdf357063eb1efe assets/modern_industrialization/models/item/diesel_mining_drill.json -56e2e3032aa54d3614a4b4158569077f4c148619 assets/modern_industrialization/models/item/diethyl_ether_bucket.json -7b7af88256074d46687fe0f9f1fcca6cb2de78e2 assets/modern_industrialization/models/item/digital_circuit.json -a73d7fab347d1916f9b1db3ffd135dc010117a06 assets/modern_industrialization/models/item/digital_circuit_board.json -8512823614a616527d2b9c35b6ff8814d0a11ec5 assets/modern_industrialization/models/item/diode.json -1dadd5c53127728d4c9ec21413c8f5ac4ceb8d97 assets/modern_industrialization/models/item/distillation_tower.json -d82616de303bfdde241a7871575e69ec67f5bbc3 assets/modern_industrialization/models/item/distillery.json -482f5afd8b888b6b50d4b08aa20c339630f79546 assets/modern_industrialization/models/item/electric_blast_furnace.json -b4317634a2983b07d33c1ee80fbbe4c593673e28 assets/modern_industrialization/models/item/electric_compressor.json -47280304bd16905c7378ee75246dbe7e33ab3ebb assets/modern_industrialization/models/item/electric_cutting_machine.json -095b00727b25364b80a9fb58826786e32b4d3179 assets/modern_industrialization/models/item/electric_furnace.json -ef3ce97bf8fac6709beb178e88ddd160d413e7df assets/modern_industrialization/models/item/electric_macerator.json -278ddba758b958aaeb8206eb7a7836bf1860043d assets/modern_industrialization/models/item/electric_mixer.json -d82b0279a666da523728243fe5fa4d3dbdb7421e assets/modern_industrialization/models/item/electric_packer.json -2439b37aabe9374713846be81a9f6bd46ba49498 assets/modern_industrialization/models/item/electric_quarry.json -37dc51280f41e34a47cb314dcb842e1ae6279836 assets/modern_industrialization/models/item/electric_unpacker.json -b84aa1ccc754d06208e857518fbe29d71c851fd6 assets/modern_industrialization/models/item/electric_water_pump.json -8f543e3fba64a527dff50ab1b76df71f329d5e8f assets/modern_industrialization/models/item/electric_wiremill.json -ce1ea79ebfc3fd14b0444919bdab446078a5c5af assets/modern_industrialization/models/item/electrolyzer.json -0116e2e5b5e0ed3208bb125aa6787d62e9977f9f assets/modern_industrialization/models/item/electronic_circuit.json -4b7f4d95d5c192046da7b4e5b6522cd5a406b1b1 assets/modern_industrialization/models/item/electronic_circuit_board.json -d4d633ab2a220c5d587032bf99130ba0b6bcde59 assets/modern_industrialization/models/item/electrum_block.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/electrum_cable.json -91c99d708d7c06a87ab2e712c51abe45d838a251 assets/modern_industrialization/models/item/electrum_double_ingot.json -5b3e4db7b41cd992698f518fbf62332c5820d869 assets/modern_industrialization/models/item/electrum_dust.json -b56b8e3f323d90e16be0cc337cc430bd992bdf08 assets/modern_industrialization/models/item/electrum_fine_wire.json -cb096b9344dd6739d0de12233c9be660b5f90d3e assets/modern_industrialization/models/item/electrum_ingot.json -c7ab8dcc5821e1861d03aa38e3fccf66740c13df assets/modern_industrialization/models/item/electrum_nugget.json -3f7e587eb22cb1fe8ecd08c0f13abfa52811713f assets/modern_industrialization/models/item/electrum_plate.json -eb4ef9ed9ef99a3d8e95dd32ff632a6b156103d3 assets/modern_industrialization/models/item/electrum_tiny_dust.json -0f7078b8cc0e9385ea9b5b8ea1cf008d7e68bb56 assets/modern_industrialization/models/item/electrum_wire.json -4ebaf65f764234e223f87b220f43aca74ba5079b assets/modern_industrialization/models/item/emerald_crushed_dust.json -56778e3026128afc7e93b7af7a11a835a17faba3 assets/modern_industrialization/models/item/emerald_dust.json -36e822c0341b9d8514bd9d17ab0ce9723f2a7a5e assets/modern_industrialization/models/item/emerald_plate.json -f4d61691e55bbb0ebb1049ddda84cfc09af45d54 assets/modern_industrialization/models/item/emerald_tiny_dust.json -fa733f2627ac7da8efaa95a1a426e1b4db47eef5 assets/modern_industrialization/models/item/ethanol_bucket.json -73449e8d230e96e1f70434401eed3e1f243d5a40 assets/modern_industrialization/models/item/ethylbenzene_bucket.json -86add67ee326b37dcd418fad4f126de5e553b348 assets/modern_industrialization/models/item/ethylene_bucket.json -6cc02f39cdb31a1fd58d2c62b75b84fdcba5b5ef assets/modern_industrialization/models/item/ev_energy_input_hatch.json -42d1efc1dd870b76be5c25fa3ee94315a72b5214 assets/modern_industrialization/models/item/ev_energy_output_hatch.json -e4ced6c14de25b25d304de9b30f9e9941c3ebb7f assets/modern_industrialization/models/item/ev_hv_transformer.json -1a10f31a9a3ecc266b194dc0992e958d286b6854 assets/modern_industrialization/models/item/ev_storage_unit.json -6f7fd4bd90a37914943e0b9560446aabec5a9376 assets/modern_industrialization/models/item/ev_superconductor_transformer.json -cfb274b236e1f6bfc979abf328177a5f2e547cb4 assets/modern_industrialization/models/item/fire_clay_brick.json -e93ffda4d8f5d92dc60a3787bdc5d1e9bb0244df assets/modern_industrialization/models/item/fire_clay_bricks.json -4ef25d64129e5c39faf4075fd3dc7d04a95e5eaa assets/modern_industrialization/models/item/fire_clay_dust.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/fluid_pipe.json -2290ab7ab7619ab0977bdb035b5dd1efc8fc1641 assets/modern_industrialization/models/item/forge_hammer.json -52d1233b7f19d905d101539aa5a77e7401954dc1 assets/modern_industrialization/models/item/frostproof_machine_casing.json -bd31c2d1d85d6dfca9ac8bd8d390fa4d557ad82f assets/modern_industrialization/models/item/fusion_chamber.json -249f34eefa01662016aed57f86d99bdd1f4e3734 assets/modern_industrialization/models/item/fusion_reactor.json -2d79953db46d55ff23dbf95394fe0daa61c83762 assets/modern_industrialization/models/item/gold_bolt.json -297cf1ca35106658222f1138d6bbb6fc272e9e0d assets/modern_industrialization/models/item/gold_curved_plate.json -b4acd888ab5476b8e25d3c5d298f2e86d2603c89 assets/modern_industrialization/models/item/gold_double_ingot.json -582effbcec988aaaeb5326e94e3955d92e21a0f1 assets/modern_industrialization/models/item/gold_drill.json -7ca5c32e78c287004b466b40099fef290e95bea1 assets/modern_industrialization/models/item/gold_drill_head.json -61dbf2839062caf5e390bb7ee9498843b92f1c8b assets/modern_industrialization/models/item/gold_dust.json -cf65a34069c8c681ff5f00150e623d6f87ea5d56 assets/modern_industrialization/models/item/gold_gear.json -9764b788efe17c2e9620077911e0b878a01cf0d4 assets/modern_industrialization/models/item/gold_plate.json -ce5576f1c3f95917d484df48c92edee09e259bc2 assets/modern_industrialization/models/item/gold_ring.json -f1a3a8dba2e3e5b6acc920b5eda461ed18a30e35 assets/modern_industrialization/models/item/gold_rod.json -9a54d57fd5feff13b9442d679cc24151fae32e98 assets/modern_industrialization/models/item/gold_tiny_dust.json -1623e269f41522c857fc9906323b47a78ac81793 assets/modern_industrialization/models/item/gravichestplate.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/gray_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/gray_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/gray_me_wire.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/green_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/green_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/green_me_wire.json -73bf4f56bbb41805b111b058e97a9bea1beafd97 assets/modern_industrialization/models/item/guidebook.json -28a62f9ddff525f91d687c9b9121c71f7f310026 assets/modern_industrialization/models/item/heatproof_machine_casing.json -394ee1e9bd5474e3f9a45643a7e18d1ca43b7e89 assets/modern_industrialization/models/item/heat_exchanger.json -5b5a0116c8c184b8699009d4a68025693c02050d assets/modern_industrialization/models/item/heavy_fuel_bucket.json -d7acad2d93d453ac644366950ce54fd736c3bde8 assets/modern_industrialization/models/item/heavy_water_bucket.json -4a1ad5a2b7ff0ea094469cecde55a571a14855d7 assets/modern_industrialization/models/item/heavy_water_steam_bucket.json -7ee08ec12071d6c5e835e79c69b9eb5adfa7dc89 assets/modern_industrialization/models/item/helium_3_bucket.json -48300fc34fb4cee7683174c96aed74d30d4536e8 assets/modern_industrialization/models/item/helium_bucket.json -e8a0c5104d51fd633c33014459c03e2f668d7419 assets/modern_industrialization/models/item/helium_plasma_bucket.json -79a34d42d829639435a03e88df8549786410ffcf assets/modern_industrialization/models/item/he_mox_block.json -aef2ff2ff3b78010501b2cf062cbc25e2f485fb8 assets/modern_industrialization/models/item/he_mox_dust.json -6792fbe6b56b6f5b4a8f2b03bd016c12d438657e assets/modern_industrialization/models/item/he_mox_fuel_rod.json -34149e2f8c3b3951b6d9fabca025b258cbb7b8c2 assets/modern_industrialization/models/item/he_mox_fuel_rod_depleted.json -c6c227c0b65ce9b961ca2fc3f2d9e60535abee8a assets/modern_industrialization/models/item/he_mox_fuel_rod_double.json -fcd2e954326a38bfd9db4bef0c1495fc8c13d99e assets/modern_industrialization/models/item/he_mox_fuel_rod_quad.json -ac139e65301362d7d500152c9db9324e54c2cfb8 assets/modern_industrialization/models/item/he_mox_ingot.json -19201edbc5a1b9c7440ab6c5885e1d839d42dfba assets/modern_industrialization/models/item/he_mox_nugget.json -73e03aaaf0a26b059d207da04d0ad3f40f60761d assets/modern_industrialization/models/item/he_mox_rod.json -eaaec574789815eb01435c0dae3e996afdcc34e7 assets/modern_industrialization/models/item/he_mox_tiny_dust.json -f19b33cdcb08941b35238c630b3c583244bb7743 assets/modern_industrialization/models/item/he_uranium_block.json -06420e26a29a32c31c90b5da64d85d7b38986b67 assets/modern_industrialization/models/item/he_uranium_dust.json -180dd2340c7a60ae9f18dcea4f8b82fd3b5437c9 assets/modern_industrialization/models/item/he_uranium_fuel_rod.json -9d2d99fee9f662f4d18e37c59899f30ee8ef39ea assets/modern_industrialization/models/item/he_uranium_fuel_rod_depleted.json -90d73006f3bf1b8bcf55af7579f92561b9c4168d assets/modern_industrialization/models/item/he_uranium_fuel_rod_double.json -1e48836d1abe1af71ef005cdd18f026d75925567 assets/modern_industrialization/models/item/he_uranium_fuel_rod_quad.json -41520ffc22ad9198b52dcfa3bd11238416b302f8 assets/modern_industrialization/models/item/he_uranium_ingot.json -dc8bb882d33896db021b3af103042698c13bb7d3 assets/modern_industrialization/models/item/he_uranium_nugget.json -b03e9d07cd88286213c24796dbd36531658b0e4d assets/modern_industrialization/models/item/he_uranium_rod.json -bfa9dcc508c9517f1bbea8c9787da7c48b89803d assets/modern_industrialization/models/item/he_uranium_tiny_dust.json -5ff5b0e1fe7d7c4595cad5dced2103820dd21f6f assets/modern_industrialization/models/item/highly_advanced_fluid_input_hatch.json -d36c180aafea9af00dd48d6453ade31a65617050 assets/modern_industrialization/models/item/highly_advanced_fluid_output_hatch.json -23c871f7e29740e85f5d333edaba37fd05bc0157 assets/modern_industrialization/models/item/highly_advanced_item_input_hatch.json -b1cce358257ef6f3e077147cfdb59dcbe61b1ef7 assets/modern_industrialization/models/item/highly_advanced_item_output_hatch.json -ce553c8e640f3a035f086f262407c8a67f19a2f1 assets/modern_industrialization/models/item/highly_advanced_machine_casing.json -c4bde51e40ba2eca823ca373f2fd8bf8ca716033 assets/modern_industrialization/models/item/highly_advanced_machine_hull.json -d31074e4c9c06a540747b548df985db9d39d31e4 assets/modern_industrialization/models/item/highly_advanced_upgrade.json -727724645f38c76c62ef6e91939430e74e1a1955 assets/modern_industrialization/models/item/high_pressure_advanced_large_steam_boiler.json -75aa5b3b3ff9a1325d3a23f2acc099015c534289 assets/modern_industrialization/models/item/high_pressure_heavy_water_bucket.json -87813b487b204692449f7504c7ad865e851e8515 assets/modern_industrialization/models/item/high_pressure_heavy_water_steam_bucket.json -7817c5b6a87335e5c9b02714d91f942566a7f544 assets/modern_industrialization/models/item/high_pressure_large_steam_boiler.json -20a968f6f7e5a75021301a6ef526e2aa049347f7 assets/modern_industrialization/models/item/high_pressure_steam_bucket.json -b6a382c80ccca5e6ad2161a5fd9ac7140f690e2a assets/modern_industrialization/models/item/high_pressure_water_bucket.json -de365cfa72d57be7795cc01d88926d1222d7061b assets/modern_industrialization/models/item/hv_diesel_generator.json -e90266749091023b522bc17072b3369faaa01dee assets/modern_industrialization/models/item/hv_energy_input_hatch.json -2bea9b3547bba804432d0e70a9bfd735df7d2b64 assets/modern_industrialization/models/item/hv_energy_output_hatch.json -bb44ffd1a469075cbc441d17075191505be28694 assets/modern_industrialization/models/item/hv_ev_transformer.json -9191eba538843c69efab055cf411b12fbc519c5c assets/modern_industrialization/models/item/hv_mv_transformer.json -58875b4e840445fa9178bf813b308dfc26935359 assets/modern_industrialization/models/item/hv_steam_turbine.json -023637395638de99e4b8cb4d85e4dfec0ab70365 assets/modern_industrialization/models/item/hv_storage_unit.json -040f45f0d74de25e5d032687e6c53f94a655f002 assets/modern_industrialization/models/item/hydrochloric_acid_bucket.json -571df0e743d23fb0f1eca3a7eb0605166593dc53 assets/modern_industrialization/models/item/hydrogen_bucket.json -b39abe35cc220c6ca13fdb9683b881afdd4a9c8a assets/modern_industrialization/models/item/implosion_compressor.json -d78d6c1b419d776d742eb4d5057ed8f780c8162a assets/modern_industrialization/models/item/inductor.json -84ad41a53071b90bb5e33f3243fa3dd2d3acd154 assets/modern_industrialization/models/item/industrial_tnt.json -3e06f02af64e897cd129fa3ea5244def0b45ef52 assets/modern_industrialization/models/item/invar_block.json -a7fb21563f3f0821ceb5112c87f34590e2b36a97 assets/modern_industrialization/models/item/invar_bolt.json -0787c386f453ad40be9f698615478e76b8c9f0be assets/modern_industrialization/models/item/invar_double_ingot.json -007f13a799bbd003f9f3b9774a0d174c52be95e5 assets/modern_industrialization/models/item/invar_dust.json -c58ba971098caabfe1ff327d9fcfc8647e20836c assets/modern_industrialization/models/item/invar_gear.json -eb53e9e52ce4360f14f25e18555b8b4dc158ce53 assets/modern_industrialization/models/item/invar_ingot.json -f0bda1181690305bec55990e3200225b594878c8 assets/modern_industrialization/models/item/invar_large_plate.json -4826e60d86559ae03da45e3f0b3f79a1ee19c1bc assets/modern_industrialization/models/item/invar_nugget.json -540a3d2c74966b83c7b8201067c677140b0dfd18 assets/modern_industrialization/models/item/invar_plate.json -37dd7875095ebfef5cb6a8496453b5e29f2ff5f5 assets/modern_industrialization/models/item/invar_ring.json -286a6dc1ff03efc5fe9bf52c228c44e90c574a54 assets/modern_industrialization/models/item/invar_rod.json -88409cbc4895e49feb4e1955fd462ce4acf9a9e7 assets/modern_industrialization/models/item/invar_rotary_blade.json -8c730c7621b4c9f59ca3b565909ed92df4bcf684 assets/modern_industrialization/models/item/invar_tiny_dust.json -e05627b19f76314b9b28f043e93043d147cdc041 assets/modern_industrialization/models/item/iridium_block.json -ef74fd836aea3dc86b353eba2587160761c1a679 assets/modern_industrialization/models/item/iridium_curved_plate.json -e8d499273bcf2ded826d47e514cb7e1bc20a3e6f assets/modern_industrialization/models/item/iridium_dust.json -9f94420b3ce72a7884e19e0067c3021623cf09f2 assets/modern_industrialization/models/item/iridium_ingot.json -57dd4887f0a8a968e306907520e468b9cfcc2f26 assets/modern_industrialization/models/item/iridium_machine_casing_pipe.json -77ad70a5145e220679f11a5b030489b5e5ae2d2f assets/modern_industrialization/models/item/iridium_nugget.json -b1d5cc6594e2508dbf8e6e46d4b2a822b6dc2a09 assets/modern_industrialization/models/item/iridium_ore.json -99cf0c9b65a569b0d0ea67a4dbfa2cf154f83b7a assets/modern_industrialization/models/item/iridium_plate.json -22ddff7ebfd8c12d97d3e8f8934fcf0b1d514fc7 assets/modern_industrialization/models/item/iridium_tiny_dust.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/iron_barrel.json -fb1c4117520206465b02b044c8f7c0c1928fe8b6 assets/modern_industrialization/models/item/iron_bolt.json -1d6d3e9cd6d42bac0010c69a0db762428f8feebc assets/modern_industrialization/models/item/iron_double_ingot.json -150e2ee9cee8568853f55b6b50f7f353626854e4 assets/modern_industrialization/models/item/iron_dust.json -8c41c70a96e82d0ea16a3a37ab0f4d1977bdab1b assets/modern_industrialization/models/item/iron_gear.json -5ff52f32d1f34f7e053f51ee945f6ed5586c9d2f assets/modern_industrialization/models/item/iron_hammer.json -5c7ab4ed246eda4643f3dd0964f72528bcd71cd7 assets/modern_industrialization/models/item/iron_large_plate.json -466a5f0bb0375902031f9b2657e858d5736ff51b assets/modern_industrialization/models/item/iron_plate.json -5491974e273f3740dbf60a15a5517868b2a02b7d assets/modern_industrialization/models/item/iron_ring.json -994fbb9bbef1503bd1f51699b5bd43864c89e426 assets/modern_industrialization/models/item/iron_rod.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/iron_tank.json -c846f6638593dafce5ea7b623d6a92663b0192ad assets/modern_industrialization/models/item/iron_tiny_dust.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/item_pipe.json -9a558973482b6ff010ddc72917ab5ad4c4a7e290 assets/modern_industrialization/models/item/kanthal_block.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/kanthal_cable.json -58c0b9a7ef54cda771da90b4cda4333723d22803 assets/modern_industrialization/models/item/kanthal_coil.json -0e6b611dc4684f301448029a3a1ad3a8548cf470 assets/modern_industrialization/models/item/kanthal_double_ingot.json -10c59b4f27e69ad78629f058f463be888c89e21e assets/modern_industrialization/models/item/kanthal_dust.json -77e08b2e70db7b322148c10abdb00d020985e279 assets/modern_industrialization/models/item/kanthal_hot_ingot.json -863b6668e54fcf4034d3c82688fa2a26067af556 assets/modern_industrialization/models/item/kanthal_ingot.json -05551a7b0ae7ccc18d8e017b956e3c73fd9cd411 assets/modern_industrialization/models/item/kanthal_nugget.json -5a03da99730d2a6a3f457ade712ea587749d9ff2 assets/modern_industrialization/models/item/kanthal_plate.json -1e7a92eefd71b6f8e61ad078cb1bba2d89cde724 assets/modern_industrialization/models/item/kanthal_tiny_dust.json -0eef5bc23b63a78e5b5f639e3b1751aecd57932a assets/modern_industrialization/models/item/kanthal_wire.json -ea2fec5c385e56afdb009e9ad01fe2142bd168c4 assets/modern_industrialization/models/item/lapis_crushed_dust.json -8d13f4318128bab08717497bb05524532ed2f7e0 assets/modern_industrialization/models/item/lapis_dust.json -c354659c399d13b96cd536bd84ccccfeefe37c69 assets/modern_industrialization/models/item/lapis_tiny_dust.json -41b8ca3cdbc335276dc6862849747f8a5f42de77 assets/modern_industrialization/models/item/large_advanced_motor.json -9d801dba7026e3ce75f324a176801c748c527da3 assets/modern_industrialization/models/item/large_advanced_pump.json -0bc3283a46775f587fb9299e20a94e61d8fff572 assets/modern_industrialization/models/item/large_diesel_generator.json -cb34f4d0875863f1868b52e0dbc56066545bc2fb assets/modern_industrialization/models/item/large_heat_exchanger.json -eb1a693f1e8961a461c67ae612cc0eabc59b60ad assets/modern_industrialization/models/item/large_motor.json -fa72f6f86cdf1df0b98e9b2b8b85a114996f4e6a assets/modern_industrialization/models/item/large_pump.json -b7d60418149813225da4c5bd649fda46d1364b3f assets/modern_industrialization/models/item/large_steam_boiler.json -cb9c558a17df663be8bd9fb3cb30741557695911 assets/modern_industrialization/models/item/large_steam_turbine.json -557e14acdafdac167ddeeab27dc3827637210195 assets/modern_industrialization/models/item/large_tank.json -52c065b93aef5b0270f784b04ad2f7d72070ae18 assets/modern_industrialization/models/item/large_tank_hatch.json -47f0ffdd167899d3353d1198b0890cd12c71c288 assets/modern_industrialization/models/item/lead_block.json -affb44234d718c3ae3483f15d3273944afd4e197 assets/modern_industrialization/models/item/lead_double_ingot.json -4bdb2f37f8379e4701e0e390f5ed04e6b012c6de assets/modern_industrialization/models/item/lead_dust.json -dff929a4f08e0d89b47c687c00c9b68aad53fd5f assets/modern_industrialization/models/item/lead_ingot.json -b476c332c3a6c852621f88d831ddfd96a10bbf7b assets/modern_industrialization/models/item/lead_nugget.json -8ed6e0ecee16c6b7b1ef99d59e9cde5953c5d273 assets/modern_industrialization/models/item/lead_ore.json -de10b04b53184360eef9717d5d296f399e6912d6 assets/modern_industrialization/models/item/lead_plate.json -130afff4430faaf7603a091563184047bcc2f7f3 assets/modern_industrialization/models/item/lead_tiny_dust.json -25414411c55660144b52263c514f8b2e4aba9364 assets/modern_industrialization/models/item/le_mox_block.json -ba16940b5e2255ef0b7d3c2a4adaac0b6b9b97c9 assets/modern_industrialization/models/item/le_mox_dust.json -3ae8cfe6716adb18dbf477be96697413e00e30e5 assets/modern_industrialization/models/item/le_mox_fuel_rod.json -031651b0cdad4ad58e8be2943809a458df0c9f67 assets/modern_industrialization/models/item/le_mox_fuel_rod_depleted.json -f1c95dd2b11cc265bd0a83bf82abdcb55d814e41 assets/modern_industrialization/models/item/le_mox_fuel_rod_double.json -aa8041593ae0d1b992ff47d9f64ebfebcb55fe52 assets/modern_industrialization/models/item/le_mox_fuel_rod_quad.json -5c3a4639cb66dd597d3118450a93de6267472e5f assets/modern_industrialization/models/item/le_mox_ingot.json -fc39755cb5aeb7363cc900b5908020c8474b249b assets/modern_industrialization/models/item/le_mox_nugget.json -01f3c0a982b73d5bb3f04cddafeac7fe2b62b2d4 assets/modern_industrialization/models/item/le_mox_rod.json -d92be089d8f91a7a2e5a9142b6933b1b9b7f7d7c assets/modern_industrialization/models/item/le_mox_tiny_dust.json -1413d67307eb4308be376bdd0c7fcdfd28103c64 assets/modern_industrialization/models/item/le_uranium_block.json -adec7be548e71dea9ba7c5e965ffebd7cf4dd3dd assets/modern_industrialization/models/item/le_uranium_dust.json -f599ed80e65a2b174c49790c52f7d99cf9b880fe assets/modern_industrialization/models/item/le_uranium_fuel_rod.json -ccaf50b8d42eb5ea33d6557dbde015448fba9472 assets/modern_industrialization/models/item/le_uranium_fuel_rod_depleted.json -0358290720d3406332fc1f26b9a340d8adce58c3 assets/modern_industrialization/models/item/le_uranium_fuel_rod_double.json -33e775afeaebb25fe19791905f29c12a25307959 assets/modern_industrialization/models/item/le_uranium_fuel_rod_quad.json -062eaef663e61996af59d6aee9f0ddc23546998b assets/modern_industrialization/models/item/le_uranium_ingot.json -ce2b5a38ba8c23736d051dac081df671a50a76c3 assets/modern_industrialization/models/item/le_uranium_nugget.json -c7303a05e6100f55add1ad8ca3b39c68bc894dcb assets/modern_industrialization/models/item/le_uranium_rod.json -833fcbf07bc96ce9c4ce13f9dab76c8ffd77f703 assets/modern_industrialization/models/item/le_uranium_tiny_dust.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/light_blue_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/light_blue_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/light_blue_me_wire.json -376a02f5473e2e4245507cd0415194cceae63ecd assets/modern_industrialization/models/item/light_fuel_bucket.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/light_gray_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/light_gray_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/light_gray_me_wire.json -6f718db895bde27420a6e841ea69e682edb42515 assets/modern_industrialization/models/item/lignite_coal.json -23f7249ca880626e43c8d6867fc7a3bbe70d506f assets/modern_industrialization/models/item/lignite_coal_block.json -63ba7511f763844b003ea0a717093bdc28217fc5 assets/modern_industrialization/models/item/lignite_coal_crushed_dust.json -360735c6501e690f6238d4605f00af815f324989 assets/modern_industrialization/models/item/lignite_coal_dust.json -b74d5c4874061cbf983c57963aa201170a00312b assets/modern_industrialization/models/item/lignite_coal_ore.json -703b192831ece1ef8713b65da8954d3506d25687 assets/modern_industrialization/models/item/lignite_coal_tiny_dust.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/lime_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/lime_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/lime_me_wire.json -c43b2a530be613e7a4f41b1af2103f8b2857a7e4 assets/modern_industrialization/models/item/liquid_air_bucket.json -2ec46b0af92f6d1b27109de9041ca9de9df0befb assets/modern_industrialization/models/item/lubricant_bucket.json -e19a4218dc6ae68a31006478e137dd0b634e028d assets/modern_industrialization/models/item/lv_diesel_generator.json -9ff3b339fe6308dba819de9913bae32dd69c4e13 assets/modern_industrialization/models/item/lv_energy_input_hatch.json -53bc02e92768d202ad0e6c0df1cc1d199d1aef6a assets/modern_industrialization/models/item/lv_energy_output_hatch.json -d5b5f6a45c501f957a17e9b0323156e585ecb2df assets/modern_industrialization/models/item/lv_mv_transformer.json -0dd1381cfbcc4ecba4d0d64e5ef6e86d513f0313 assets/modern_industrialization/models/item/lv_steam_turbine.json -875c30e99bd23d0c436cdb39c01f191701c0024b assets/modern_industrialization/models/item/lv_storage_unit.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/magenta_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/magenta_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/magenta_me_wire.json -72a1e8f3183fb8dd636d72530ca50dd9a2406d7a assets/modern_industrialization/models/item/manganese_crushed_dust.json -bfc6ccffdd499e8496ac72069b88549b7ba419ee assets/modern_industrialization/models/item/manganese_dust.json -46b1e195b0cdbd0661229ecf8675ee6a4adec7bc assets/modern_industrialization/models/item/manganese_sulfuric_solution_bucket.json -919212fcf36c5c2a9dc7cd192f5572be27cc62d5 assets/modern_industrialization/models/item/manganese_tiny_dust.json -847bc6fba252466243e075dae31151ada26ec0c9 assets/modern_industrialization/models/item/memory_management_unit.json -4aeba9b8d505c2d5394bb3b8876a13c5eac20610 assets/modern_industrialization/models/item/methane_bucket.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/me_wire.json -2eb956d20de250a71f15c128aeb6cebb1eb5c6f8 assets/modern_industrialization/models/item/mixed_ingot_blastproof.json -b84a3cd4d5de90146a6ea000175854ec92ab8f4e assets/modern_industrialization/models/item/mixed_ingot_iridium.json -70230d621ec921be070bb2ed588d0379e5f7cc5c assets/modern_industrialization/models/item/mixed_plate_nuclear.json -1b0b8ee0f593491b951e67ec9a0e84d71f021167 assets/modern_industrialization/models/item/molten_redstone_bucket.json -8674fa153a0a6cfad5225b1cc91dd101f843ee5d assets/modern_industrialization/models/item/monazite_block.json -8e60bea66265abed7df11e762db762c55ab91766 assets/modern_industrialization/models/item/monazite_crushed_dust.json -bf6a917599af8bfe8550cf063260cd260a35299e assets/modern_industrialization/models/item/monazite_dust.json -92af33a5188d55e935bea722fcd2a8fe1fd75e7a assets/modern_industrialization/models/item/monazite_ore.json -9ed616ba0ea3f0f455f8506290849bcff443342f assets/modern_industrialization/models/item/monazite_tiny_dust.json -0acd8376a6cf786cedbc9fe544a333172012582f assets/modern_industrialization/models/item/monocrystalline_silicon.json -1b14d3b3e21289cd05f1b01f256cff26c917f620 assets/modern_industrialization/models/item/motor.json -986691e0746849a9ac3bd1f8bfcef40b2c81aa58 assets/modern_industrialization/models/item/mv_diesel_generator.json -cf74100590b428be705f19cd657c6f9238cf66dd assets/modern_industrialization/models/item/mv_energy_input_hatch.json -987be1b340d82cbcf28b31c5d1900a60a1d37f96 assets/modern_industrialization/models/item/mv_energy_output_hatch.json -58557394cb81f6706c7b3d8dc7e4d5e00881e5a5 assets/modern_industrialization/models/item/mv_hv_transformer.json -3bf06d555d409f9c1a2724407a4d0a799e5c6ada assets/modern_industrialization/models/item/mv_lv_transformer.json -a449cd964cbd1ffe7a05288db82c6eee3d7b9811 assets/modern_industrialization/models/item/mv_steam_turbine.json -1afc8dee1f8892e42e92bb9890607d757877ccff assets/modern_industrialization/models/item/mv_storage_unit.json -26fb33803376b566856c275c1d20069543a8d7f1 assets/modern_industrialization/models/item/naphtha_bucket.json -770e8e48897c2f1e97994a9625159f8ddfd90460 assets/modern_industrialization/models/item/neodymium_block.json -df6ee170727f8f5cd0f8a31aa439a0a6a50ccc8b assets/modern_industrialization/models/item/neodymium_dust.json -7a17f25fe6495d35088dfb0ea682d0aa3925318c assets/modern_industrialization/models/item/neodymium_tiny_dust.json -7541b693efcb303c65e3867fd4b1ef6bf244adc6 assets/modern_industrialization/models/item/netherite_hammer.json -fdced0a24e6dd70cd40d0d4a4d3f227f2262410a assets/modern_industrialization/models/item/nickel_block.json -92655beacaf68a57551894e371dc45b8eddbb98c assets/modern_industrialization/models/item/nickel_double_ingot.json -7811cb82e12c4498311aa936623f93c7fef7ae35 assets/modern_industrialization/models/item/nickel_dust.json -6510daa35d09585d4398d5d17a37a3dc0bef18c6 assets/modern_industrialization/models/item/nickel_ingot.json -2e95b6cee41157fe09157714eda8e2538560d03e assets/modern_industrialization/models/item/nickel_nugget.json -7707f5bab1ee21ea01b35dd1f5cd72a80ad0e7ac assets/modern_industrialization/models/item/nickel_ore.json -0a78827b4357e74aedbd7a8b11bdcfc8f4b8bee2 assets/modern_industrialization/models/item/nickel_plate.json -e207bb04cb9c9116faa74c751bbdc0570a7da1e4 assets/modern_industrialization/models/item/nickel_tiny_dust.json -49f23b9e69c10bdbeb6d31831f3ce5e62c1a5dd4 assets/modern_industrialization/models/item/nitrogen_bucket.json -3d7917f63edbdae95262c864bdc46583d4b26080 assets/modern_industrialization/models/item/not_gate.json -7c82ad45e1dfe0a4d786cdd96e6f5b025bfc2e5c assets/modern_industrialization/models/item/nuclear_alloy_large_plate.json -c66067d104790f0ac584420cb38f056880cddd86 assets/modern_industrialization/models/item/nuclear_alloy_machine_casing_pipe.json -5fad659d4a23dd75a75edadc1ed1f5f43b353ac8 assets/modern_industrialization/models/item/nuclear_alloy_plate.json -a60e30081fdada08e3925adb32fe786e0ac51795 assets/modern_industrialization/models/item/nuclear_casing.json -9d9f04adc80ba8585fe439fb6cebf954ac7cbbf0 assets/modern_industrialization/models/item/nuclear_fluid_hatch.json -28ce6100216dde2017d4d762f2b22364690309db assets/modern_industrialization/models/item/nuclear_item_hatch.json -90eddbb290d827bbcb9752ac6286745cb7efd7ef assets/modern_industrialization/models/item/nuclear_reactor.json -539b4937dc0da3addab1371e5e27b6b83b6caad0 assets/modern_industrialization/models/item/nuke.json -725fa55131ea4c4d2a2ffa90d8683cbd4303fb2d assets/modern_industrialization/models/item/nylon_bucket.json -455d39f49845e7c79c8991d88c294573acb5012e assets/modern_industrialization/models/item/oil_drilling_rig.json -4ee98e91333ba9474a0d2e0428ea67c538d96154 assets/modern_industrialization/models/item/op_amp.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/orange_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/orange_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/orange_me_wire.json -44352856e4969651ccb530322070bd427e0e13d1 assets/modern_industrialization/models/item/or_gate.json -97899b6a3157f8f1366e14db9e7ece3db457e8b3 assets/modern_industrialization/models/item/overdrive_module.json -7ce2208812ae1b2d2e174a587dff7d4e03bfdf79 assets/modern_industrialization/models/item/oxygen_bucket.json -8c0f98597f861619f59510d90fcb138ebef69d7f assets/modern_industrialization/models/item/packer_block_template.json -63b844e2ab4e159a9f7584254e592164873d6347 assets/modern_industrialization/models/item/packer_double_ingot_template.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/pink_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/pink_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/pink_me_wire.json -d2b5c3974bf9f9bd46d503bc72eeb70421484cd4 assets/modern_industrialization/models/item/piston.json -d4e068caf6d05bb31f8c426b424c8abc48005291 assets/modern_industrialization/models/item/plant_oil_bucket.json -282b1c538b6d6bbd70603911cf566788b19f4343 assets/modern_industrialization/models/item/plasma_handling_iridium_machine_casing.json -05d86bb7ce966cd031d135f50a3e6542fb58e185 assets/modern_industrialization/models/item/plasma_turbine.json -1111a8a6e9f4fde8173c2e6b91be75fce8ba9207 assets/modern_industrialization/models/item/platinum_block.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/platinum_cable.json -0ad65b189bb23d34b1d0a38287c8927a6667d343 assets/modern_industrialization/models/item/platinum_double_ingot.json -4b5c82b51810b7256563b40d3736851c0cd8d8e0 assets/modern_industrialization/models/item/platinum_dust.json -36a10ec03112a877fd8f844921cbe946afcc8977 assets/modern_industrialization/models/item/platinum_fine_wire.json -67651f2539ce848009ea9872caf49636d7c6f9f5 assets/modern_industrialization/models/item/platinum_hot_ingot.json -dddfae02dfa050b90b984fc9a76fb6761e514d1b assets/modern_industrialization/models/item/platinum_ingot.json -daaaba3bb00984d359867ef080129ede9655c672 assets/modern_industrialization/models/item/platinum_nugget.json -351f294bec1a7c4137faa8718c844c86a150929d assets/modern_industrialization/models/item/platinum_ore.json -83481cbb7faa5c417da59d96a8bd3bfaae39f384 assets/modern_industrialization/models/item/platinum_plate.json -1f75c888f13f35ed927344d4b982df1ca7c01626 assets/modern_industrialization/models/item/platinum_sulfuric_solution_bucket.json -28508b3f398fe4725d6d613f1c9083c5c0e04a79 assets/modern_industrialization/models/item/platinum_tiny_dust.json -f47848b0bf9aa896f54d24bddc88bb4f986030b2 assets/modern_industrialization/models/item/platinum_wire.json -25c9df637979747ddbdd327aafa70f765661a9a4 assets/modern_industrialization/models/item/plutonium_battery.json -f097afcdcb9b2490bb328a9b2cfeb9579133ee7d assets/modern_industrialization/models/item/plutonium_block.json -bd2001752eb304e116a3d720bf728ddbd1b3ca75 assets/modern_industrialization/models/item/plutonium_dust.json -80c891e93ade601b6173125f79678529f7dedb34 assets/modern_industrialization/models/item/plutonium_ingot.json -83e5a57a841bf561730bf190d8136013f0a7cd0f assets/modern_industrialization/models/item/plutonium_nugget.json -f3fe594a8386a772e513a7483e7836a4e4375b07 assets/modern_industrialization/models/item/plutonium_tiny_dust.json -4cea5e2aff7ef823e976cca6e0eea3660611b74b assets/modern_industrialization/models/item/polarizer.json -1f888e908f3d0a42176621cc6fc12f614f586c64 assets/modern_industrialization/models/item/polyethylene_bucket.json -9babc9b7f0aaf10cd0e382736094247a2a2174d4 assets/modern_industrialization/models/item/polyvinyl_chloride_bucket.json -7f41913074deecf8b12c42b46a26f7827379a533 assets/modern_industrialization/models/item/portable_storage_unit.json -adb1e531961d790aa1b0f0c71f487d7dcf8f05c2 assets/modern_industrialization/models/item/pressurizer.json -60c327e4da861c7d47b2e056e77f8b65fe4ab808 assets/modern_industrialization/models/item/processing_unit.json -c1b341d76e65c9eca30964e6ca5b2f111678e582 assets/modern_industrialization/models/item/processing_unit_board.json -8e5f197a3e99637c5decb27196afaee853e52f3f assets/modern_industrialization/models/item/propene_bucket.json -62aa240bbd209de12d0fb7e2bf053080795cc7a2 assets/modern_industrialization/models/item/pump.json -5b691469848a113804e94d12d32aea855a74d0f6 assets/modern_industrialization/models/item/purified_platinum_sulfuric_solution_bucket.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/purple_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/purple_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/purple_me_wire.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/quantum_barrel.json -951823c11ef78b5ce699fa0cba111ee4cbe98d3a assets/modern_industrialization/models/item/quantum_boots.json -f3827cf6a5806c6d5f32e0cea2c6a95ddfd35b5c assets/modern_industrialization/models/item/quantum_chestplate.json -15f8a255bd0551af25dfe3aa022af30c4c2120f4 assets/modern_industrialization/models/item/quantum_circuit.json -f3f799317679c0f7565435839a231222b412bb29 assets/modern_industrialization/models/item/quantum_circuit_board.json -82f6d03362bc75972e27639c8d241ed476b202f1 assets/modern_industrialization/models/item/quantum_helmet.json -e3d57582912c0d3cc200bbef09529bc9a27c6c0f assets/modern_industrialization/models/item/quantum_leggings.json -af78ab9d144bfefd5772d7e2839bab17cf96010b assets/modern_industrialization/models/item/quantum_machine_casing.json -4237028d57c9418eea40b26cfda3d83e0d92d5a3 assets/modern_industrialization/models/item/quantum_machine_hull.json -306b8470b53beaeac97f466e565c105757ac0f24 assets/modern_industrialization/models/item/quantum_sword.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/quantum_tank.json -d1497e2fb520819d24ca197f25b9b7c484221b15 assets/modern_industrialization/models/item/quantum_upgrade.json -91e8b71b26cf4668c1154eb6309f91979e1ccda6 assets/modern_industrialization/models/item/quartz_crushed_dust.json -90e80735c26e5157ea87ae4990849da36cd7e711 assets/modern_industrialization/models/item/quartz_dust.json -d9eec49588daec3029411545cf91aa9bacdd744d assets/modern_industrialization/models/item/quartz_ore.json -43456254ec54c9e3f04be3168f8abda7be1bc3b6 assets/modern_industrialization/models/item/quartz_tiny_dust.json -2a1134806393a405da29c652a5c3da0975d569f6 assets/modern_industrialization/models/item/qubit.json -926a464f940ac850aaf0b62b90526aab15eba613 assets/modern_industrialization/models/item/random_access_memory.json -282cd3397ebe6db396223f41f864e74a8e3ddc16 assets/modern_industrialization/models/item/raw_antimony.json -2725a33a43ce2257a7ecce9989daa2940b926661 assets/modern_industrialization/models/item/raw_antimony_block.json -76bca9c7e46d0183a987b562110ca2f0e376cfa6 assets/modern_industrialization/models/item/raw_biodiesel_bucket.json -c0ab0558f58543d8cc73dab0dcca8205bbb886be assets/modern_industrialization/models/item/raw_iridium.json -880644bcceccf6186f325f3a01f8bbf1b33d4225 assets/modern_industrialization/models/item/raw_iridium_block.json -082cc48b32f991cbc763c4d9fd5eee09450de924 assets/modern_industrialization/models/item/raw_lead.json -cd6606a1064494e99698aad173659622bdb20a43 assets/modern_industrialization/models/item/raw_lead_block.json -7a8815b7d2a8a7a9d5ef096922f351c65317b36c assets/modern_industrialization/models/item/raw_nickel.json -64eeb60ffd869423811dbfdb2a713eb8f668a0b5 assets/modern_industrialization/models/item/raw_nickel_block.json -ac992d8b9601240d13f5a5104c035f7954e5c694 assets/modern_industrialization/models/item/raw_platinum.json -05b60bc248dd72a5f2aaa1d2ddb2507a347a1872 assets/modern_industrialization/models/item/raw_platinum_block.json -4610831f40fcb1cef2da50363a2d31b036fae12c assets/modern_industrialization/models/item/raw_silver.json -55bd477afdf811c99e789d08882c51f938409d5f assets/modern_industrialization/models/item/raw_silver_block.json -83d7ab842386345353e723c20662c375d73d5d25 assets/modern_industrialization/models/item/raw_synthetic_oil_bucket.json -dc0e66449741dd243bcbc8f6b2c353691af89632 assets/modern_industrialization/models/item/raw_tin.json -088b3b57b02183b35bfe156f08114c0427238ef7 assets/modern_industrialization/models/item/raw_tin_block.json -dccf011e20c13b487aa98f8f9d18fd4a2a7880e2 assets/modern_industrialization/models/item/raw_titanium.json -b17bfbafa8809f0adda6dc1eaed20e8c9cf0d332 assets/modern_industrialization/models/item/raw_titanium_block.json -7ca0f7a057af2dc6a3e6004b59c37421cefcbe82 assets/modern_industrialization/models/item/raw_tungsten.json -b3dc3e21431ddddcca33c16761b78dcbfdd6fc02 assets/modern_industrialization/models/item/raw_tungsten_block.json -080bea339184bd05ddac651fe2b13efcf47ac0f6 assets/modern_industrialization/models/item/raw_uranium.json -a3173d2dedf60c1fd05a8622dc76e045ba487802 assets/modern_industrialization/models/item/raw_uranium_block.json -8bb6b92260cd1e1d0c31c26d194c10c7c4c74c25 assets/modern_industrialization/models/item/redstone_battery.json -eb625f9aeed5882147bb6f43172be94b17c12802 assets/modern_industrialization/models/item/redstone_crushed_dust.json -19d0cfc610c93c6e8dfc21821f05e44d54454959 assets/modern_industrialization/models/item/redstone_tiny_dust.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/red_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/red_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/red_me_wire.json -208eab4f8de3d244beed44b7330c4863494b0dc1 assets/modern_industrialization/models/item/replicator.json -493c3d209cd952f52e3ba469b68a58e1992f31dc assets/modern_industrialization/models/item/resistor.json -28efdd5cec79aeed69b44014d74903ad9580d4f4 assets/modern_industrialization/models/item/robot_arm.json -2889e75de3f5d64826590ff794de323b1c555d6e assets/modern_industrialization/models/item/rubber_boots.json -f51873a36adabb307d57d6373880110147e4021b assets/modern_industrialization/models/item/rubber_helmet.json -5229ce71b9e19b474e735c3ebe01d0bd639c9840 assets/modern_industrialization/models/item/rubber_sheet.json -7c7e414f45d356b4acc9f859139e295de502a4c6 assets/modern_industrialization/models/item/ruby_dust.json -80246b563280be374ba4fa713b8050c5f990a3f2 assets/modern_industrialization/models/item/ruby_tiny_dust.json -4b38289cae21dcaed3e4ae3a22f05478e9150cc8 assets/modern_industrialization/models/item/salt_block.json -5286b1d4323a9411452781e7670a818bfe69d7cc assets/modern_industrialization/models/item/salt_crushed_dust.json -a804577a77e741a032061741126890fcd4a567e5 assets/modern_industrialization/models/item/salt_dust.json -ee4af76619999f8e98d82305de717514dc95e1f6 assets/modern_industrialization/models/item/salt_ore.json -7f8314b11def793b5a0e03669f8489b42705a7bd assets/modern_industrialization/models/item/salt_tiny_dust.json -b5cc77a06f98e3a1ecd06b9f43aa22e29e68710e assets/modern_industrialization/models/item/shale_oil_bucket.json -3dd0643fd72ca6e57100b785fa30308adda42bd2 assets/modern_industrialization/models/item/silicon_battery.json -62af3a77477cc5976abda9a7517b6057326e57e6 assets/modern_industrialization/models/item/silicon_block.json -5ced5a90329a680831ff80338488391ae36b4ceb assets/modern_industrialization/models/item/silicon_double_ingot.json -47c59b61adb25da0d386486801f9893230356ed8 assets/modern_industrialization/models/item/silicon_dust.json -26851c465e09ead4796b37f86e411c799fedf870 assets/modern_industrialization/models/item/silicon_ingot.json -00602a13e53e7a5641623f9560e40e4da60a659b assets/modern_industrialization/models/item/silicon_nugget.json -b10e15ef98a20306d0d3961c4f120b3d291694e7 assets/modern_industrialization/models/item/silicon_n_doped_plate.json -50693f04610ec4de40ffbb6785b1a142f3ee8f3a assets/modern_industrialization/models/item/silicon_plate.json -088247ddd8f3b2fccbf0ccbda33eb09674860a86 assets/modern_industrialization/models/item/silicon_p_doped_plate.json -6b38db3bdb6574ba87d9ee5b161e010f7bb56ef0 assets/modern_industrialization/models/item/silicon_tiny_dust.json -f0553ea276e94431e0882758ebcf4957473ebc36 assets/modern_industrialization/models/item/silicon_wafer.json -396335a393b8474fadbfef35800d76e650751915 assets/modern_industrialization/models/item/silver_block.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/silver_cable.json -ed5c6d29a7e33a57357b84b2561c17bc5b33a1c0 assets/modern_industrialization/models/item/silver_double_ingot.json -2581712f8060d9a9f3fde927e4351776194ed02f assets/modern_industrialization/models/item/silver_dust.json -7652156eb39f66e8eb49f643daeeac6e7fda5453 assets/modern_industrialization/models/item/silver_ingot.json -e1c63a035cebd6ead0f44d0c03964b538b782ede assets/modern_industrialization/models/item/silver_nugget.json -be39f2c4dff7f5a51107e016fc75a60792a4cf32 assets/modern_industrialization/models/item/silver_plate.json -a18d8f0f3de5bc79398782a954791244fb84e97d assets/modern_industrialization/models/item/silver_tiny_dust.json -1af91188c430ff758f29f39fe40a7768a0f875f7 assets/modern_industrialization/models/item/silver_wire.json -5e82e9387d0386beec0c419bb737d296b4a8c4cb assets/modern_industrialization/models/item/singularity.json -1818a8be8dda94891669d943f7fb16be361f2ca0 assets/modern_industrialization/models/item/small_heat_exchanger.json -81332e18694676c3a1d5d5dc98a550a98b05710f assets/modern_industrialization/models/item/sodium_battery.json -6280e44b106034aef97d311bcba464c66240c2fd assets/modern_industrialization/models/item/sodium_block.json -c06307104984a3cdad3e9df07b3244829d5cb457 assets/modern_industrialization/models/item/sodium_dust.json -27d9401a18a205afa70adacb0d003ffe4648eb10 assets/modern_industrialization/models/item/sodium_hydroxide_bucket.json -b3004f28f6120609d788d969b318df4e1b265237 assets/modern_industrialization/models/item/sodium_tiny_dust.json -fe3f204f2e5229d7ae0a974d6883f54c5ef7e730 assets/modern_industrialization/models/item/soldering_alloy_block.json -ede8d6f2d7a3395a0d7e96abff8040d2b316978d assets/modern_industrialization/models/item/soldering_alloy_bucket.json -8f333749c63d0e8ed7917d976de2c4e82c177e8e assets/modern_industrialization/models/item/soldering_alloy_dust.json -81e3d80b59f0797137b6216cb753c6c8e06e0890 assets/modern_industrialization/models/item/soldering_alloy_tiny_dust.json -807fde50e572628f4c5631d05796d6e5c8820a0b assets/modern_industrialization/models/item/solid_titanium_machine_casing.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/stainless_steel_barrel.json -b6c87e928d221ba77c35cce84c0aad0f6912f0a0 assets/modern_industrialization/models/item/stainless_steel_blade.json -b55aa56b9477c312635d668de65894d2046b3803 assets/modern_industrialization/models/item/stainless_steel_block.json -dd69118815ed4c5d02337f986790db810c658c30 assets/modern_industrialization/models/item/stainless_steel_bolt.json -d9d7aec9030ab8ca32ebbb45c6da719126041b46 assets/modern_industrialization/models/item/stainless_steel_curved_plate.json -48e8959959b5c909560188ea5ee56e36c68e4795 assets/modern_industrialization/models/item/stainless_steel_double_ingot.json -e26a08834602ce944531009aa1a41718bc24224b assets/modern_industrialization/models/item/stainless_steel_drill.json -a6649218cd196b5387ce3cd1452570df3119eed2 assets/modern_industrialization/models/item/stainless_steel_drill_head.json -db5bf24b02a557189a9be17011ae7ccba5bea630 assets/modern_industrialization/models/item/stainless_steel_dust.json -1f49d9ea72a883d3617535c84280ad911f2d564f assets/modern_industrialization/models/item/stainless_steel_gear.json -eed1701e376416228634fa48f860baa7903f26e7 assets/modern_industrialization/models/item/stainless_steel_hot_ingot.json -2c6d5ecf07d6ac45536903e36d5a3398fd4bc894 assets/modern_industrialization/models/item/stainless_steel_ingot.json -bd54f10977c27475c26e0210dcb35f9395c05dea assets/modern_industrialization/models/item/stainless_steel_large_plate.json -78d9ab72edd8fb634d058281f941a50424b0c9ae assets/modern_industrialization/models/item/stainless_steel_machine_casing_pipe.json -c7f22d602cc735af5ef0bd9d5146164385b19b87 assets/modern_industrialization/models/item/stainless_steel_nugget.json -1777bd159c8151e8c2360cf2c2ab22023ec18248 assets/modern_industrialization/models/item/stainless_steel_plate.json -13ab2e74137f0b6248a6db1b5e039fdceda095c9 assets/modern_industrialization/models/item/stainless_steel_ring.json -bce8e38967cf43adbadfd7ac4954bb12dc78b7cf assets/modern_industrialization/models/item/stainless_steel_rod.json -ca818ada5df3f88b4908deb04e9f613a50560c64 assets/modern_industrialization/models/item/stainless_steel_rod_magnetic.json -8519e143100e196c63ab710cbc926d3b62081f1e assets/modern_industrialization/models/item/stainless_steel_rotor.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/stainless_steel_tank.json -150bc7b37b2870e03a0efee62b44d7963d9bfe59 assets/modern_industrialization/models/item/stainless_steel_tiny_dust.json -c84f79ca0d317dcbfddcecbfbd0bb57fd0fc0eda assets/modern_industrialization/models/item/steam_blast_furnace.json -2122053f1d0b1a4cab404ad91c78194a45771193 assets/modern_industrialization/models/item/steam_bucket.json -7886141e6c6dd414847f3c5303b4bb2fc6bb3a94 assets/modern_industrialization/models/item/steam_cracked_heavy_fuel_bucket.json -8119acd77f265cf3220369c3e341243e9dc1c0b7 assets/modern_industrialization/models/item/steam_cracked_light_fuel_bucket.json -b4255911dab185b31b5977104f5231ce9a20567b assets/modern_industrialization/models/item/steam_cracked_naphtha_bucket.json -621a23f87a276d91708cf1df44f926988d6a8ccf assets/modern_industrialization/models/item/steam_mining_drill.json -536f52dac46cdb3e5c42a3a2c2620a773cf2864d assets/modern_industrialization/models/item/steam_quarry.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/steel_barrel.json -cc1108c91fb26f7552a69654640f4e45fffcef2c assets/modern_industrialization/models/item/steel_block.json -aa7ac323125a67e97f3d1f3b3531a504a1e55911 assets/modern_industrialization/models/item/steel_boiler.json -c9574387b44f0a3811d8efb08fa52ac8c78e77b1 assets/modern_industrialization/models/item/steel_bolt.json -d62bf5ea5c07095248d1eca13a0eca5af3dc51f4 assets/modern_industrialization/models/item/steel_compressor.json -3957fd75ebf15bcb84350a5a6651885deb8f41dc assets/modern_industrialization/models/item/steel_curved_plate.json -815941eb52442f1d7f696a7a5abff53df8df0e47 assets/modern_industrialization/models/item/steel_cutting_machine.json -3b6e953251df44a95dfb2360031167162c77bf69 assets/modern_industrialization/models/item/steel_double_ingot.json -497e4839016f0394b42ea5da4ea1cb852a8cb984 assets/modern_industrialization/models/item/steel_drill.json -3495bd8b6adae8f0a7de834fc454e7f53ff40ef6 assets/modern_industrialization/models/item/steel_drill_head.json -838f5693455b667abf394965dfe8c61f441cd663 assets/modern_industrialization/models/item/steel_dust.json -eb96b8bbc4bffe4f330f11c4fcc924972baca149 assets/modern_industrialization/models/item/steel_fluid_input_hatch.json -b26a9715583bff77660e99c30b4774b20f71ce93 assets/modern_industrialization/models/item/steel_fluid_output_hatch.json -18afaccb762a4b60293c2a3395bf7c4b7e62cb0f assets/modern_industrialization/models/item/steel_furnace.json -a1fcbd1d3c2f8250df6e7d704ab460e5765a2dff assets/modern_industrialization/models/item/steel_gear.json -5a110547ed0b72f1211a39f5616d820484b55904 assets/modern_industrialization/models/item/steel_hammer.json -86cf76342a1d31ce62f6c04de266fcb14adce6fd assets/modern_industrialization/models/item/steel_ingot.json -165c4cecf0d584358e953743093f208da269cbb4 assets/modern_industrialization/models/item/steel_item_input_hatch.json -f1b20448db8397bb8b94b20ecfeaea840c365294 assets/modern_industrialization/models/item/steel_item_output_hatch.json -2a1b88abdfe3e944ce56de89a10ba1106fedc507 assets/modern_industrialization/models/item/steel_large_plate.json -9b30539052ef6f98f23857172f65a18d3bcf1376 assets/modern_industrialization/models/item/steel_macerator.json -16f735ce603f8a2b3876428bd595218ae414d875 assets/modern_industrialization/models/item/steel_machine_casing.json -40562497115bada452e826b773194a5aff69c9a4 assets/modern_industrialization/models/item/steel_machine_casing_pipe.json -2bbf81e38e20a39e681d3abcb0b181758156b7f6 assets/modern_industrialization/models/item/steel_mixer.json -ef344574184aaa6ae18ae1ce44abdd39ded6b5db assets/modern_industrialization/models/item/steel_nugget.json -b2c62902c02e56d9c713b64bc328bafd221d2f8e assets/modern_industrialization/models/item/steel_packer.json -6e772b9f5aafa38faca3f6326a333a50765b38e1 assets/modern_industrialization/models/item/steel_plate.json -b0368fbaaf9969b45c7fed8da8e5496feabbbd23 assets/modern_industrialization/models/item/steel_ring.json -e1c55b69f31b28b6400b28d6549e56755d959a3a assets/modern_industrialization/models/item/steel_rod.json -3f9721eb72ecc0dfc0a2475903a6d8f990cf369e assets/modern_industrialization/models/item/steel_rod_magnetic.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/steel_tank.json -591ee00650d9351723aabe2f7f1b1d650183e3ca assets/modern_industrialization/models/item/steel_tiny_dust.json -ec12a1f6c117c5c914d1a6ecb5e0fd2ac63b9f8c assets/modern_industrialization/models/item/steel_unpacker.json -19690c7cffddbfc5b7c80382b700d47612bcae60 assets/modern_industrialization/models/item/steel_upgrade.json -9bc2433abc7d91991bf45dca59ef1ab5e005da69 assets/modern_industrialization/models/item/steel_water_pump.json -adf79b346277033beff8cf233848fd92b293b21d assets/modern_industrialization/models/item/steel_wiremill.json -406d999a5b831977e93e247a3d4060ece2f617e7 assets/modern_industrialization/models/item/styrene_bucket.json -1e3b8551d32d4d2e4f15dd66c086f18753dcee53 assets/modern_industrialization/models/item/styrene_butadiene_bucket.json -f08432f3375654d8d0d11d0068c8896baee8ccf8 assets/modern_industrialization/models/item/styrene_butadiene_rubber_bucket.json -4d921937c8f1653b7005ccaa36f96c0f23e3cc2b assets/modern_industrialization/models/item/sugar_solution_bucket.json -9a3dcc8b0fa7a1f584d453306c5bc120eab87d68 assets/modern_industrialization/models/item/sulfuric_acid_bucket.json -10260c8317e96857b271cb07592ac04326fadb4a assets/modern_industrialization/models/item/sulfuric_crude_oil_bucket.json -fc958c0f12f6ff9bfd288e2bdd463006087a9e2a assets/modern_industrialization/models/item/sulfuric_heavy_fuel_bucket.json -8d2ce5e9dff51f54aa77483400f0a821fab2d280 assets/modern_industrialization/models/item/sulfuric_light_fuel_bucket.json -4ba149e3d343d8318d80226612944ac556abe06e assets/modern_industrialization/models/item/sulfuric_naphtha_bucket.json -99d79b01323bc8fb071a667421c4425bdfcef030 assets/modern_industrialization/models/item/sulfur_block.json -d7cad940999bf464d9e4cfba9bd1b135cfd17eae assets/modern_industrialization/models/item/sulfur_dust.json -dde1e4ef887e63b5d1c2b6571538bfd72c023bee assets/modern_industrialization/models/item/sulfur_tiny_dust.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/superconductor_cable.json -acec702b7f72139c82ab2d06d195bf8aec7da608 assets/modern_industrialization/models/item/superconductor_coil.json -7d59c5dc08e4e7522f39b35e7763b93ad3fafe80 assets/modern_industrialization/models/item/superconductor_double_ingot.json -1ff478f74f65f8acd28f631f269cade5c8975114 assets/modern_industrialization/models/item/superconductor_dust.json -5383046ac321f6f55ff0599e611e01cd1bbb3f6c assets/modern_industrialization/models/item/superconductor_energy_input_hatch.json -28e48c632631d9025a2052d9b1c7eb2c65c25e4e assets/modern_industrialization/models/item/superconductor_energy_output_hatch.json -781f48a2d3a343a282b21d172649af808567b9ed assets/modern_industrialization/models/item/superconductor_ev_transformer.json -594f55cac9b2aac70d95d8cb7e74c42b2cd2363d assets/modern_industrialization/models/item/superconductor_hot_ingot.json -efc6eb8a14ec82dd7f6d499704e96e5deb58ae37 assets/modern_industrialization/models/item/superconductor_ingot.json -63669af6316ababfe9e41adeb239123f5c105aff assets/modern_industrialization/models/item/superconductor_nugget.json -13933e61d80af9439cc54c4cd6207cdbe1e13fb5 assets/modern_industrialization/models/item/superconductor_plate.json -c30166a3fc5e298e07a135b48c3ca53d7a530eab assets/modern_industrialization/models/item/superconductor_storage_unit.json -2cc5d169362548935507b14ac31738a1e2ee7463 assets/modern_industrialization/models/item/superconductor_tiny_dust.json -7cd110fb19cad0c0183bea716fbd10941f3e3ce3 assets/modern_industrialization/models/item/superconductor_wire.json -aa1cf4abff2f4576d7c11b95e47d62ae47322e01 assets/modern_industrialization/models/item/synthetic_oil_bucket.json -95d22ec326ac0e24f27cd727f98bb8581f9e46c1 assets/modern_industrialization/models/item/synthetic_rubber_bucket.json -6ee48eb4f1cf7e8256220cce5ced8ea042beb2cf assets/modern_industrialization/models/item/tin_blade.json -1255132f9899df3f5d4a99665368e860b40f14a4 assets/modern_industrialization/models/item/tin_block.json -43c33526aa18f43a399748eeeaa5a15122e99827 assets/modern_industrialization/models/item/tin_bolt.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/tin_cable.json -e6c17d8fb9b21e55b7cb1238ad7199ffef41d2ee assets/modern_industrialization/models/item/tin_curved_plate.json -c7c41b4d926b510f5d8850d3f8cc3c5deb08201e assets/modern_industrialization/models/item/tin_double_ingot.json -04f83a89b82ddc376d9bd19f0dc9893e4ee6ddfc assets/modern_industrialization/models/item/tin_dust.json -6d30dc6efb520da3b2a5a0d763d249b70c829494 assets/modern_industrialization/models/item/tin_gear.json -5e15362a0644222436f72d8b835cfc76a76efe41 assets/modern_industrialization/models/item/tin_ingot.json -7ce8134a02a6d96c752c8dd612b9f15a45eeb4d3 assets/modern_industrialization/models/item/tin_nugget.json -c0f543ad2fa80da11ef1f76d77a72aca616d17af assets/modern_industrialization/models/item/tin_ore.json -de6612e2c75b8b1e834119aba15fb079bd4f92b4 assets/modern_industrialization/models/item/tin_plate.json -c5ce173ab31639cd45387f164b18e3c4e4f5ee0f assets/modern_industrialization/models/item/tin_ring.json -264f830c7c1a9e01ba6f9b993f26d9113ee05a5d assets/modern_industrialization/models/item/tin_rod.json -26ba91b78d7fabf1df823e41725f9db4ded81e7c assets/modern_industrialization/models/item/tin_rotor.json -3048a3b5f14a8c780ad45b2c1633eca1e01b44ee assets/modern_industrialization/models/item/tin_tiny_dust.json -18caf7122ec6904011c9122bd8b33defdb8ba5f9 assets/modern_industrialization/models/item/tin_wire.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/titanium_barrel.json -ed38b1c51183a44cbcdf55b3704a905b7ca77904 assets/modern_industrialization/models/item/titanium_blade.json -f2ca7590413a4071a24918629fe017ac3eba0b91 assets/modern_industrialization/models/item/titanium_block.json -5f064621da2228c78ff0de50e8fd927a3a3b7955 assets/modern_industrialization/models/item/titanium_bolt.json -dddebcb583a24103c263ccbfe2f4d33d79ef3a92 assets/modern_industrialization/models/item/titanium_curved_plate.json -e1df9d5a109bf7f30f42349ef830f8712677af90 assets/modern_industrialization/models/item/titanium_double_ingot.json -f7d57816d8c24d670b085350ab316e5e12715ee9 assets/modern_industrialization/models/item/titanium_drill.json -662c8221754241a824eaeaa730b95cbbd6fa66cc assets/modern_industrialization/models/item/titanium_drill_head.json -4e15b1ef896bd27e5d96171b0c52e36d13acbbe7 assets/modern_industrialization/models/item/titanium_dust.json -f74d0f0dab1b05e422cc91fb34a267fab71b48a3 assets/modern_industrialization/models/item/titanium_gear.json -616fca675130e5d57ef48e245a4e56a79c9a8911 assets/modern_industrialization/models/item/titanium_hot_ingot.json -eba2092cfa342e1662a1a7e5127471203fc63f38 assets/modern_industrialization/models/item/titanium_ingot.json -8192f58f639cb2b606035be156ff984a0aeeae25 assets/modern_industrialization/models/item/titanium_large_plate.json -0d1b0633cba25b2e4cc2556ceebddf9061615f61 assets/modern_industrialization/models/item/titanium_machine_casing_pipe.json -5e08a4712365e807a85ab70c5440d2c35b2b8d8c assets/modern_industrialization/models/item/titanium_nugget.json -5ffcd89936e2c7fcb5773d8308579c43390c220a assets/modern_industrialization/models/item/titanium_ore.json -a3b57b36b77f5865075083bc6dc9df607b8eb950 assets/modern_industrialization/models/item/titanium_plate.json -468d55a80b081aef002012b5bc2ae177d7c72ea9 assets/modern_industrialization/models/item/titanium_ring.json -a9cd395e2c98bd789c58f7f940e482a264867777 assets/modern_industrialization/models/item/titanium_rod.json -c71a53863fbe6848528a3b03ad6ef5f3ceaeb223 assets/modern_industrialization/models/item/titanium_rotor.json -6fff0ef906f182357faec183b041dc191339ab28 assets/modern_industrialization/models/item/titanium_tank.json -c55e5625aba062d301a199c65a442f77df9be3d9 assets/modern_industrialization/models/item/titanium_tiny_dust.json -610e444967ada59137f523874d4fc0beb887a4c2 assets/modern_industrialization/models/item/toluene_bucket.json -88bb3cbcc068964976812948ac64e81c075be64e assets/modern_industrialization/models/item/transistor.json -bf09da75198ac63af4a0deb2339257666f0447f1 assets/modern_industrialization/models/item/trash_can.json -4bc6a7124d778f85b6d7ac1b1c052e6e1600d82f assets/modern_industrialization/models/item/tritium_bucket.json -f154e16205de1cbfee1e7996f0f3436856efbbbf assets/modern_industrialization/models/item/tungsten_block.json -4fa108e65004d6c28d00ecd376898300eb5576e4 assets/modern_industrialization/models/item/tungsten_double_ingot.json -cd0dd2a0744e0791a70fc3e25599ed3995e76f4b assets/modern_industrialization/models/item/tungsten_dust.json -9513a8ecef04ffc839968286b159e3ed8a9225f3 assets/modern_industrialization/models/item/tungsten_ingot.json -7b9e5e16c581cad16b02eeac8792f5ff212a9128 assets/modern_industrialization/models/item/tungsten_large_plate.json -6ec4aba90a7bbb271ccb6664663d2cca67f92c84 assets/modern_industrialization/models/item/tungsten_nugget.json -2207b9ab7e8b7d8eb087699cb99ff53098dd02b5 assets/modern_industrialization/models/item/tungsten_ore.json -7891ad701bd3c30ebf440dd34eb1ce5c94204aae assets/modern_industrialization/models/item/tungsten_plate.json -9bdef6794b7ea6ace1393fb865990c8a062e29d5 assets/modern_industrialization/models/item/tungsten_tiny_dust.json -bff02c0c15d5aab16ba3934d9e3e7ec12b00f3d3 assets/modern_industrialization/models/item/turbo_fluid_input_hatch.json -b43c4215ead2c8851dbd3c360bd3c5c98cfe94d0 assets/modern_industrialization/models/item/turbo_fluid_output_hatch.json -a8a7488702a61743e543ed80f8b7f4bf1e36b53b assets/modern_industrialization/models/item/turbo_item_input_hatch.json -47cc96468ff69789b70bb0014973bd14cc0cfd9a assets/modern_industrialization/models/item/turbo_item_output_hatch.json -3093c634bef4e65fefa8137bf0e0303e6e99e8ff assets/modern_industrialization/models/item/turbo_machine_casing.json -87f9c83d9393ab60bde824e93605b0a787e6da02 assets/modern_industrialization/models/item/turbo_machine_hull.json -95234d20698671010f1e2464a40bc954368f9920 assets/modern_industrialization/models/item/turbo_upgrade.json -6cf281e9d50a8dd54391b1ebc1103546a940e10f assets/modern_industrialization/models/item/ultradense_metal_ball.json -7238ee4f1903787312d0b45dd91d5fa12146daca assets/modern_industrialization/models/item/uncooked_steel_dust.json -0799795239ae1d5039faa1d6035b180dd2762a8e assets/modern_industrialization/models/item/uranium_235_block.json -b5bca7e74d4d0d1b60ecdd427cd773330375b5dc assets/modern_industrialization/models/item/uranium_235_dust.json -63ff7bd612f16a68e38e782f077dd875b2fed81c assets/modern_industrialization/models/item/uranium_235_ingot.json -4e6c5c55947c483e80bc2eb6f706ab3173a04550 assets/modern_industrialization/models/item/uranium_235_nugget.json -21033253f13f973d1d2cd36d66a76282cf519953 assets/modern_industrialization/models/item/uranium_235_tiny_dust.json -88d8d54889b5e67adbe6fa7bdb7374c49da9a605 assets/modern_industrialization/models/item/uranium_238_block.json -dcc2d63d8a95e4fc8e906ccac5a44c68007070a9 assets/modern_industrialization/models/item/uranium_238_dust.json -a55e9850e46e5c25403104eadf0fe36936f2df82 assets/modern_industrialization/models/item/uranium_238_ingot.json -60f7476b130c430ffc831c77f4971d9dad82a222 assets/modern_industrialization/models/item/uranium_238_nugget.json -54b56e19f2e8b5144389bf13b226bc13476cb4ca assets/modern_industrialization/models/item/uranium_238_tiny_dust.json -2ada2bed6cba4b0cf37aad209eb5f8107e624435 assets/modern_industrialization/models/item/uranium_block.json -da1925cd5b4c8b3a16420082617e2d17d6a8155b assets/modern_industrialization/models/item/uranium_dust.json -4babe4ec369070ff083e09234570d84481b70b1a assets/modern_industrialization/models/item/uranium_fuel_rod.json -11c32364ac0f80531028578660f9fac7601c6d8c assets/modern_industrialization/models/item/uranium_fuel_rod_depleted.json -3c78f1b3d3712a71722e00b6c2bb16f024b15bd7 assets/modern_industrialization/models/item/uranium_fuel_rod_double.json -92e3ee97b1a0e643eca04561a87283249a3881cc assets/modern_industrialization/models/item/uranium_fuel_rod_quad.json -8d2b288eaa91095523c2d2f3e5e1396ef9d18446 assets/modern_industrialization/models/item/uranium_ingot.json -a72245878429c667c9d0c1086ec93efd20c3d3d7 assets/modern_industrialization/models/item/uranium_nugget.json -5ed29257e5af2a5bd953fe39a80dbe8f75991e9c assets/modern_industrialization/models/item/uranium_ore.json -0897203d855774e71c4fd8d5a5f2216269fb4c24 assets/modern_industrialization/models/item/uranium_rod.json -6dfd7c427a099decbaa1cc2971b23d0ff6f5e14c assets/modern_industrialization/models/item/uranium_tiny_dust.json -4ca53cf44462f1f4d1dffe2adb1b445e7e1cb2e4 assets/modern_industrialization/models/item/uu_matter_bucket.json -5ebf619561a134079b154b629400660cb8329722 assets/modern_industrialization/models/item/vacuum_freezer.json -6e754b584d4f8417da06f101435fcf83f5b0fd4b assets/modern_industrialization/models/item/vinyl_chloride_bucket.json -8bcae51b679c071f5b7144b70be1acdf142a0ff5 assets/modern_industrialization/models/item/wax.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/white_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/white_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/white_me_wire.json -c2bcf6d5d8b18fda3c7c75f39644ad2b3d28d60d assets/modern_industrialization/models/item/wood_pulp.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/yellow_fluid_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/yellow_item_pipe.json -08f990a2e47bf4304eb1758a0ff7a84c59fc4964 assets/modern_industrialization/models/item/yellow_me_wire.json -053d43a702c614cf98225e28c4406290bf5fa3ac assets/modern_industrialization/models/item/yttrium_block.json -186b5871971ab73f79f8d8af0eba124bb135ebdc assets/modern_industrialization/models/item/yttrium_dust.json -90f5b28a17c9315df84ecd2b65a34b63a9f052cf assets/modern_industrialization/models/item/yttrium_tiny_dust.json diff --git a/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 b/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 index f8cdf96dd..d1a9543e5 100644 --- a/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 +++ b/src/generated/resources/.cache/8ad8302d110b05d7e02330dac58628134fdcff02 @@ -1,2 +1,2 @@ -// 1.21.1 2025-11-01T11:09:54.2591146 Translations -f87606b94e232a6ec16249c4d3703f292e428690 assets/modern_industrialization/lang/en_us.json +// 26.1-snapshot-4 2026-02-03T21:47:16.5920254 Translations +461626a213abcf7f883b7670c00269d7cf248208 assets/modern_industrialization/lang/en_us.json diff --git a/src/generated/resources/.cache/ab1440d8191c4e24b911c748033c3eee3ed26373 b/src/generated/resources/.cache/ab1440d8191c4e24b911c748033c3eee3ed26373 index 7c48e6de2..655e5c611 100644 --- a/src/generated/resources/.cache/ab1440d8191c4e24b911c748033c3eee3ed26373 +++ b/src/generated/resources/.cache/ab1440d8191c4e24b911c748033c3eee3ed26373 @@ -1,4 +1,4 @@ -// 1.21.1 2025-04-18T14:28:59.8250922 Tags for minecraft:fluid mod id modern_industrialization +// 26.1-snapshot-4 2026-02-03T21:47:16.5380251 Tags for minecraft:fluid mod id modern_industrialization 2e54f5684b3cedb03e10e44437abee3e54590e96 data/c/tags/fluid/acetylene.json c28c9db0ff6eb51c1abebea40752b47e4eef41ec data/c/tags/fluid/acrylic_acid.json 6e39bbfa65dad27d80c546299b5de3f96215a19d data/c/tags/fluid/acrylic_glue.json diff --git a/src/generated/resources/.cache/c9d45b166d9387c9834dd9cc06b557f12abaac0d b/src/generated/resources/.cache/c9d45b166d9387c9834dd9cc06b557f12abaac0d index 017656a4d..7b1ae57c7 100644 --- a/src/generated/resources/.cache/c9d45b166d9387c9834dd9cc06b557f12abaac0d +++ b/src/generated/resources/.cache/c9d45b166d9387c9834dd9cc06b557f12abaac0d @@ -1,4 +1,4 @@ -// 1.21.1 2025-11-18T00:08:48.8429161 Tags for minecraft:item mod id modern_industrialization +// 26.1-snapshot-4 2026-02-03T21:47:16.5390223 Tags for minecraft:item mod id modern_industrialization b7ef4462150855d29d57f806fb1387764e6fa77f data/c/tags/item/dusts.json 9d2318af59c4e4de55974d6da062f468a5a9aafc data/c/tags/item/dusts/aluminum.json 001769a3fa1d20ea297d8f5fa7b6c26073f43996 data/c/tags/item/dusts/annealed_copper.json @@ -66,7 +66,6 @@ a3d470c5119a8b38da6237f730e4b5bf048afcc6 data/c/tags/item/gears/gold.json 2cf7604c8d73785e4f42fb19ed5568b314d20bd0 data/c/tags/item/gears/steel.json 664ae3604ae07eb8b1e2c1c90e3511acee59e3d9 data/c/tags/item/gears/tin.json 808bb7e5d81f6fcef9142b9dadfb6f6e46d486a4 data/c/tags/item/gears/titanium.json -c8cdea680f3c970666a720a11f031497da99a865 data/c/tags/item/gems/lignite_coal.json 957b56ecb9a6e26ad9249617e9b085b9674952f5 data/c/tags/item/ingots.json 6ec1513b6a42c35e9c43d52edf1e8436589a7192 data/c/tags/item/ingots/aluminum.json 63ca0f8d674d12b8a8a2e21adccaaf25b5d10c80 data/c/tags/item/ingots/annealed_copper.json @@ -101,6 +100,7 @@ e046aef57e997662f481380a5172f35ab2872a70 data/c/tags/item/ingots/titanium.json 5a4b88a2821abe2fe070bf5aa4d9bc9adf6da0f7 data/c/tags/item/ingots/uranium.json e24af499ba94e0e77dbb0dba810748e6e87cd00c data/c/tags/item/ingots/uranium_235.json ba86e7faa3f30638fd906a82416219e7e3562e76 data/c/tags/item/ingots/uranium_238.json +c8cdea680f3c970666a720a11f031497da99a865 data/c/tags/item/lignite_coal.json 720039b244e7f4ab2e4991a0fb65636a6c3664ab data/c/tags/item/nuggets.json cb7eca92a40bf5a49967b14e14df92450beaccd8 data/c/tags/item/nuggets/aluminum.json 1533d4fca798e0ab12847067e5d0e8dca05a4858 data/c/tags/item/nuggets/annealed_copper.json @@ -336,7 +336,5 @@ e97d49d175079da46cd8502728969fb968b332cd data/minecraft/tags/item/foot_armor.jso 0b68cb2c76cb73825e68828347d3e8c6e7f455fd data/modern_industrialization/tags/item/fluid_pipes.json bcd1765d188d82343681c1699ca1e4e17d99dbcb data/modern_industrialization/tags/item/forge_hammer_tools.json a335e8b04f86283a098ffd9c05c12aba4408693d data/modern_industrialization/tags/item/item_pipes.json -acf5da4a6bab59d4560eb70220b35209b38343ca data/modern_industrialization/tags/item/me_wires.json -acbc6850b543565a80db8d5482f401cc7346059b data/modern_industrialization/tags/item/p2p_attunements/energy_p2p_tunnel.json 426e1f7cccffbc0433e739c56c50a4f7f9df55c1 data/modern_industrialization/tags/item/replicator_blacklist.json ed3e8137fcabedef6118d8d5980c348ad5ef1d22 data/modern_industrialization/tags/item/tanks.json diff --git a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f index 9de1d0859..4a6843af5 100644 --- a/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f +++ b/src/generated/resources/.cache/e0d3d0b8d9c807675613821fa865a35f707cd83f @@ -1,4 +1,4 @@ -// 1.21.1 2025-03-23T16:35:09.4918154 Data Maps +// 26.1-snapshot-4 2026-02-03T21:47:16.5700224 Data Maps 4a459ea7ee3c413c1109b66c982112121c3fd74c data/modern_industrialization/data_maps/fluid/fluid_fuels.json 8b10c857a5d13e25393c40f362f23c4f2e732c56 data/modern_industrialization/data_maps/item/item_pipe_upgrades.json 23379e394ae961cd4375daa6145cedb1ae9a9bc4 data/modern_industrialization/data_maps/item/item_tooltips.json diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index 53a9c3857..56b7293ad 100644 --- a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,72 +1,72 @@ -// 1.21.1 2024-12-05T23:39:31.2364576 Advancements -4ea45288747eba1d61d6e06d6051cbc8c1f0a9e2 data/modern_industrialization/advancement/advanced_upgrade.json -bc6735f8017c9807b1500f3acc69e8251dba6342 data/modern_industrialization/advancement/analog_circuit.json -5578a9b5aaa5456ceca1f14c61d4606ef776f777 data/modern_industrialization/advancement/assembler.json -b453b04d2ea951f2bd9e001a31b10ff06b6f49d3 data/modern_industrialization/advancement/basic_upgrade.json -f8a892475021ccdbd5594fb3c487c13e0bf5c55c data/modern_industrialization/advancement/blastproof_alloy_plate.json -831a4367cffd4983f7b7dee6e316ccda6fcbe221 data/modern_industrialization/advancement/bronze_compressor.json -e37453085590ee8fe74d0424b2245f15c7891445 data/modern_industrialization/advancement/bronze_furnace.json -81b55263562e72cfff7fdf595a7a1bbf5a70f587 data/modern_industrialization/advancement/bronze_macerator.json -fe126ed520171751395ccfaa1641d305419a8855 data/modern_industrialization/advancement/bronze_mixer.json -83c6a21bc4f5138e4c41f4141a6db57f91ef30b5 data/modern_industrialization/advancement/capacitor.json -09172717b0fcf94951a6ef98bb9d92731dffee7a data/modern_industrialization/advancement/centrifuge.json -a6b8745803c39b9ae56380081b829921d22bba1e data/modern_industrialization/advancement/chemical_reactor.json -78872da786144410a6116f6ba8731536f12c46a7 data/modern_industrialization/advancement/coke_oven.json -324b1197ae7972bd42ec3b70057e9a60eb2ad705 data/modern_industrialization/advancement/diesel_chainsaw.json -a99c0850de9e7307ceaa001f520a5a709a6dd4bb data/modern_industrialization/advancement/diesel_jetpack.json -3c9f2cc785e6786d06717c4d89202fd6ded5191b data/modern_industrialization/advancement/diesel_mining_drill.json -af4399a5b490da23850fe276534128d213e37554 data/modern_industrialization/advancement/digital_circuit.json -a0a405a952fa4b889b9dfc717be908ea2197cefb data/modern_industrialization/advancement/distillation_tower.json -c6898dce0e5d23eddc4cdeaf0995b9262bfe2f78 data/modern_industrialization/advancement/distillery.json -7f1fc54fc2fdc2df0aa6a5716c3d70eaeee144ae data/modern_industrialization/advancement/electric_blast_furnace.json -be3eb65d12b4e5cb0a50a0e922f73b9a2a33e7cf data/modern_industrialization/advancement/electric_quarry.json -0dcda713c1cce223e764d330c144468fbb23ab4a data/modern_industrialization/advancement/electrolyzer.json -511af6baee25f4a1f15963fd30e72498eb0b77a4 data/modern_industrialization/advancement/electronic_circuit.json -626372fd74d2e7ddb370f19a8e67a603d02126a8 data/modern_industrialization/advancement/fire_clay_bricks.json -d38931f736f1a671f5f169be7e75f9a0976520c7 data/modern_industrialization/advancement/forge_hammer.json -909b8d3262cc4fcbe20d39165f15c68f17949ccf data/modern_industrialization/advancement/fusion_reactor.json -e5538c3495e7cb3e36403e113e0d04bb45bed38b data/modern_industrialization/advancement/gravichestplate.json -b548ab3961c15b65e095a56f7d8c91d51fd2e4f3 data/modern_industrialization/advancement/guidebook.json -7f383de6faa23807946d2455bee3c44a78a68246 data/modern_industrialization/advancement/heat_exchanger.json -32b76424bae9bb8bd264737073b1e00c0b0bc4d4 data/modern_industrialization/advancement/highly_advanced_upgrade.json -63d5e38228b11fb28f0c59ac8a87581c0e6cd7b1 data/modern_industrialization/advancement/hv_diesel_generator.json -3f071f50f417ad26f4675ee01f0785213a77cde9 data/modern_industrialization/advancement/hv_steam_turbine.json -e598aafce6d0bab5660aff0c80fc6c2a4c2e3bbc data/modern_industrialization/advancement/implosion_compressor.json -b6c175625946025d0975a187d2bf400209acc396 data/modern_industrialization/advancement/inductor.json -93459f0695c5e142c16828e81758ba886e1d22b5 data/modern_industrialization/advancement/kanthal_coil.json -1ddcc069ce6d9d02331128fbcb8169753c1d2758 data/modern_industrialization/advancement/large_diesel_generator.json -def079b12e80428a58fa380faf78bdd3eae54a79 data/modern_industrialization/advancement/large_steam_boiler.json -61d61d0e5ce002ae9160a34008247e9a6a98abfd data/modern_industrialization/advancement/large_steam_turbine.json -1015cce35418d8ba238a0b157b8c0637ef31ee82 data/modern_industrialization/advancement/lv_steam_turbine.json -20491a5d07ff76dc1e2821569ca608892f674f01 data/modern_industrialization/advancement/mixed_ingot_iridium.json -0c4d5aca536d73bd9d0aee24e4878ada8e4edcf2 data/modern_industrialization/advancement/mv_diesel_generator.json -0bb759571c294185d29f89659ef41a75930fc33a data/modern_industrialization/advancement/mv_lv_transformer.json -a48ceed9e0a84f49ce2225a5d2338d1f10681a79 data/modern_industrialization/advancement/mv_steam_turbine.json -53f526d636c98026b416039455d18fd4e9e0c691 data/modern_industrialization/advancement/nuclear_reactor.json -434df2ef1a988be3ddca4289e34db813316868d3 data/modern_industrialization/advancement/nuke.json -d3c7a2fcef78a27e67c1524f4fea3a5de40d01c9 data/modern_industrialization/advancement/oil_drilling_rig.json -19fd1debb540dc8abe45183470f078ee814fee32 data/modern_industrialization/advancement/plasma_turbine.json -0d2858e14734331ffecfb779d387679e42cc3f61 data/modern_industrialization/advancement/polarizer.json -9804c15cc482352f42f69d00bac99d756effc7dc data/modern_industrialization/advancement/pressurizer.json -d26f1ca9dfa870e20a2c33ce6d9b4eeb944c16c7 data/modern_industrialization/advancement/processing_unit.json -79f477e2de4c21b9afbe09de4f87ff535809af66 data/modern_industrialization/advancement/quantum_chestplate.json -62de05d2430d1038100b15b70a41a0502976c242 data/modern_industrialization/advancement/quantum_circuit.json -1fe9273a228a24f56e97eb625cdb0e019074aa85 data/modern_industrialization/advancement/quantum_sword.json -26c461487d304ba0ccf11bbb709736fbd5a7b35b data/modern_industrialization/advancement/quantum_upgrade.json -e6dca367b895fa1b7ae7d8e10cf21fc1524d4ebd data/modern_industrialization/advancement/raw_iridium.json -3f9723c051e9fdb50cef98626d44d52ed434ab08 data/modern_industrialization/advancement/replicator.json -b97330b33cd878c3e9ca57d5b666d6df67611cab data/modern_industrialization/advancement/resistor.json -053ad00e2fd7505112e42e799ad518a77a9b621a data/modern_industrialization/advancement/singularity.json -c61448f45c323b3711a2dbb861a9b5b20ebacb2f data/modern_industrialization/advancement/stainless_steel_ingot.json -21fd7b522fdae0d1cf5775d2dae24a992de0335f data/modern_industrialization/advancement/steam_blast_furnace.json -030ea2e69e2b88ea9853e8dc56770e5639a12efa data/modern_industrialization/advancement/steam_mining_drill.json -0ad46076824ae119fe3cd594b952a600654a7de2 data/modern_industrialization/advancement/steam_quarry.json -6e3259698b61e9724cb3625e586364ceaf622ee3 data/modern_industrialization/advancement/steel_machine_casing.json -43ae1965889500ca69812c617ea5f5472545c8a8 data/modern_industrialization/advancement/steel_packer.json -d7ed5eb57647f45c59b2ef078435045111c9b0e2 data/modern_industrialization/advancement/steel_wiremill.json -261f20e32591ca7bd6424b9ced897ade45002da3 data/modern_industrialization/advancement/superconductor_cable.json -c24983b41c51d0057bc0689e125214dda3b5e941 data/modern_industrialization/advancement/titanium_ingot.json -205c3362df607e628f205d48fc1edda5a81d60c3 data/modern_industrialization/advancement/turbo_upgrade.json -e41c7983baab2d828fee3effdcd337a671292d53 data/modern_industrialization/advancement/used_steel_upgrade.json -2cb5a35d2226502627d12814c85ed363dac55566 data/modern_industrialization/advancement/uu_matter_bucket.json -ccd73782b5457863fde75dfbbf6391a8d1c0974d data/modern_industrialization/advancement/vacuum_freezer.json +// 26.1-snapshot-4 2026-02-03T21:47:16.5930245 Advancements +7bb8a483627ce50276f1bb8d95dd9731da8c5e3d data/modern_industrialization/advancement/advanced_upgrade.json +da822970cc0686181e66df13e525dbc5bc25040b data/modern_industrialization/advancement/analog_circuit.json +ed9e269d883e62e49362368a0b25de8961c2e405 data/modern_industrialization/advancement/assembler.json +8614dc0cd567797a6bb7a893c9f0333c793b7d12 data/modern_industrialization/advancement/basic_upgrade.json +021d812e866dd3bc9b65e30fce88135bf62a9660 data/modern_industrialization/advancement/blastproof_alloy_plate.json +06588f1ea7bd6db670ca24168b689776a86d0164 data/modern_industrialization/advancement/bronze_compressor.json +23e271b3e9fb7623000b95b03c43d149c749c144 data/modern_industrialization/advancement/bronze_furnace.json +eceab0244f652c3fdd90653de2d71e9d85828138 data/modern_industrialization/advancement/bronze_macerator.json +19f0308c0dad71a66532da3827819877af38779a data/modern_industrialization/advancement/bronze_mixer.json +4fac242980dbb3f7f0265c99b9fd6c78baba2b61 data/modern_industrialization/advancement/capacitor.json +36471dc27aacbd5917433ad9969178eafd9d04b1 data/modern_industrialization/advancement/centrifuge.json +bee2c926ff0363ce2028f8c1931d72aad47d98ff data/modern_industrialization/advancement/chemical_reactor.json +fcf10973e2b851c7bf98bfb2fafaae0d41300bbf data/modern_industrialization/advancement/coke_oven.json +065ad88f9d0f034ec1ea2e0bf3ff5aafb1e7450a data/modern_industrialization/advancement/diesel_chainsaw.json +37ee7e13cd645d650691a25ce3fb260cc6cc77a5 data/modern_industrialization/advancement/diesel_jetpack.json +2e8402b424c1ddab11acc6540f4f088b4a3e05a9 data/modern_industrialization/advancement/diesel_mining_drill.json +371c273ce66b7dfd01a700572d4e753f4fc63ffa data/modern_industrialization/advancement/digital_circuit.json +5e1b653039fa8984cd9daa94c696e2da68d50131 data/modern_industrialization/advancement/distillation_tower.json +12226fba3a4b8b8858c317b4a7dcab145d828670 data/modern_industrialization/advancement/distillery.json +d4e454cc37ba9ba15851a897d0f2649cd473b94a data/modern_industrialization/advancement/electric_blast_furnace.json +08ed8ee84a75c425b577673119a96a4df5390344 data/modern_industrialization/advancement/electric_quarry.json +4b75302dc1f9fe410cfcced185a9e00ca392cf39 data/modern_industrialization/advancement/electrolyzer.json +504a0357de1c7fc0d645eb13e92e2a6d58405e4b data/modern_industrialization/advancement/electronic_circuit.json +893fc7b3ea1cb00f89fb43789088d21fb0be8be3 data/modern_industrialization/advancement/fire_clay_bricks.json +60d043a0766de1efac997eacbef739d2fb13a951 data/modern_industrialization/advancement/forge_hammer.json +7053be666a3d1d0ba111d139f5d03c16eb8f4a47 data/modern_industrialization/advancement/fusion_reactor.json +b6e36e47ddf053efd31b3f08bdedf308a0055b1e data/modern_industrialization/advancement/gravichestplate.json +481c6ab809bff4b66fa63f2967a4f1fe98c67cd6 data/modern_industrialization/advancement/guidebook.json +41185e57406f93d011e3a382f627bfed4aada084 data/modern_industrialization/advancement/heat_exchanger.json +98e96ccc768035843593cac2c4cd33a11222f301 data/modern_industrialization/advancement/highly_advanced_upgrade.json +4a4f7e08b84b579540963bbf8887f499c4275c30 data/modern_industrialization/advancement/hv_diesel_generator.json +8f715f8c4c98f6c99dbb1f112c5c49bf32dc813d data/modern_industrialization/advancement/hv_steam_turbine.json +bf14e5a64f04f87613160937a0db430680edf73c data/modern_industrialization/advancement/implosion_compressor.json +94596f8c978e951d9a6b8190a99eead6c67fce7d data/modern_industrialization/advancement/inductor.json +0fe43ebe73f7db314ec8efdf9c161cbfaf2ee547 data/modern_industrialization/advancement/kanthal_coil.json +5c898a9f3674b5b591bac17920ccdf7bdd93ea23 data/modern_industrialization/advancement/large_diesel_generator.json +194d5ed6fe983b022f4f8fe536f731e213c2c640 data/modern_industrialization/advancement/large_steam_boiler.json +82038fe2c917d264ac0455dc27cecd4a7925fcc1 data/modern_industrialization/advancement/large_steam_turbine.json +a2705b23ec198919fce8ecefe745ad580c62028d data/modern_industrialization/advancement/lv_steam_turbine.json +153acdf8f23b6e1ed722c6cb92bd2baeece18d1e data/modern_industrialization/advancement/mixed_ingot_iridium.json +bfb670d26a7e04768f846093debbe612d3e45a62 data/modern_industrialization/advancement/mv_diesel_generator.json +6670242642eb21a0ff3fd466abe421560dbae447 data/modern_industrialization/advancement/mv_lv_transformer.json +acbd0aa3ecd26b51963d59a08d3596ab04cf0229 data/modern_industrialization/advancement/mv_steam_turbine.json +bb1f01a6e81f6d4a94d0fdceda035ac267f88d6d data/modern_industrialization/advancement/nuclear_reactor.json +cf5533b1306514b9116618e512efb42073f86c39 data/modern_industrialization/advancement/nuke.json +7cac7aee6f8be4166c0e5616492d7e52d4350a92 data/modern_industrialization/advancement/oil_drilling_rig.json +32d28365cf6723456f78597bb8bf42f07e4444c6 data/modern_industrialization/advancement/plasma_turbine.json +a54c6cf65925db3bf4893f35a2a175d25401b042 data/modern_industrialization/advancement/polarizer.json +58cf6852c3c47977646542251dd820fb29274d03 data/modern_industrialization/advancement/pressurizer.json +d3b626f354c009f54b6e63315b7735839731fe49 data/modern_industrialization/advancement/processing_unit.json +28cd91e638c4c4d76e3e27552026060ffd84693f data/modern_industrialization/advancement/quantum_chestplate.json +544ecea943471e1e30df1f0ff3ce83d12aba7fa3 data/modern_industrialization/advancement/quantum_circuit.json +758d152eb81a189c806d6da23adcbab1f106aaa0 data/modern_industrialization/advancement/quantum_sword.json +cc98528ff7383e79d1548db1e884f670c8ff4ed2 data/modern_industrialization/advancement/quantum_upgrade.json +840335f8ec009af2ef3ed95a0f6a422410cf475c data/modern_industrialization/advancement/raw_iridium.json +85c7c25a8a59750ae0a28aa62f185bf7f2e89ea9 data/modern_industrialization/advancement/replicator.json +0b947b09b64b6e6c15bc4b3de952819a069b72b5 data/modern_industrialization/advancement/resistor.json +d0d0b26cedd946f1aec2bd0873569b460c6da5fc data/modern_industrialization/advancement/singularity.json +9a452ddb7126265199b911806a574210bce58637 data/modern_industrialization/advancement/stainless_steel_ingot.json +ad967c2e7c64fe305e0e464b66cfcf8b24278b5e data/modern_industrialization/advancement/steam_blast_furnace.json +3b5a82fa7b6004c28c4327445a2470c5d4c93131 data/modern_industrialization/advancement/steam_mining_drill.json +70b133c6c66f3e03c2ca526b4f34243e2169a505 data/modern_industrialization/advancement/steam_quarry.json +c674edc7765f92279c12dd75db19b6e60584e7b2 data/modern_industrialization/advancement/steel_machine_casing.json +188541f2a0c79b4f9ec7246675d5b40009f78c1e data/modern_industrialization/advancement/steel_packer.json +7c7724d94cb23a9867edb10053ffe452e572a9fd data/modern_industrialization/advancement/steel_wiremill.json +4ee3d189c95eff3bd8bde620e4afb600e1589bab data/modern_industrialization/advancement/superconductor_cable.json +7551c581c1304e080de57e3f4364462143d6d65b data/modern_industrialization/advancement/titanium_ingot.json +88be7e793e2e35374c801a8d673d890efa1c0d92 data/modern_industrialization/advancement/turbo_upgrade.json +ed6bef43d7132d928814fd5f0876d3be9362824b data/modern_industrialization/advancement/used_steel_upgrade.json +942cdcc82b0002ecaa2ea5fced60a79f673a5470 data/modern_industrialization/advancement/uu_matter_bucket.json +a24838f5d619389dd73124e156fc46c00d30f9fe data/modern_industrialization/advancement/vacuum_freezer.json diff --git a/src/generated/resources/.cache/fc8bf4a66baae283d12c487b83f7aeaf806832e9 b/src/generated/resources/.cache/fc8bf4a66baae283d12c487b83f7aeaf806832e9 new file mode 100644 index 000000000..5591fc244 --- /dev/null +++ b/src/generated/resources/.cache/fc8bf4a66baae283d12c487b83f7aeaf806832e9 @@ -0,0 +1,1839 @@ +// 26.1-snapshot-4 2026-02-03T21:47:16.5710225 Model Definitions - modern_industrialization +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/acetylene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/acrylic_acid.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/acrylic_glue.json +fd20dcff2dd9754c2a158506f96e129a45a81f3a assets/modern_industrialization/blockstates/advanced_fluid_input_hatch.json +fd20dcff2dd9754c2a158506f96e129a45a81f3a assets/modern_industrialization/blockstates/advanced_fluid_output_hatch.json +8f60fc5ee6c16f7b1eb276ccea038661ef0ddf7b assets/modern_industrialization/blockstates/advanced_item_input_hatch.json +8f60fc5ee6c16f7b1eb276ccea038661ef0ddf7b assets/modern_industrialization/blockstates/advanced_item_output_hatch.json +4a3f80c3629c215a50624415c6a8289affef3410 assets/modern_industrialization/blockstates/advanced_large_steam_boiler.json +0a83f13d9fd0677fa5ebaf6b6337556fcfe50699 assets/modern_industrialization/blockstates/advanced_machine_casing.json +88cd5b171381fb8d79cdfc3abb3f41104bbf5300 assets/modern_industrialization/blockstates/advanced_machine_hull.json +240a603aff0f0a29fd5388905548990e830e907d assets/modern_industrialization/blockstates/aluminum_barrel.json +058a869c42494e6dcc67f50cb2204b65ec4f8795 assets/modern_industrialization/blockstates/aluminum_block.json +6644b502ee0eb1968a870fe5f21f93c3e6a755c5 assets/modern_industrialization/blockstates/aluminum_tank.json +d4e96713df60f59a612a7bf09b1a5cad797bbda1 assets/modern_industrialization/blockstates/annealed_copper_block.json +a3f6a63f8ce02359d00ec6c6948ff23b437c536c assets/modern_industrialization/blockstates/antimony_block.json +68020eb1b3a95c83d32df8205db49b9902f9060b assets/modern_industrialization/blockstates/antimony_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/argon.json +0c1acffcdcb913a47702b1de87be5d1c34f287c5 assets/modern_industrialization/blockstates/assembler.json +66362868004cf85b308cff31d8fdd670df2f8d91 assets/modern_industrialization/blockstates/basic_machine_hull.json +e41425b2b6a2c3166cef850f2d860c042b11ac88 assets/modern_industrialization/blockstates/battery_alloy_block.json +d7ce5010be744a9aeaf01725a3141edd6f44ba11 assets/modern_industrialization/blockstates/bauxite_block.json +0f6764933fe2d08de4d099a2e6fdc0805f2c136a assets/modern_industrialization/blockstates/bauxite_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/benzene.json +3e56f724a609223c7881979b71db0eb4b97dfe77 assets/modern_industrialization/blockstates/beryllium_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/biodiesel.json +85e9f2e3d6aff117def8e8dbe39a46c433e1bee2 assets/modern_industrialization/blockstates/blastproof_casing.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/boosted_diesel.json +e36756f184d9ce6edff025ccde5f74be4f8d0f30 assets/modern_industrialization/blockstates/bronze_barrel.json +c5b6051a3fb945aabbf49e59b26c1a659ac48fbc assets/modern_industrialization/blockstates/bronze_block.json +26e81d7e5a99a54428a667b13d00628a4fbd0fd6 assets/modern_industrialization/blockstates/bronze_boiler.json +ea1d44510a7b347b8522e2eeb54454ca827b4e4e assets/modern_industrialization/blockstates/bronze_compressor.json +5f1587235215574da69c52faf83b452204b22bd4 assets/modern_industrialization/blockstates/bronze_cutting_machine.json +f5e6501bfaedc1a4d3eddbadeddb748faae4e17c assets/modern_industrialization/blockstates/bronze_fluid_input_hatch.json +f5e6501bfaedc1a4d3eddbadeddb748faae4e17c assets/modern_industrialization/blockstates/bronze_fluid_output_hatch.json +f1cb00b5f1f336fd9bb51c10b589709792e118a8 assets/modern_industrialization/blockstates/bronze_furnace.json +c8c823ded3629e9ebd17300585fd8417f7fae32c assets/modern_industrialization/blockstates/bronze_item_input_hatch.json +c8c823ded3629e9ebd17300585fd8417f7fae32c assets/modern_industrialization/blockstates/bronze_item_output_hatch.json +2e0a2eb2c132e9e910e4e3ce1d7a593d32170247 assets/modern_industrialization/blockstates/bronze_macerator.json +b41d7c585c1372c0e9dd2be91109c2628f735512 assets/modern_industrialization/blockstates/bronze_machine_casing.json +5db5d1b148940739665ba7f55d4a272d8d4ec1fc assets/modern_industrialization/blockstates/bronze_machine_casing_pipe.json +e5ad8bdac9f7fae9ca78a5c8b1cee7084904b05d assets/modern_industrialization/blockstates/bronze_mixer.json +e265417a1a40ce606a9fc3e0dff80e7652bcd247 assets/modern_industrialization/blockstates/bronze_plated_bricks.json +7aa774f2420bd3567620a40e83fa6e815f040c2d assets/modern_industrialization/blockstates/bronze_tank.json +42a5f78b7ad30537c07a24d3f85896b016a4773e assets/modern_industrialization/blockstates/bronze_water_pump.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/butadiene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/caprolactam.json +676cf7ddcfdb3d7c8befee7d61a7a1c3e0e94c4d assets/modern_industrialization/blockstates/centrifuge.json +30af14923e1df8249a38a4d99642e9dc034b33bf assets/modern_industrialization/blockstates/chemical_reactor.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/chlorine.json +73df7405e233ea3563e30528ebe5c94b058b9c92 assets/modern_industrialization/blockstates/chromium_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/chromium_hydrochloric_solution.json +f10e9648d0980e6bfdab55e5c540fd3455f29877 assets/modern_industrialization/blockstates/clean_stainless_steel_machine_casing.json +9f78ccb0013400270aadebb0f6e8cc3adc84627e assets/modern_industrialization/blockstates/coke_block.json +8b917189e7099aa986e09ed42dd413bfb5f86a19 assets/modern_industrialization/blockstates/coke_oven.json +b33b21f6ec9960ce044d12c9d2c31e6960553f94 assets/modern_industrialization/blockstates/configurable_chest.json +e73063c6c5267807d9eee3beb3e5e63e3e9e94a6 assets/modern_industrialization/blockstates/configurable_tank.json +480d17dab3c8e13dfcb3f0e3ad8271313b2b3fdb assets/modern_industrialization/blockstates/creative_barrel.json +d844af5de22d29a34e4363c6de2068439ee279d6 assets/modern_industrialization/blockstates/creative_storage_unit.json +b140f2da7c0d93472916977b2e9cad6e6a023bb5 assets/modern_industrialization/blockstates/creative_tank.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/creosote.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/crude_oil.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/cryofluid.json +cb89fc0e141d8d8d75c4192cf39217eec5608747 assets/modern_industrialization/blockstates/cupronickel_block.json +52cb8e5cccf5120eb31a13ee8b94536bc7b2aa37 assets/modern_industrialization/blockstates/cupronickel_coil.json +f91953b7d843d7f51a7a05571a14269715b0a826 assets/modern_industrialization/blockstates/deepslate_antimony_ore.json +eec2f626d7d00ba580e1b620fac93cc0f1dff40e assets/modern_industrialization/blockstates/deepslate_bauxite_ore.json +2653d3ad0dc046ce2d45056fd874a671c7dd588b assets/modern_industrialization/blockstates/deepslate_lead_ore.json +d3b3b77c000017a6c8f6257a8dfabdc968b9d27a assets/modern_industrialization/blockstates/deepslate_lignite_coal_ore.json +8b116556bd333a8de1212dc319a10d1e0313151d assets/modern_industrialization/blockstates/deepslate_monazite_ore.json +a05a896eb0634121b416b353a13b17bbd58cec1f assets/modern_industrialization/blockstates/deepslate_nickel_ore.json +986a98b2f7f48b8edcf053c76006d9a264ec10fe assets/modern_industrialization/blockstates/deepslate_salt_ore.json +6d5e9caa66e91a176229e0ec92ff3abb4c52fd89 assets/modern_industrialization/blockstates/deepslate_tin_ore.json +bed42136fbb643f452e1c2c90213c5ffbef4622e assets/modern_industrialization/blockstates/deepslate_tungsten_ore.json +adeee32ede1f23fc8e5f09a131efa92afcdd86b8 assets/modern_industrialization/blockstates/deepslate_uranium_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/deuterium.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/diesel.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/diethyl_ether.json +e934dd1353aad690fdc558358db4dcca070a5933 assets/modern_industrialization/blockstates/distillation_tower.json +d53a22d8bcd05f691b3c21652c0efee3c21c4790 assets/modern_industrialization/blockstates/distillery.json +794b05966b8c3aa811087381b481ac71a85e5089 assets/modern_industrialization/blockstates/electric_blast_furnace.json +7486c3406c282ed52eaadf2be4f46afcd5d3a225 assets/modern_industrialization/blockstates/electric_compressor.json +1b8f476eccec45a09816e6164592bcc2a54627db assets/modern_industrialization/blockstates/electric_cutting_machine.json +2e6333b776b3362b00d63408949fea45631a0184 assets/modern_industrialization/blockstates/electric_furnace.json +d736be31e803257e834d93f54dc11266a6ae442f assets/modern_industrialization/blockstates/electric_macerator.json +298be57a8b5abdfe9f883d20e708a9b332a9e3f3 assets/modern_industrialization/blockstates/electric_mixer.json +b62af19c6bec5e9bf85e457a1b9f035c2bcda141 assets/modern_industrialization/blockstates/electric_packer.json +999df75d1177ac61f3136de41c4d5bbb3f3d2760 assets/modern_industrialization/blockstates/electric_quarry.json +1131fe60886395e8fc7b8fe9c7d981173e5fa1cd assets/modern_industrialization/blockstates/electric_unpacker.json +a55869f13ac848c51dbd70e9e1cdd39123ec76b6 assets/modern_industrialization/blockstates/electric_water_pump.json +cf7eea9896d3f3d7facfea92b7fb0340f7519ac7 assets/modern_industrialization/blockstates/electric_wiremill.json +54e13bd98ef2a15bec39f5160d7a73a8288b36f8 assets/modern_industrialization/blockstates/electrolyzer.json +8665f226b2e36420e780f5cfa77e2960a1f89f87 assets/modern_industrialization/blockstates/electrum_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/ethanol.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/ethylbenzene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/ethylene.json +0d0ffbd0f191ef1dc950addba88457215ba84f69 assets/modern_industrialization/blockstates/ev_energy_input_hatch.json +a5c7f3c290b3a84f77fb7a032e5f95c944c6da42 assets/modern_industrialization/blockstates/ev_energy_output_hatch.json +7fa9334390dc3afb2615cf8cf88577a4758a3e3d assets/modern_industrialization/blockstates/ev_hv_transformer.json +92fb3f553289b21c1c84343ad4ac565efe043e86 assets/modern_industrialization/blockstates/ev_storage_unit.json +2410c643c3b1644f660de51531d50885aabef806 assets/modern_industrialization/blockstates/ev_superconductor_transformer.json +519e186f4a213e70814c460d3d4aa6501c824dc0 assets/modern_industrialization/blockstates/fire_clay_bricks.json +80b8e70e20329dc99b31295c0981cc8e079c7c24 assets/modern_industrialization/blockstates/forge_hammer.json +451a5f64c6ada6d03aac6b187f9268d46d72a909 assets/modern_industrialization/blockstates/frostproof_machine_casing.json +627e8315f3ab1f7d079ca7a5f2ae1136fd7cfa42 assets/modern_industrialization/blockstates/fusion_chamber.json +ec964583f02cf618f428970fd808b466087ff63c assets/modern_industrialization/blockstates/fusion_reactor.json +238a6eaf807647a73f8d07e0eacd2d0781d393c7 assets/modern_industrialization/blockstates/heatproof_machine_casing.json +7c93c46be1c6bc7dc472f13ac736152546182221 assets/modern_industrialization/blockstates/heat_exchanger.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/heavy_fuel.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/heavy_water.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/heavy_water_steam.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/helium.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/helium_3.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/helium_plasma.json +0a9f42a68561f5f8db1df716467f01946ca8ceaa assets/modern_industrialization/blockstates/he_mox_block.json +cece964e6577967898ee618e52d843316358ff73 assets/modern_industrialization/blockstates/he_uranium_block.json +745027949dd829bfcf0cb4c095f2d7bd91d8cc16 assets/modern_industrialization/blockstates/highly_advanced_fluid_input_hatch.json +745027949dd829bfcf0cb4c095f2d7bd91d8cc16 assets/modern_industrialization/blockstates/highly_advanced_fluid_output_hatch.json +56d5fa96187a81a169af99a2da9aba6f98e4ff08 assets/modern_industrialization/blockstates/highly_advanced_item_input_hatch.json +56d5fa96187a81a169af99a2da9aba6f98e4ff08 assets/modern_industrialization/blockstates/highly_advanced_item_output_hatch.json +c59fec2c299e3cde48bc7b3de4e27633cee5162f assets/modern_industrialization/blockstates/highly_advanced_machine_casing.json +c2dc8162ae72029a71e0ce2af13f3689e2b7b7ce assets/modern_industrialization/blockstates/highly_advanced_machine_hull.json +07f123ae5545421fcdbc74eaefd5cfe06e01f3da assets/modern_industrialization/blockstates/high_pressure_advanced_large_steam_boiler.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_heavy_water.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_heavy_water_steam.json +07f123ae5545421fcdbc74eaefd5cfe06e01f3da assets/modern_industrialization/blockstates/high_pressure_large_steam_boiler.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_steam.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/high_pressure_water.json +206deeb7701527fae2cdc65072de1a91662e7078 assets/modern_industrialization/blockstates/hv_diesel_generator.json +de40ff3bdb0a9465f6f8fa78cd9c6e2445975f6d assets/modern_industrialization/blockstates/hv_energy_input_hatch.json +fefe323052b5abb53c22d6d3f94723e75f1d60cb assets/modern_industrialization/blockstates/hv_energy_output_hatch.json +4e097b064b74c87a649bf44d60654e1af8969b79 assets/modern_industrialization/blockstates/hv_ev_transformer.json +65b31199a6b66c200fcdb2c7ae2a2096a2dd37b8 assets/modern_industrialization/blockstates/hv_mv_transformer.json +ddad0e808164291ff3fd40be34665810a9544922 assets/modern_industrialization/blockstates/hv_steam_turbine.json +89a45f898c3f11b1d1a210cacc899f99ab3ba6c4 assets/modern_industrialization/blockstates/hv_storage_unit.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/hydrochloric_acid.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/hydrogen.json +b52284e3214972edc5cb7342d8c2655f443119b1 assets/modern_industrialization/blockstates/implosion_compressor.json +96ca92b0e5ec111d0da4519960effc54665cab87 assets/modern_industrialization/blockstates/industrial_tnt.json +4de098155d26e01071d4c0cd49360374de2b3bdd assets/modern_industrialization/blockstates/invar_block.json +026180b8d5da7b84692d557ff355d994f94949a7 assets/modern_industrialization/blockstates/iridium_block.json +ae3f625fcaec27c8dd08e16b15db98d143dd4865 assets/modern_industrialization/blockstates/iridium_machine_casing_pipe.json +3ec1dacd7170f183327a48f5df434331e78c5656 assets/modern_industrialization/blockstates/iridium_ore.json +d58b015f997c4f70ee0dd28a76f7cd4e131ae28b assets/modern_industrialization/blockstates/iron_barrel.json +3913c9842076a3d51a6fe9964226713f9cb8eda4 assets/modern_industrialization/blockstates/iron_tank.json +c7117a8418bd75d95449006530e8d54396fdc20b assets/modern_industrialization/blockstates/kanthal_block.json +2d97caa7b200f74d8bef0d9645de2340e27b9196 assets/modern_industrialization/blockstates/kanthal_coil.json +426a2b17d355e0c67fbcb27626c1422a3ff5a83a assets/modern_industrialization/blockstates/large_diesel_generator.json +4a3f80c3629c215a50624415c6a8289affef3410 assets/modern_industrialization/blockstates/large_steam_boiler.json +7a051091fd1ad6b001b34be20fb727b546986e89 assets/modern_industrialization/blockstates/large_steam_turbine.json +b9ffbf418ec24fd356ad8ab964696d3465799941 assets/modern_industrialization/blockstates/large_tank.json +d6300e7698a44aa1b768805d29edf9f1b8a30ccf assets/modern_industrialization/blockstates/large_tank_hatch.json +9ec43c37f4e20e16a7295b82e0cdb0c99772b0ca assets/modern_industrialization/blockstates/lead_block.json +734459b7a888863b8d24befd0eb1cfd15e45c1f0 assets/modern_industrialization/blockstates/lead_ore.json +517c9fe8f5d81dbdb0c4f4587648b95d75928f8e assets/modern_industrialization/blockstates/le_mox_block.json +b9bd79bfebe71380068560e3aadf3de896090819 assets/modern_industrialization/blockstates/le_uranium_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/light_fuel.json +12e0af7672fc1dcd1cade9ca017b66be8e68d64a assets/modern_industrialization/blockstates/lignite_coal_block.json +7b5ebdbd397d6d28c922494f3088f6645890ca72 assets/modern_industrialization/blockstates/lignite_coal_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/liquid_air.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/lubricant.json +efc9285444f6244380adf8f0a61acd662ced2297 assets/modern_industrialization/blockstates/lv_diesel_generator.json +5380b36e4b68ae85f66613272e7a7a79d886d7d6 assets/modern_industrialization/blockstates/lv_energy_input_hatch.json +3ac19350a1c37e1a72ddce49c7a91f05f3b000fd assets/modern_industrialization/blockstates/lv_energy_output_hatch.json +dfce9984fcfb10acaf55fdb86fc3cb764d4ece8c assets/modern_industrialization/blockstates/lv_mv_transformer.json +c3eb3d600d20ec102b30ded54cc464e2bd933049 assets/modern_industrialization/blockstates/lv_steam_turbine.json +fd96703e31cb46a0ef2942d2c2ce2f0f02e38800 assets/modern_industrialization/blockstates/lv_storage_unit.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/manganese_sulfuric_solution.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/methane.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/molten_redstone.json +33c1509f19bdd3c245eaeae5230d17a4d0735701 assets/modern_industrialization/blockstates/monazite_block.json +45532e044c145642f8ffeedf2bfe9daa91b32e29 assets/modern_industrialization/blockstates/monazite_ore.json +12e039d5f43730b15c0c92536bbd607f6a0cb6e0 assets/modern_industrialization/blockstates/mv_diesel_generator.json +8ef8b19c5a40ca1d6a46c603f88e18ae6078c2f0 assets/modern_industrialization/blockstates/mv_energy_input_hatch.json +64383565c9e343770d7945d374c8af5799359b07 assets/modern_industrialization/blockstates/mv_energy_output_hatch.json +9507f47cc66dba131209fe7a51aa0f8a21e4774b assets/modern_industrialization/blockstates/mv_hv_transformer.json +cc97d1aee23083a6e802d8236716a356d9d9085d assets/modern_industrialization/blockstates/mv_lv_transformer.json +964338e3a743d335ce45c2da2fb0c689d98dbcad assets/modern_industrialization/blockstates/mv_steam_turbine.json +1d1282628ec2b4e6d4efcc5e614bb1a28fb44f24 assets/modern_industrialization/blockstates/mv_storage_unit.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/naphtha.json +a0dc900cad0f510aa4e9552c9e177ef50de76ebb assets/modern_industrialization/blockstates/neodymium_block.json +28f69d2b4b234b3674726ea36119838261dda5a8 assets/modern_industrialization/blockstates/nickel_block.json +9d0875c29177dd67eae0855bdb9d26b7c2ec38d2 assets/modern_industrialization/blockstates/nickel_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/nitrogen.json +280d29021b7f0da1d787014c047912c91a4c6fac assets/modern_industrialization/blockstates/nuclear_alloy_machine_casing_pipe.json +040544242adac55040dda29ebd7292293eced64b assets/modern_industrialization/blockstates/nuclear_casing.json +90c8f7f4265ee8c15e060ce9dd5cbb4d1c244f5d assets/modern_industrialization/blockstates/nuclear_fluid_hatch.json +7d5e70d7dfbfae0a0d877c05e34e7f7a73f0f446 assets/modern_industrialization/blockstates/nuclear_item_hatch.json +baf37b176728ca4586109292ea61a20cb9c585df assets/modern_industrialization/blockstates/nuclear_reactor.json +2d4a45bc464096a106a817049045f421858fa55f assets/modern_industrialization/blockstates/nuke.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/nylon.json +eed86f4ae16ef46fea3cbbca29a2138c68b4753f assets/modern_industrialization/blockstates/oil_drilling_rig.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/oxygen.json +7a16c3c6556f22ebcacd40b6abde39dcdf019809 assets/modern_industrialization/blockstates/pipe.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/plant_oil.json +f908d12240aff610e40c93aa46d7d4f2c45bf83a assets/modern_industrialization/blockstates/plasma_handling_iridium_machine_casing.json +85a10ae754b5d8f09d3609ff0ab50b24895d7fec assets/modern_industrialization/blockstates/plasma_turbine.json +e5551cdf9167027fe4fc9896862a337b43218e54 assets/modern_industrialization/blockstates/platinum_block.json +bdf2146841ada242045c26005777b6ca2cc5a7eb assets/modern_industrialization/blockstates/platinum_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/platinum_sulfuric_solution.json +6ce087481e2317680b281758c06409e3e266c95a assets/modern_industrialization/blockstates/plutonium_block.json +a24df55feadcdc770ea0b144d75d3ae9ad5f45ca assets/modern_industrialization/blockstates/polarizer.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/polyethylene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/polyvinyl_chloride.json +5193a4ac9ef8ed50b30b81f84a08adfb8b66fa3f assets/modern_industrialization/blockstates/pressurizer.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/propene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/purified_platinum_sulfuric_solution.json +d560b9e2fd95c5ab7340b43e8ec0dae5a5a97a00 assets/modern_industrialization/blockstates/quantum_barrel.json +b9e060c55b15c3d4e14733722c34b701cc5c6f08 assets/modern_industrialization/blockstates/quantum_machine_casing.json +52c92f20078a2d0514a68e9a3be203aa617c5b6d assets/modern_industrialization/blockstates/quantum_machine_hull.json +8c78fced8ca50bcaea129891295c8bd4d85e687f assets/modern_industrialization/blockstates/quantum_tank.json +0749629bba4844283e50aaf0059f891c30067b3d assets/modern_industrialization/blockstates/quartz_ore.json +7aa4f78b678fce82d83d95dbd266321153430735 assets/modern_industrialization/blockstates/raw_antimony_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/raw_biodiesel.json +a70f0e412d3eef9426d9e0ae50fff24028042107 assets/modern_industrialization/blockstates/raw_iridium_block.json +365fa71ed9f058684b879e6dc71967869db523ca assets/modern_industrialization/blockstates/raw_lead_block.json +4be58e2109fca152c6222506dc16967b2e0298ce assets/modern_industrialization/blockstates/raw_nickel_block.json +7a979f086104848985c3419660fe5f63fcfc997d assets/modern_industrialization/blockstates/raw_platinum_block.json +e8a2b4b7bc3bb988fb2df8275efa5efad4746754 assets/modern_industrialization/blockstates/raw_silver_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/raw_synthetic_oil.json +571cbf480b0505cc9a478c1521460429a09f379a assets/modern_industrialization/blockstates/raw_tin_block.json +425bc138ba6af2d8dad86e7be2dc2c119bf4735c assets/modern_industrialization/blockstates/raw_titanium_block.json +b80ce42c84c51d0028daafce8b9e4d4f10449763 assets/modern_industrialization/blockstates/raw_tungsten_block.json +0e136645d51e0e2f6a92ff362d135f8df1f506fd assets/modern_industrialization/blockstates/raw_uranium_block.json +1a7cafa281bd05433ad2a5cf6bcc538d32d83f2d assets/modern_industrialization/blockstates/replicator.json +d30826303ba78c5311a0141a564da95674e05919 assets/modern_industrialization/blockstates/salt_block.json +8aef7f707cda847e7948b5913767fe7f18ebea20 assets/modern_industrialization/blockstates/salt_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/shale_oil.json +d8fd6528031bcaa4bd2a45473cecbd3e4a30c7e1 assets/modern_industrialization/blockstates/silicon_block.json +4e228ba30b6130d8878ddbf35a646dc8b64519ca assets/modern_industrialization/blockstates/silver_block.json +a49fad6a9216651b3eb64deacd78c2ae7d88793d assets/modern_industrialization/blockstates/sodium_block.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sodium_hydroxide.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/soldering_alloy.json +22618031fb61f3d39a5ba4aeab4d590dac7f9865 assets/modern_industrialization/blockstates/soldering_alloy_block.json +bf2ba60376bfc7d4fd91072433d81127964e61a7 assets/modern_industrialization/blockstates/solid_titanium_machine_casing.json +2263984323657174291c17d2d3e9fcdff08151a5 assets/modern_industrialization/blockstates/stainless_steel_barrel.json +58f4e5d869918fb2421c3d9ade517aa69d4a23e9 assets/modern_industrialization/blockstates/stainless_steel_block.json +30b4a9be573291df3028bbd5851b148f0bcf9525 assets/modern_industrialization/blockstates/stainless_steel_machine_casing_pipe.json +be2186885c7880937fb9616d5e2b6f3d987bc7c1 assets/modern_industrialization/blockstates/stainless_steel_tank.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam.json +a8d77d9979c03c4d8f3c987311c3ce3fc23b03ed assets/modern_industrialization/blockstates/steam_blast_furnace.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam_cracked_heavy_fuel.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam_cracked_light_fuel.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/steam_cracked_naphtha.json +141339abd53cc1442f0e37bbab382e73bb3823b3 assets/modern_industrialization/blockstates/steam_quarry.json +031b6584b62e3c9fcf30fcb89063b041bbf72402 assets/modern_industrialization/blockstates/steel_barrel.json +8c9ce0b90b0518b1d59709a7872b6b81117dc2da assets/modern_industrialization/blockstates/steel_block.json +572618c80d0e77ad48e7a556905e71ea04b2f925 assets/modern_industrialization/blockstates/steel_boiler.json +50ef827bcb24825a20a0cea1818d35d5fb8eb062 assets/modern_industrialization/blockstates/steel_compressor.json +61a6a2a392d8eb8be1298258936ecd43fe69b51c assets/modern_industrialization/blockstates/steel_cutting_machine.json +6e7d25810497206e6ab6f833cda70670e2f27238 assets/modern_industrialization/blockstates/steel_fluid_input_hatch.json +6e7d25810497206e6ab6f833cda70670e2f27238 assets/modern_industrialization/blockstates/steel_fluid_output_hatch.json +c8bf9ad1df12417924e9333ea8b8a571cfebdf37 assets/modern_industrialization/blockstates/steel_furnace.json +8896160f16ec0e5dbad11956657ff4f0c597f142 assets/modern_industrialization/blockstates/steel_item_input_hatch.json +8896160f16ec0e5dbad11956657ff4f0c597f142 assets/modern_industrialization/blockstates/steel_item_output_hatch.json +de28760042c8f6286f90a3d2db6f93b48708ee3e assets/modern_industrialization/blockstates/steel_macerator.json +c08c264ee0f22b2b01a050dd89b9c65c7cc29c63 assets/modern_industrialization/blockstates/steel_machine_casing.json +9955648f3865218526757c250ed715b658065b1c assets/modern_industrialization/blockstates/steel_machine_casing_pipe.json +15a9aa3b1a4d929140bfbcb633a369584e83fe03 assets/modern_industrialization/blockstates/steel_mixer.json +6f35f2b3866670aaee63ee8097b50487245dde08 assets/modern_industrialization/blockstates/steel_packer.json +a32086d8ab0e801c67ca08b3fae34ed05f38e970 assets/modern_industrialization/blockstates/steel_tank.json +850ff08a39165fda6e3d1da0a7d8ae7c7eec38fa assets/modern_industrialization/blockstates/steel_unpacker.json +55c6f64040e49707b12ae6b897c96730419da934 assets/modern_industrialization/blockstates/steel_water_pump.json +b5c8c84da176328199f5206ef2f6bd80c2841a9c assets/modern_industrialization/blockstates/steel_wiremill.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/styrene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/styrene_butadiene.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/styrene_butadiene_rubber.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sugar_solution.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_acid.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_crude_oil.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_heavy_fuel.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_light_fuel.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/sulfuric_naphtha.json +f63cdf1d62df750445f95e6b2e9622485805e8c0 assets/modern_industrialization/blockstates/sulfur_block.json +1faf71f9a44dc734b05792764e4e67103b34c685 assets/modern_industrialization/blockstates/superconductor_coil.json +a8af54a397024b864bdafb8c7fb20d75a9a5e5ea assets/modern_industrialization/blockstates/superconductor_energy_input_hatch.json +8cc854847424ca5ad60031758255f4d0f138973e assets/modern_industrialization/blockstates/superconductor_energy_output_hatch.json +f2611016d5cb077c08f5a11e047e4b1c06fcb5f0 assets/modern_industrialization/blockstates/superconductor_ev_transformer.json +42a30708f958f9647b1f2b9467eab1f4b908ac2f assets/modern_industrialization/blockstates/superconductor_storage_unit.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/synthetic_oil.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/synthetic_rubber.json +26c3a3c0fb5d2728212ae313b0975b37e9bd60c0 assets/modern_industrialization/blockstates/tin_block.json +7cecba7050191f0dfdad8e48bd1a0df28964f3a6 assets/modern_industrialization/blockstates/tin_ore.json +155e52a5bd64b52206586138867c586b40cec119 assets/modern_industrialization/blockstates/titanium_barrel.json +f0a5d40d3c51b2af064f04246b9304e4eacd0483 assets/modern_industrialization/blockstates/titanium_block.json +20e8405426b63129b35133a5477f8e508d89e155 assets/modern_industrialization/blockstates/titanium_machine_casing_pipe.json +ec864200a9016d3908a4dcccd1100cc86b8b200d assets/modern_industrialization/blockstates/titanium_ore.json +9e54e4a82a65c10ceccf0c333a46c2f4ba3b8fd0 assets/modern_industrialization/blockstates/titanium_tank.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/toluene.json +7ed4504fb8c5d81aee6a5cfd595fcd4ca85d7837 assets/modern_industrialization/blockstates/trash_can.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/tritium.json +d381b163a238f54d2be3fa3d50b10798819bce4b assets/modern_industrialization/blockstates/tungsten_block.json +0e7b7a2bef3877298780818e557d927874a3c67a assets/modern_industrialization/blockstates/tungsten_ore.json +ca7b14c0cc2efadf2b5a4824e534daad9f87fe47 assets/modern_industrialization/blockstates/turbo_fluid_input_hatch.json +ca7b14c0cc2efadf2b5a4824e534daad9f87fe47 assets/modern_industrialization/blockstates/turbo_fluid_output_hatch.json +f714df9e8462bbf1befd6487b9fc07778c6ee862 assets/modern_industrialization/blockstates/turbo_item_input_hatch.json +f714df9e8462bbf1befd6487b9fc07778c6ee862 assets/modern_industrialization/blockstates/turbo_item_output_hatch.json +520126526322e5ba7b647736677b792899952810 assets/modern_industrialization/blockstates/turbo_machine_casing.json +4bc94827a2d42251fbf586ac0c7dc041019aa6ff assets/modern_industrialization/blockstates/turbo_machine_hull.json +76acc758dae161d8bd5a0a837d341ccccb8bf46c assets/modern_industrialization/blockstates/uranium_235_block.json +6822e6755c6acd3e5586ca6da0845aced7a2e80d assets/modern_industrialization/blockstates/uranium_238_block.json +8508f67c9ed13a4f4769ba69ee5c548e7708235b assets/modern_industrialization/blockstates/uranium_block.json +70028b8a955f3d666e6150edd39f20fcf91e9d03 assets/modern_industrialization/blockstates/uranium_ore.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/uu_matter.json +2bf0b635003f6da7595b5d65449dc7fc194f0a36 assets/modern_industrialization/blockstates/vacuum_freezer.json +3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/modern_industrialization/blockstates/vinyl_chloride.json +34095e037d403e4e3aaaf168f7d9d8d0b1a8a0f8 assets/modern_industrialization/blockstates/yttrium_block.json +39dff7ea682e402d2357a13fcd7e10ddaa26e3b3 assets/modern_industrialization/items/acetylene_bucket.json +22c2142535698913c1d0fc67166c6059123f390a assets/modern_industrialization/items/acrylic_acid_bucket.json +e068c6a35de2c6318b501038767615a07dc8a16e assets/modern_industrialization/items/acrylic_glue_bucket.json +ccd516c29eeffae6cec9071cb21ce8a3fb82c45d assets/modern_industrialization/items/advanced_fluid_input_hatch.json +e5e4c84336de4f67f4e6ea57eadb024220482cb4 assets/modern_industrialization/items/advanced_fluid_output_hatch.json +38a4391eb80c39060a46e90c8969600c02712a33 assets/modern_industrialization/items/advanced_item_input_hatch.json +5772e809dbbb4c734779715731dfb167d70b1067 assets/modern_industrialization/items/advanced_item_output_hatch.json +7edc481404412d8591c2cd1eff4434479a2d3841 assets/modern_industrialization/items/advanced_large_steam_boiler.json +69c8f8d2271632b55f4833fcbb76d0424484004c assets/modern_industrialization/items/advanced_machine_casing.json +ef4e35a3b1ac42f9439ff805a24e3d85b762dcd5 assets/modern_industrialization/items/advanced_machine_hull.json +52415f232594fbeade27b75a93f37690d9eb096b assets/modern_industrialization/items/advanced_motor.json +c10c6c5b21dba8909d65db82eed388cadaaf4b0a assets/modern_industrialization/items/advanced_pump.json +ad7993d3858ccc9225c19ea50895c0334a198745 assets/modern_industrialization/items/advanced_upgrade.json +b544d00f553f46e89774c3ec6c4f538ae520b47c assets/modern_industrialization/items/air_intake.json +74f91bc567586896906b0b3300643b893d7b287a assets/modern_industrialization/items/aluminum_barrel.json +08e8a7f7dfb6800df691991f680efa89b3f26f90 assets/modern_industrialization/items/aluminum_blade.json +f54d188ded67765f7da4c28e7b023046a4f66d18 assets/modern_industrialization/items/aluminum_block.json +7e9cc3b17068689d9d3c4dec57902ae394304e7d assets/modern_industrialization/items/aluminum_bolt.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/aluminum_cable.json +f538722bd94ec6c5749dbac78f82a92ef3f1ec08 assets/modern_industrialization/items/aluminum_curved_plate.json +1ae1ea888f79ab7fefddc945a0931874f91a9d4d assets/modern_industrialization/items/aluminum_double_ingot.json +27723163e9aba98bcf6e6f1483835a7c2186a9f7 assets/modern_industrialization/items/aluminum_drill.json +a1059588dfa1a8bea653f9bffcf93f21ba1e1565 assets/modern_industrialization/items/aluminum_drill_head.json +272b283900cff21c184a22622ae937776a6a2df6 assets/modern_industrialization/items/aluminum_dust.json +87563dca6eede078ccdec916218085c29e60cc06 assets/modern_industrialization/items/aluminum_gear.json +b22ed5a9ef15208278339200573ce0f11661d43c assets/modern_industrialization/items/aluminum_ingot.json +24da7c683462fc236e7c2e29a4c15dcf1b13191f assets/modern_industrialization/items/aluminum_large_plate.json +0b287ce70b390b6451fedb1357769a24ce6740a1 assets/modern_industrialization/items/aluminum_nugget.json +cc0b543ae43344bf494610549898699faecc0ac0 assets/modern_industrialization/items/aluminum_plate.json +07efa03d19fc4c46e546eef599b68b2eae663690 assets/modern_industrialization/items/aluminum_ring.json +9758861d10ecc87f72be6f7eba82ca333284b99b assets/modern_industrialization/items/aluminum_rod.json +5e1e66316152b8b9e3ff7eeee1ee692f1a37dbb7 assets/modern_industrialization/items/aluminum_rotor.json +690b46dd047791278d3c040c3cdf808902783a25 assets/modern_industrialization/items/aluminum_tank.json +717c6ebc9f1c5d2093aeed5e84175e583df20a0c assets/modern_industrialization/items/aluminum_tiny_dust.json +52faf9311a30bfb7761732abd57282946b2fbff4 assets/modern_industrialization/items/aluminum_wire.json +fb1c9390bffae3cbe0f1cff2c691d3e1555c5229 assets/modern_industrialization/items/analog_circuit.json +bf66c532e3d2e42f2e6f78a1edab45f6cc911e86 assets/modern_industrialization/items/analog_circuit_board.json +2627cd7cf98fe13b88f3fb790d7b6a15da9d63a4 assets/modern_industrialization/items/and_gate.json +fb469db76812f0d2319df861ad533887566d002e assets/modern_industrialization/items/annealed_copper_block.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/annealed_copper_cable.json +3b3f971e4dc911e45853ae4e455528e1062b839d assets/modern_industrialization/items/annealed_copper_double_ingot.json +1924875911cb58fb558086152960a7163c676778 assets/modern_industrialization/items/annealed_copper_dust.json +1e7096e0a3765b54fcc3963b9385ab85a328a45a assets/modern_industrialization/items/annealed_copper_hot_ingot.json +bed28e24fd08e7a29703b7dddcffdd6507240d22 assets/modern_industrialization/items/annealed_copper_ingot.json +bfe027275339b0a9261a3bc285e148c457aecb54 assets/modern_industrialization/items/annealed_copper_nugget.json +f6f7aab16ccab2b368634d4242ac3b413b966157 assets/modern_industrialization/items/annealed_copper_plate.json +121fccfd5c5ac95a3aebe37a16f6dce201305b7c assets/modern_industrialization/items/annealed_copper_tiny_dust.json +f957a957057f5bb0b64fa845c180434112b0d104 assets/modern_industrialization/items/annealed_copper_wire.json +4f5ec6923f4a3a92ff566c663b3826dfa9350667 assets/modern_industrialization/items/antimony_block.json +e0ac25f6cbfe3aa61e012daf1392b8b2e26f041d assets/modern_industrialization/items/antimony_dust.json +8bb2618fad2b26be7b6184a93cec4ee0a2bbd031 assets/modern_industrialization/items/antimony_ingot.json +b708ae47d19ad916778565a3c799cc4aab6eb504 assets/modern_industrialization/items/antimony_nugget.json +82d3503fc10315edbff9033be0e035de7731debf assets/modern_industrialization/items/antimony_ore.json +8c6a3d19d42ed3eecc0327fb5839cc9d301a526d assets/modern_industrialization/items/antimony_tiny_dust.json +638104af8d9d61bdfc5c9ed41219a2835eada81f assets/modern_industrialization/items/argon_bucket.json +81ea2a54da80864fd9a98a3c5fb8a700f5922a33 assets/modern_industrialization/items/arithmetic_logic_unit.json +e545f19783e214ac4bb0e6bc7f282bfd46fbd534 assets/modern_industrialization/items/assembler.json +07c72c9124b36ff39c79dfefdd8eef2f4df212b5 assets/modern_industrialization/items/basic_machine_hull.json +8f4488c55eb4439e10a69db1d42ce89782290601 assets/modern_industrialization/items/basic_upgrade.json +2901d2af68a31cbbe2eae534d7a7b73d98b15634 assets/modern_industrialization/items/battery_alloy_block.json +d762ad4aeba541c345978b2c6d0bd292ebbd109c assets/modern_industrialization/items/battery_alloy_curved_plate.json +3f70b9f0a1d137ba0a349264a91dd5a5da18543c assets/modern_industrialization/items/battery_alloy_double_ingot.json +3a59821919ec98a88d0a0049a7d54c40d677181c assets/modern_industrialization/items/battery_alloy_dust.json +5fd3a1eeda8bb0dc5dd25c7c912630c3b8860c9b assets/modern_industrialization/items/battery_alloy_ingot.json +c344c060789bfa260f6bec3bbe7a5eb083008eaa assets/modern_industrialization/items/battery_alloy_nugget.json +07b8c232bd5744af8f16a9194367992b2b430212 assets/modern_industrialization/items/battery_alloy_plate.json +0325b035a4d850c2fdb070dfafde160633ab4e93 assets/modern_industrialization/items/battery_alloy_tiny_dust.json +2e0b33c1112eea90926ac36b829a668233b47a24 assets/modern_industrialization/items/bauxite_block.json +9798d2c6efec5e0690ec6e5cd97d314cb29ca9c5 assets/modern_industrialization/items/bauxite_crushed_dust.json +1e6b23ae0de0aac160ab418d0218e7c0f7a08c00 assets/modern_industrialization/items/bauxite_dust.json +beffe8d955c03f2c762f2a6775cf9731dc15e2c7 assets/modern_industrialization/items/bauxite_ore.json +f9e47a9041c0fdbd49deb52da7eb4300be91024e assets/modern_industrialization/items/bauxite_tiny_dust.json +17d4a8e1ab2128e60fa8d36e390b9d56e9ec29e5 assets/modern_industrialization/items/benzene_bucket.json +45299078080cfa6cdd7d60ca56d4737f55d8baf4 assets/modern_industrialization/items/beryllium_block.json +96209cc5c055b54274a07b239ecb282a55f3799c assets/modern_industrialization/items/beryllium_double_ingot.json +723353808cb470469b15950c1ce678ea0e052544 assets/modern_industrialization/items/beryllium_dust.json +3ae7b0a2ce13672eb03c9ba90a528974ab834ec2 assets/modern_industrialization/items/beryllium_ingot.json +8e4555d43b3a28d41f131b9747608ddeee6332f2 assets/modern_industrialization/items/beryllium_nugget.json +4e34db2ef663787314f33aa6484f7263245c4e21 assets/modern_industrialization/items/beryllium_plate.json +c1003107218fb3a3e310abe403a9cd1a8c824ec8 assets/modern_industrialization/items/beryllium_tiny_dust.json +037787468f3f48246a941249edd447595c850353 assets/modern_industrialization/items/biodiesel_bucket.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/black_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/black_item_pipe.json +67ef93a66c07305e6b52b8343540f8e5202bad72 assets/modern_industrialization/items/blastproof_alloy_curved_plate.json +e9bdb84e7233c9138999413280f4288e54100b7a assets/modern_industrialization/items/blastproof_alloy_ingot.json +eb6dd3e650cd4ec3417fbb92e1db03e9ce0fbe6f assets/modern_industrialization/items/blastproof_alloy_large_plate.json +9795d0138da18f472aec4a56988999fd1e2c36da assets/modern_industrialization/items/blastproof_alloy_plate.json +a4d65a73aa1f23114bcb09f13f97f43390999f76 assets/modern_industrialization/items/blastproof_casing.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/blue_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/blue_item_pipe.json +d882c532afca401b6c1cc43ece5416e730705f79 assets/modern_industrialization/items/boosted_diesel_bucket.json +fe3776bb286ea9bc98c61b40e6d434c5fdb69237 assets/modern_industrialization/items/brick_dust.json +4bbd2aa6dcf1aea1141694748a2e33b4dc4f3691 assets/modern_industrialization/items/brick_tiny_dust.json +19fa95fe9197c04ac0b6864394a76135faa27e76 assets/modern_industrialization/items/bronze_barrel.json +97d62abcb5fda2f6806086ddc039c0ed555f5889 assets/modern_industrialization/items/bronze_blade.json +528f522e01a02718e4b352b79a965db8a3c09743 assets/modern_industrialization/items/bronze_block.json +47a9a2d6c94b670f7138478582ee32a693911fae assets/modern_industrialization/items/bronze_boiler.json +0f9f22f7b7474e1a83c8f05b2e27a7bd2a4cdfc5 assets/modern_industrialization/items/bronze_bolt.json +ce03a760b35524ef233fcb9cb60b492a339a6a5e assets/modern_industrialization/items/bronze_compressor.json +d816043b5f949a69ae4c14af54f7526eb1dde868 assets/modern_industrialization/items/bronze_curved_plate.json +d2a0f3dac10855891224ebcca276eef176e5785b assets/modern_industrialization/items/bronze_cutting_machine.json +c4157a55225e3ebb2a9571aba5c52aac79d5f786 assets/modern_industrialization/items/bronze_double_ingot.json +154dea3cf4820c451d9f41c873f4760bb96d41bb assets/modern_industrialization/items/bronze_drill.json +3bb8c9faa496877090e546ccdcd438009e52acf3 assets/modern_industrialization/items/bronze_drill_head.json +64e7a62c51d0eba26286100ae8f3b7dfbffde8dd assets/modern_industrialization/items/bronze_dust.json +1a61c2f7c5376c1e0b474e78c99723a87c5657b8 assets/modern_industrialization/items/bronze_fluid_input_hatch.json +535bf15d695963e2905fecde716f89b287feaf04 assets/modern_industrialization/items/bronze_fluid_output_hatch.json +89c366a76d9b979d9583a74eb9b0fc349fac326a assets/modern_industrialization/items/bronze_furnace.json +da65e0cb5b78c2946a07bdade20ba6d47e902c97 assets/modern_industrialization/items/bronze_gear.json +4c6e34b0df5a8ec8de645e4535874b7d1c03aa37 assets/modern_industrialization/items/bronze_ingot.json +ee84fef45b280024b4a7a5f7169b6300e4c6655b assets/modern_industrialization/items/bronze_item_input_hatch.json +1e5123654bf41284299a8eb478153a2303e4ca4d assets/modern_industrialization/items/bronze_item_output_hatch.json +e922f2608535dc865bd4b5ce836225ecc857908b assets/modern_industrialization/items/bronze_macerator.json +ed7317766893741d2af59617d41df1d12d3df274 assets/modern_industrialization/items/bronze_machine_casing.json +acbb2f39568a7b551e2a3c6e315d5d148b7b1fbb assets/modern_industrialization/items/bronze_machine_casing_pipe.json +ad7c1aeae81165d91d9c84caf4414a51f64ffb79 assets/modern_industrialization/items/bronze_mixer.json +e0d5ea94fb464adcfb644973af0363c3067df4ea assets/modern_industrialization/items/bronze_nugget.json +cd3b7987199e8b31a750a89b9a91c822f8babd43 assets/modern_industrialization/items/bronze_plate.json +756a004e0982adf3124c6257137f965d374eb78d assets/modern_industrialization/items/bronze_plated_bricks.json +e0678fb9405940a75d4260204a1fdac7094292ae assets/modern_industrialization/items/bronze_ring.json +c361f82a3db6bf4f3204fea7ade719e068573e35 assets/modern_industrialization/items/bronze_rod.json +611bb2c98df5a51ac13907bbbd0115f97ee68a29 assets/modern_industrialization/items/bronze_rotor.json +7680f748916671c6179a2b69a057276a759b1444 assets/modern_industrialization/items/bronze_tank.json +685cd0d10bc6de860ca111a7e6fed8195c1f2e6d assets/modern_industrialization/items/bronze_tiny_dust.json +c72b9f80f07518fe50859b8f95651f823e561b51 assets/modern_industrialization/items/bronze_water_pump.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/brown_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/brown_item_pipe.json +1ce814b771aa762ced7e8f036c1b0827b4f16fa9 assets/modern_industrialization/items/butadiene_bucket.json +d3b2afe6137876b4d55e542e1f35436fe0c510f9 assets/modern_industrialization/items/cadmium_battery.json +bafb1f73792eb0ba583a524ad827fd683ae9cd8b assets/modern_industrialization/items/cadmium_control_rod.json +dcbd2308c12457a2042283429b31233d60e8ada8 assets/modern_industrialization/items/cadmium_double_ingot.json +b5a46ad0c0d0a4502ed28c5cefc3e9cfdb744704 assets/modern_industrialization/items/cadmium_dust.json +014378339e887eed058c0067abb3822392f6f6f0 assets/modern_industrialization/items/cadmium_ingot.json +bfe04af4b0e0c55b7c233be0dfe33486b693442d assets/modern_industrialization/items/cadmium_plate.json +763a7ea698e5cf87612040e3ddf57e4aa47524f3 assets/modern_industrialization/items/cadmium_rod.json +85ac5f4f88e185327634adb0fa8f3395c0c57eb2 assets/modern_industrialization/items/cadmium_tiny_dust.json +1d15da6d8bc100a5fea3f305beaddc2b7f765783 assets/modern_industrialization/items/capacitor.json +21b5ea343a52cadbcfcd7441c6c88ec00513a186 assets/modern_industrialization/items/caprolactam_bucket.json +f1e0fbefba56ed19a97c2ae195d97bc56eaf67f2 assets/modern_industrialization/items/carbon_dust.json +accc514bceddc310228d66d7dac39120271ff277 assets/modern_industrialization/items/carbon_large_plate.json +37ae3617bbbb68aaf62a26b60828f7dff0f16669 assets/modern_industrialization/items/carbon_plate.json +6582d8c6864eaf9a03cbaf3ed7b78eb7192898ac assets/modern_industrialization/items/carbon_tiny_dust.json +21abb6408b43bbb32fe65b6f10599dce8f78d241 assets/modern_industrialization/items/centrifuge.json +31d9d0592f1669c3c26dd5722a16c73bb4ecccb9 assets/modern_industrialization/items/chemical_reactor.json +2f5f537aa7cbbd258bc5b8074ede617dfb23b56f assets/modern_industrialization/items/chlorine_bucket.json +619a54ec320bdbb359d43c954c6bbb48e4b3c6bb assets/modern_industrialization/items/chromium_block.json +26478326fb10db3aa4e05b66445328f797019a1e assets/modern_industrialization/items/chromium_crushed_dust.json +417030a64ae672bf0b494e02b9b18bb90f5b7632 assets/modern_industrialization/items/chromium_double_ingot.json +d4e6365d6c9671e03e756dd4c5f14ce32ddd47e3 assets/modern_industrialization/items/chromium_dust.json +beab43d15415b4adb9564379e4f5ed55be22fddd assets/modern_industrialization/items/chromium_hot_ingot.json +d5d26789ed145a147b934a6c1924fac153de429f assets/modern_industrialization/items/chromium_hydrochloric_solution_bucket.json +d4097285c2a1f9be622d0f22b0e3512a0c8e4bb7 assets/modern_industrialization/items/chromium_ingot.json +36a97cde0feca4976d7ff7b562fe6fb7bb00819e assets/modern_industrialization/items/chromium_nugget.json +4f62849dd843185b30e57432f84e23a0ecd3ebdc assets/modern_industrialization/items/chromium_plate.json +0ccceb02e13687de101fd45028fc6a08875cac13 assets/modern_industrialization/items/chromium_tiny_dust.json +eae46e1a59ffbcf088286d72df02941780809458 assets/modern_industrialization/items/clean_stainless_steel_machine_casing.json +bf496720ed6a7c19a332abe647510ba37d1b9f6c assets/modern_industrialization/items/coal_crushed_dust.json +99b61b33bafba67ae2cef3a2883f1afedbaeebaf assets/modern_industrialization/items/coal_dust.json +8f682f766ab89ed8d11a0338ae899ba24493e9de assets/modern_industrialization/items/coal_tiny_dust.json +41d88a17df244730a88fa5d7043b4b0c4fe7ecdd assets/modern_industrialization/items/coke.json +6f117fc5e2abe262391a26f7a600352f695632dc assets/modern_industrialization/items/coke_block.json +f78bba4d67407c9a99d5698afcc9770625d3f608 assets/modern_industrialization/items/coke_dust.json +044142f63d96c529f4448ac90d62e735364a3f8b assets/modern_industrialization/items/coke_oven.json +51689ac8b06229d7d41632cbb56d2f59c41d93c4 assets/modern_industrialization/items/configurable_chest.json +015b0907f4d8c42c904c9a0251eb9eb7ca5fe347 assets/modern_industrialization/items/configurable_tank.json +ad91a4d88e38e9c52fc4fae52ae771caa2b4d4c6 assets/modern_industrialization/items/config_card.json +dbb38007325d008540941f10474f311a364a2479 assets/modern_industrialization/items/conveyor.json +90ab9bd22d544b0efa414146ac028972e4d07a31 assets/modern_industrialization/items/cooling_cell.json +c50288c8290a6ef739b73ac11ee02bfd6e4ddd78 assets/modern_industrialization/items/copper_blade.json +6695065610572733c57ff1b09bfcfece2fa47d3a assets/modern_industrialization/items/copper_bolt.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/copper_cable.json +5c5083e51fe05136dd1280b313a1f0b2a4afd81d assets/modern_industrialization/items/copper_curved_plate.json +5a6903c8a3e3864cf45791379a088ae356e530ca assets/modern_industrialization/items/copper_double_ingot.json +eb9bb8c1ab92a4363e15a9a552b9d192129e1aa8 assets/modern_industrialization/items/copper_drill.json +d8ee2e958f777cf01dad84c29474372d6d2bb31b assets/modern_industrialization/items/copper_drill_head.json +e4f0ebc17009822202d18066a5e1cd936f0b1b2a assets/modern_industrialization/items/copper_dust.json +3421aa48a3e4baa31fba4c79636fcc8287ade3b7 assets/modern_industrialization/items/copper_fine_wire.json +e43b63cdd8916cc4838dcbb1ecbe643478fa6987 assets/modern_industrialization/items/copper_gear.json +98935b8da84a7ec2749560388ecc47a5649d3110 assets/modern_industrialization/items/copper_nugget.json +c961f7c1ac493e18b8897a710ac2d5ba57ec7dae assets/modern_industrialization/items/copper_plate.json +047dea61bf6e4bfc7673bd916331715db9bb8f7e assets/modern_industrialization/items/copper_ring.json +2ebb838ff7748986c22323acd7c2495a109d6749 assets/modern_industrialization/items/copper_rod.json +14c44c02e89b153e4bbf8e04aefb32446c99b027 assets/modern_industrialization/items/copper_rotor.json +dcd888b1eccf6eb74935182694c037cd84cafa43 assets/modern_industrialization/items/copper_tiny_dust.json +0cc803ff615d13a56ae989b0eba46f622dbee1ec assets/modern_industrialization/items/copper_wire.json +4091caa1770c87c1aac8008da1f1c1d23dd1232b assets/modern_industrialization/items/creative_barrel.json +8c449014d426efb398e7876993f0dc93ca70f321 assets/modern_industrialization/items/creative_storage_unit.json +f276aa8bd95fb8960d8273ede13f4bfab5b1e1d6 assets/modern_industrialization/items/creative_tank.json +2ad1bd1af664ef116eb8bbcb0ac9c6f12c099c20 assets/modern_industrialization/items/creosote_bucket.json +e997423619e1998cb867e66ad5d5be529ac2a5f2 assets/modern_industrialization/items/crude_oil_bucket.json +6f57760fdb90d71b0c63009604dc9eb31cba65a3 assets/modern_industrialization/items/cryofluid_bucket.json +806919c729bb76dd45a9558c5ace53c413df3234 assets/modern_industrialization/items/cupronickel_block.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/cupronickel_cable.json +b2063d1cc82c6795fac0e3d63f77d0f742ab2239 assets/modern_industrialization/items/cupronickel_coil.json +c42ff7059f047c459e1e5d70253d2543e09a4139 assets/modern_industrialization/items/cupronickel_double_ingot.json +09fd8f52edc38ffd0772d64f7c41482a2b0c9295 assets/modern_industrialization/items/cupronickel_dust.json +5389cb57c75a4d2bcb9f19fed417ffc772b8352d assets/modern_industrialization/items/cupronickel_ingot.json +5ab3ed5eeabe0913e6cbd505a3e845d16c811c26 assets/modern_industrialization/items/cupronickel_nugget.json +9d8e69ca18c16eb5208f5d540f0036a635714a51 assets/modern_industrialization/items/cupronickel_plate.json +69a38001ae3ee5ee5d5e1a7407bf456355dce86a assets/modern_industrialization/items/cupronickel_tiny_dust.json +c56246368eda813f16ba9dafc9f6f861355110db assets/modern_industrialization/items/cupronickel_wire.json +357cccc39bff92958bb0ec9802d07dfc025165fc assets/modern_industrialization/items/cupronickel_wire_magnetic.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/cyan_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/cyan_item_pipe.json +86df6e7b713dff0b488d3a09314db6e0e2ff131c assets/modern_industrialization/items/deepslate_antimony_ore.json +fb179297d60fc4644255dcc1cdf4ae9f89d387c9 assets/modern_industrialization/items/deepslate_bauxite_ore.json +28f966bb0eab96b041ece43b671dc9cbb850e97d assets/modern_industrialization/items/deepslate_lead_ore.json +e15a6e624a44e8104d30feff2774d9038f926cad assets/modern_industrialization/items/deepslate_lignite_coal_ore.json +25c56bd9e74d76fd7193354379473f40bfeabc57 assets/modern_industrialization/items/deepslate_monazite_ore.json +552d3488634f502b3c0b2d49c04cbe09e32b1e0b assets/modern_industrialization/items/deepslate_nickel_ore.json +15d7ca0ba5cb25e02ab432c07dc4f5ba79cacca3 assets/modern_industrialization/items/deepslate_salt_ore.json +1cc5dfb4f3e727f8cbd76d3083e1119f430bc0d5 assets/modern_industrialization/items/deepslate_tin_ore.json +8fcddeb7c3dd9ca7e43efa3fedcb6cb88be18229 assets/modern_industrialization/items/deepslate_tungsten_ore.json +4e44622008166ee1f45d0e811350fa996387a045 assets/modern_industrialization/items/deepslate_uranium_ore.json +3dfc77758ddb31a486e2d4c4a14dd9f5b4fdc255 assets/modern_industrialization/items/deuterium_bucket.json +e9bac65eafd62f5627a62639edf1699ff75da2cb assets/modern_industrialization/items/diamond_crushed_dust.json +053a78a9356b47c59c952c0f417b057a7f5bc6a5 assets/modern_industrialization/items/diamond_dust.json +ab1203b3af3c1dcf8b375553a53bb5da7c9a50ac assets/modern_industrialization/items/diamond_hammer.json +630820c600395d4c3f10a7314159f319c5dc9a4b assets/modern_industrialization/items/diamond_large_plate.json +0ee73c75bc33b6a18521b1c8ad7f987802949d5f assets/modern_industrialization/items/diamond_plate.json +0ca22bd85b8b08ef5c037f480f4c593857687fcb assets/modern_industrialization/items/diamond_tiny_dust.json +74a2fc3e09d124095bdaab0a7e14ef8acbec2114 assets/modern_industrialization/items/diesel_bucket.json +b677016c7cf0d94420d09bf56bf84123c9c8ee53 assets/modern_industrialization/items/diesel_chainsaw.json +242b235f1eadc0411d244f90514e8f6fc7b8171e assets/modern_industrialization/items/diesel_jetpack.json +3b4178483d2168ad2a1be3b76c6d625e172f3728 assets/modern_industrialization/items/diesel_mining_drill.json +f29eb0c472dbeaf5551fad0c10cde5385a8b66ef assets/modern_industrialization/items/diethyl_ether_bucket.json +7d9042b4c0e7dc7e9414b235c3bacd2a9f157341 assets/modern_industrialization/items/digital_circuit.json +823b383dbdadf555f385055d60ffd10e120fee93 assets/modern_industrialization/items/digital_circuit_board.json +106558af141209bd1ac7180b5a4597086918dd0e assets/modern_industrialization/items/diode.json +cead99dced228f3964e30f31c574df517a505df2 assets/modern_industrialization/items/distillation_tower.json +16e09d306b4a1f0e47b2161a5ef17eed0e38a7ca assets/modern_industrialization/items/distillery.json +88edfd65f2caed4a3eab27186ca2c70328e63ad6 assets/modern_industrialization/items/electric_blast_furnace.json +5bbf444f6e9df8754aaae58697a0f88fd3ad2e60 assets/modern_industrialization/items/electric_compressor.json +114a56b7bfd4ce6492fd85af0e4065b1df065000 assets/modern_industrialization/items/electric_cutting_machine.json +babf84c4393fc4acd13cd5ed3b22dbe58b472183 assets/modern_industrialization/items/electric_furnace.json +0b264ba99acf0b3386f3e20da7331795449a90fa assets/modern_industrialization/items/electric_macerator.json +e371eff3a0185dea8cabf39b47beea4e8188e9a7 assets/modern_industrialization/items/electric_mixer.json +c144e176259f5e754a9b9162f7823ec1515ea37d assets/modern_industrialization/items/electric_packer.json +0de6caf99f27e28b0a13f65c5a8664d712d69732 assets/modern_industrialization/items/electric_quarry.json +816ee404c5c868fc340a17cfaa63dcdad64fc55c assets/modern_industrialization/items/electric_unpacker.json +168619c569e573af0871718b05c1ee6e41f77cc1 assets/modern_industrialization/items/electric_water_pump.json +1ad0034672bf1bd2e19eb3de225be316f64c5e6e assets/modern_industrialization/items/electric_wiremill.json +e17ee55f2d2d825920631e1bbc040af84bccfccd assets/modern_industrialization/items/electrolyzer.json +b3b1b91e9e5b3eb5b3d099296a436dd9b3e45ea0 assets/modern_industrialization/items/electronic_circuit.json +a471ec26ab9b15e487d55501fd69155324c44f04 assets/modern_industrialization/items/electronic_circuit_board.json +1b6da1dd615752365e416b10848c41da9d04e3a3 assets/modern_industrialization/items/electrum_block.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/electrum_cable.json +40abe14a365b8955dcbfce6c654531d9d9216559 assets/modern_industrialization/items/electrum_double_ingot.json +fe12c3e8f705f8d21e09e64bf4156f8bb02bf6ec assets/modern_industrialization/items/electrum_dust.json +acecba35b375cc3c3dc4c8b9456d96733af282eb assets/modern_industrialization/items/electrum_fine_wire.json +71e08dd316339c90beab6762e438c03ef272c014 assets/modern_industrialization/items/electrum_ingot.json +0dc4e78c3ddc516af9d67b45303282dd265f4a15 assets/modern_industrialization/items/electrum_nugget.json +4dfaf00c5f90ad7b993951cce87789c2f53d6d04 assets/modern_industrialization/items/electrum_plate.json +11dcc8b1bc4778e8217e182f55a40b3393148d49 assets/modern_industrialization/items/electrum_tiny_dust.json +291d838bc16605e5be5139131095ed0265eaf032 assets/modern_industrialization/items/electrum_wire.json +ad423ad4eb86d035067395c5160ef16156f7bf51 assets/modern_industrialization/items/emerald_crushed_dust.json +8578d1fa59a77460c344e2921e7e293c7de23fe6 assets/modern_industrialization/items/emerald_dust.json +ff697a6d4223a623408d376e45b2152f66a65d41 assets/modern_industrialization/items/emerald_plate.json +d125932409847c1e05f63ab3abc594acc804277c assets/modern_industrialization/items/emerald_tiny_dust.json +e852b1514489d81b96b32fadb87255e87774966d assets/modern_industrialization/items/ethanol_bucket.json +6b259e23726001995f16b9c041c546a78183f894 assets/modern_industrialization/items/ethylbenzene_bucket.json +c73178ee2ad12b917e180f4491781c8eae591019 assets/modern_industrialization/items/ethylene_bucket.json +917a3fefa9a784f9aef6a5a10dc742d0d384af21 assets/modern_industrialization/items/ev_energy_input_hatch.json +076baaf69152f669418fe7a5e5c60eb5602d06bc assets/modern_industrialization/items/ev_energy_output_hatch.json +cd14f0ab8f18f51dadecbc99c9f437e842a13d93 assets/modern_industrialization/items/ev_hv_transformer.json +24744c3aa8a0113b8377e07f882a37f0b3745e2e assets/modern_industrialization/items/ev_storage_unit.json +a1b0f681f98a875a8972b9976ce80279f57466be assets/modern_industrialization/items/ev_superconductor_transformer.json +3834938149c0d88c813907200bde20d428364f79 assets/modern_industrialization/items/fire_clay_brick.json +cf950f28a834fcf654e1aac12f383082ea535415 assets/modern_industrialization/items/fire_clay_bricks.json +a78cb80a9502cda961dd89a4c1d5fe111cec794e assets/modern_industrialization/items/fire_clay_dust.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/fluid_pipe.json +ca02d8f65235c282f796a63743dcd3c8b70b242e assets/modern_industrialization/items/forge_hammer.json +f9e0a9d74c32108e54c41672500825e8a4781ea9 assets/modern_industrialization/items/frostproof_machine_casing.json +cd4dac44c92999c7bc3b5d2a657aea63150a87b5 assets/modern_industrialization/items/fusion_chamber.json +9ee1cc14d4d0b1fde49883383bb19b08fea531fc assets/modern_industrialization/items/fusion_reactor.json +a364e40f68c01aeaddc08b0b18ef00ad5643f41d assets/modern_industrialization/items/gold_bolt.json +d3c70c992a113e3e06aced62191ec372c714232e assets/modern_industrialization/items/gold_curved_plate.json +1291bd6a736a724acc746fab4d1fdcf390af706b assets/modern_industrialization/items/gold_double_ingot.json +1a080062f4d5c0e43cf13b218e8ad2b2803a6a4f assets/modern_industrialization/items/gold_drill.json +ba466b13921169546086ae488d7463814c401cd4 assets/modern_industrialization/items/gold_drill_head.json +38c4f869c45b33f0178fe831eca439e1b611f032 assets/modern_industrialization/items/gold_dust.json +71bad19f18433ce836bce119950a63148fb88bcf assets/modern_industrialization/items/gold_gear.json +88073e642101329ed08b522af602dad308de7101 assets/modern_industrialization/items/gold_plate.json +e7395ba71f030541ae216b1b4384417e3a73c052 assets/modern_industrialization/items/gold_ring.json +7a77342bc36fc66a89d922be8af3e72c761a78f2 assets/modern_industrialization/items/gold_rod.json +d6493960de344232549ee061b78275d3d707523f assets/modern_industrialization/items/gold_tiny_dust.json +7e11df5aa84fd2d9029ca206b1f91892a3482c48 assets/modern_industrialization/items/gravichestplate.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/gray_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/gray_item_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/green_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/green_item_pipe.json +f44026a8c6803def558be4f45932f81dd36a06f9 assets/modern_industrialization/items/guidebook.json +60d8f7a74bf534ecfaa6e188fef576ecb48edec3 assets/modern_industrialization/items/heatproof_machine_casing.json +daf32fa1d0be70645a55e6729702873b3d246220 assets/modern_industrialization/items/heat_exchanger.json +9292fd16a4b49f6bf089b78ecf1fbce053fd817c assets/modern_industrialization/items/heavy_fuel_bucket.json +71b9ddb0e2c9de6d42e0420b85cdd93e70b326e4 assets/modern_industrialization/items/heavy_water_bucket.json +dca7fb695dae798d5b78c5ae621ce88241a60123 assets/modern_industrialization/items/heavy_water_steam_bucket.json +35b95c5201199ef473e0f2f9ff24e0875de9437c assets/modern_industrialization/items/helium_3_bucket.json +42d43c0d6a038dd5ecf27aecc2b66f4ff076d7bd assets/modern_industrialization/items/helium_bucket.json +3369ba223c723bffc8451b3ee1f39cba9164ba28 assets/modern_industrialization/items/helium_plasma_bucket.json +57b80ffb948197b1bf03853c58666b5f1fdd9fd0 assets/modern_industrialization/items/he_mox_block.json +f6d480aeb09ad2735fe7d24295ba0b41c7b4ef09 assets/modern_industrialization/items/he_mox_dust.json +35153c2942a863adc357c4d10f705e594ec4d2c1 assets/modern_industrialization/items/he_mox_fuel_rod.json +156da913a9d80226cfe67b35d42b1a6acb388ac1 assets/modern_industrialization/items/he_mox_fuel_rod_depleted.json +e5d0057d9c400ad5b6b9fc8bf40bc31105d7828d assets/modern_industrialization/items/he_mox_fuel_rod_double.json +43abd0a4389af468287a43f6ad0d99a0e4ba421e assets/modern_industrialization/items/he_mox_fuel_rod_quad.json +b7e88e91929ba96f2740ac9098e4c7c5985c69dd assets/modern_industrialization/items/he_mox_ingot.json +d9561cb303c400a469b229df945cbfba24a8b5b4 assets/modern_industrialization/items/he_mox_nugget.json +49eb0075639168c0ec363ef7b11d97e16afd0eb7 assets/modern_industrialization/items/he_mox_rod.json +9cf8d8027a717df79e5bedfb2c0473085c35f073 assets/modern_industrialization/items/he_mox_tiny_dust.json +f0e061eef5b56d87840cd8b472968f031a3de79d assets/modern_industrialization/items/he_uranium_block.json +221f7d83b4d5287d87c364edd8cfe0a73fcb6d0d assets/modern_industrialization/items/he_uranium_dust.json +c8070a096a476ed2f09004681f595669834a0e7f assets/modern_industrialization/items/he_uranium_fuel_rod.json +75a3d9ec8c4049d2a72a49c97757e7f6f614e282 assets/modern_industrialization/items/he_uranium_fuel_rod_depleted.json +efb569c1dcb838f2f02f221d6f41d183bc5f25d1 assets/modern_industrialization/items/he_uranium_fuel_rod_double.json +2640cb11bf506a2d95b56c7a4cf5c0c52e40e434 assets/modern_industrialization/items/he_uranium_fuel_rod_quad.json +9257a24342b4087db9d0e4da73fdfd9db170ce64 assets/modern_industrialization/items/he_uranium_ingot.json +5720aabda5caed62638b060bb56c6034f5225c3b assets/modern_industrialization/items/he_uranium_nugget.json +5e4f3e50881a45a01955980e7f6dc3190d2a687c assets/modern_industrialization/items/he_uranium_rod.json +f027bb2f90e8483b8243fd8c0ba4443615551511 assets/modern_industrialization/items/he_uranium_tiny_dust.json +435287b4a698dae5742fcfdacd3abceffbc4bf7a assets/modern_industrialization/items/highly_advanced_fluid_input_hatch.json +57b671c8294af1da4365fe6899b34732ee3c4753 assets/modern_industrialization/items/highly_advanced_fluid_output_hatch.json +efd6451becea547a3b17bd4ea312fdad349ccbaa assets/modern_industrialization/items/highly_advanced_item_input_hatch.json +11091d78eaa4ad3119195e688b1ae4b6d66925bf assets/modern_industrialization/items/highly_advanced_item_output_hatch.json +01a5dd58e6d13ae1285aa60cee6c83b8cfec9cc5 assets/modern_industrialization/items/highly_advanced_machine_casing.json +22db12f9fc00c10e6a26061bfcc094a6360ce9b1 assets/modern_industrialization/items/highly_advanced_machine_hull.json +14f355d2f92bcbbc1551d0ac0ff76ed9700a3060 assets/modern_industrialization/items/highly_advanced_upgrade.json +78221315e9b65d007a9780dfd41e89c781755880 assets/modern_industrialization/items/high_pressure_advanced_large_steam_boiler.json +09d0853e7c132726dd43b262338e7d47aad26b6b assets/modern_industrialization/items/high_pressure_heavy_water_bucket.json +53613a6b2090988fe73edd2d2c24edb4502db3c5 assets/modern_industrialization/items/high_pressure_heavy_water_steam_bucket.json +4109f026002836c5cec6e927818ba19c1f2d3cb1 assets/modern_industrialization/items/high_pressure_large_steam_boiler.json +046aed62a6b4daabe04fff9878885adc267b6c6e assets/modern_industrialization/items/high_pressure_steam_bucket.json +e4e9f8eb5fe566e2d40e8ad62b44bccfed780694 assets/modern_industrialization/items/high_pressure_water_bucket.json +3954cdfec63729638b0ab32a48447325dc85d5c7 assets/modern_industrialization/items/hv_diesel_generator.json +97549068cbcbda67f29fde6828387551b8c4485b assets/modern_industrialization/items/hv_energy_input_hatch.json +15a923cc150f2d1d8d72d2fb9dc0c19d2bae4f67 assets/modern_industrialization/items/hv_energy_output_hatch.json +bbe3f50d3844455ad2530c61472a0e4688caeaf3 assets/modern_industrialization/items/hv_ev_transformer.json +896ae2a05a4b975b4862190941bf7932a035fb68 assets/modern_industrialization/items/hv_mv_transformer.json +016a5e4dc979a43bcbd1394d0ccc849e7b521b85 assets/modern_industrialization/items/hv_steam_turbine.json +49f92aac20851534eadf8c0514a13338700a0b82 assets/modern_industrialization/items/hv_storage_unit.json +fdf9f7e09ac975a10376d0b2f44e0cc5252fa2fb assets/modern_industrialization/items/hydrochloric_acid_bucket.json +190828025bdf89d11f539a375c6dfb5eb06732dc assets/modern_industrialization/items/hydrogen_bucket.json +ebf0dd22331f4f5dc3d2afa46f7f073a692e172a assets/modern_industrialization/items/implosion_compressor.json +38214fe2ce01ce19d7a8cfc281624d88690dfef3 assets/modern_industrialization/items/inductor.json +e880668cfc534e72ac5d4938a0bc8e365d760700 assets/modern_industrialization/items/industrial_tnt.json +79a0b2a20e0a9e7aa264d70d961b66e8b3544f86 assets/modern_industrialization/items/invar_block.json +33fe2254f328950e2f3b2188fe4c294c5a1d7a43 assets/modern_industrialization/items/invar_bolt.json +fa3b9bec8d9b958195687217181dcdd741f8f2bd assets/modern_industrialization/items/invar_double_ingot.json +877c02da4ffcc829662a6a2e942162939b1ad9cd assets/modern_industrialization/items/invar_dust.json +92bcceedc64feb87ba9d5bef37131b5a19a9b927 assets/modern_industrialization/items/invar_gear.json +fe28131fef1d6cc40263f70cd934503fbef603ac assets/modern_industrialization/items/invar_ingot.json +fb865477dd1d4d706806b64a10503fb8853ace45 assets/modern_industrialization/items/invar_large_plate.json +255850467fa44e06a3f43dc57cbf5e8030948b13 assets/modern_industrialization/items/invar_nugget.json +0eb089a7741472034b7bad1be0bd3004e2be4c7f assets/modern_industrialization/items/invar_plate.json +411ec23a073335d6b1fb89df4736b052abecfb6a assets/modern_industrialization/items/invar_ring.json +18ee8cf2ef1eeefc8766c6724804dffd966974e0 assets/modern_industrialization/items/invar_rod.json +dd5f1708a104b715acf10ec3bf1315e72bf52878 assets/modern_industrialization/items/invar_rotary_blade.json +b40b93a9c20aed6d88d865c318b22d0e7cefc288 assets/modern_industrialization/items/invar_tiny_dust.json +49dac2ef242c28b49f4022bc4bfb75d4b406e808 assets/modern_industrialization/items/iridium_block.json +16781baebba9594949db6d48e13412586ef7e2c9 assets/modern_industrialization/items/iridium_curved_plate.json +f093d575f2b09413bd78d04dff8b1a7d7d18b340 assets/modern_industrialization/items/iridium_dust.json +ebd2bfafe480583204637f74acb2b1ceca563c04 assets/modern_industrialization/items/iridium_ingot.json +5627b5b6018355b59af924dc2812a860f0284d47 assets/modern_industrialization/items/iridium_machine_casing_pipe.json +e5d82329a647d2e6214d86b0886ac2f5433ed5cc assets/modern_industrialization/items/iridium_nugget.json +c0c551082f79228e1d00f54b036f5acd41e81b90 assets/modern_industrialization/items/iridium_ore.json +55a7f9df5f03ba21b44c5429a27768b6c2c024dd assets/modern_industrialization/items/iridium_plate.json +917931875befd884a128f1b3ccd917dad7e0911e assets/modern_industrialization/items/iridium_tiny_dust.json +03d649466bd96441b6a3db42ede7ad6c825ab898 assets/modern_industrialization/items/iron_barrel.json +02658eee2312e7a3faeb51d825aea390c395703b assets/modern_industrialization/items/iron_bolt.json +7d75f0e90bc7694719a7178b9eedfd07c88c901b assets/modern_industrialization/items/iron_double_ingot.json +7a1859bfd044ae0f01d93234c4ac317499785f20 assets/modern_industrialization/items/iron_dust.json +aedab288b18abe5c55b430e4aa91b4db8899e3a9 assets/modern_industrialization/items/iron_gear.json +5620cd558065471e7df489aebfe48363fe48c2e4 assets/modern_industrialization/items/iron_hammer.json +3cb1ab3c89a5b36d04fbc38847490ee4e4e2dc43 assets/modern_industrialization/items/iron_large_plate.json +38914cd79532474eeeec571decea554ffdc1fca8 assets/modern_industrialization/items/iron_plate.json +272084820bb95b749bbb61254ceea0aadd1c0e0c assets/modern_industrialization/items/iron_ring.json +0f7e82dba649edba327358ca87c0846c9f46b80c assets/modern_industrialization/items/iron_rod.json +f9e7b6212438acaca72192b6b10426ad077581e7 assets/modern_industrialization/items/iron_tank.json +338d6d663d6286d5b7dbca59edf329a36d24c09f assets/modern_industrialization/items/iron_tiny_dust.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/item_pipe.json +025b4f9a23d537253969edceac5cf9192b65b24b assets/modern_industrialization/items/kanthal_block.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/kanthal_cable.json +fa9a794478e365c61228af5746b9c2ee120edb3d assets/modern_industrialization/items/kanthal_coil.json +25c3c75047e8a320364c2ff7e4c0d0bdb8112e9a assets/modern_industrialization/items/kanthal_double_ingot.json +029d14917012714d85808b54a422e41c76f20c54 assets/modern_industrialization/items/kanthal_dust.json +44ab7cb281095c46fafd4bae514250781633d456 assets/modern_industrialization/items/kanthal_hot_ingot.json +ebccf2aad1c7b527cff2b45b1ac97dfcbd4b8459 assets/modern_industrialization/items/kanthal_ingot.json +15e570303f9674c4ccea40aee0e0c78df301d4a5 assets/modern_industrialization/items/kanthal_nugget.json +a9be769c88a9e0d8c3dfa23e61fd16800245a7be assets/modern_industrialization/items/kanthal_plate.json +a72f88aef1dd12c82d2a3da4cdb2cd3f61f24d68 assets/modern_industrialization/items/kanthal_tiny_dust.json +ed1c452eeb9ec01059c27376315b0eda6bf21acc assets/modern_industrialization/items/kanthal_wire.json +88d440d24779b75e64081d94033ae9c2d2dc9d4e assets/modern_industrialization/items/lapis_crushed_dust.json +d1cc7e08cb07324d29eaf9ae81589c80fd8042a8 assets/modern_industrialization/items/lapis_dust.json +f4a08ec1a24d4e71bd87ed44be4d25d671ada1ae assets/modern_industrialization/items/lapis_tiny_dust.json +bfd9e32cae2e3ed6db1958fa0309031e77a91b85 assets/modern_industrialization/items/large_advanced_motor.json +bd3fb9cc98c910a2c85ae915d650390fbb928527 assets/modern_industrialization/items/large_advanced_pump.json +64aa5b5c722b5a1b0bb939b5208671c7ec705b8d assets/modern_industrialization/items/large_diesel_generator.json +6a3a94a4a8553eff3c646cd14f7ebe6ca43b2cb7 assets/modern_industrialization/items/large_heat_exchanger.json +b2b390b75f606727f9a49f5318aa649317cb3dc6 assets/modern_industrialization/items/large_motor.json +6802b1cead764197ef633120fe940cd03f83ed5b assets/modern_industrialization/items/large_pump.json +b5f793130df48c7bdae9daa360139b8d0f4f052f assets/modern_industrialization/items/large_steam_boiler.json +00ddd7dcf7c724874743cad5baa1f1bb71368446 assets/modern_industrialization/items/large_steam_turbine.json +ba1394c99dd61487ff2493e2e962197fcfde929d assets/modern_industrialization/items/large_tank.json +928fefe1af5ffcf7ac10b0ddeaa34817497cf74b assets/modern_industrialization/items/large_tank_hatch.json +31e6000b0e37c96f72c0a191b69d7b95b0162afe assets/modern_industrialization/items/lead_block.json +d25a45fd964a9627d685e9c7d01aca9112f7753f assets/modern_industrialization/items/lead_double_ingot.json +53d68ebf26f390de083fa0a5f5d876bff9d9622e assets/modern_industrialization/items/lead_dust.json +61f292554788a11c8724fe9ea1fbcfd38f0052cf assets/modern_industrialization/items/lead_ingot.json +789a171e655bb8d0633880d6d97673523dfdd33c assets/modern_industrialization/items/lead_nugget.json +a00f35d135e59eb23ebd411de83d3eaaf4ede047 assets/modern_industrialization/items/lead_ore.json +f96333f318728853152848a9505c32aeb44e7003 assets/modern_industrialization/items/lead_plate.json +fa803d794f1bb01b055f5007128a9183b9893767 assets/modern_industrialization/items/lead_tiny_dust.json +c1fcd922590d69b594edd954ad7e75bd0ac7679b assets/modern_industrialization/items/le_mox_block.json +57fe31501e419dd412d080588dfa119a68766af9 assets/modern_industrialization/items/le_mox_dust.json +28e6b00e3fc7e678faad70c273d59d599cc86807 assets/modern_industrialization/items/le_mox_fuel_rod.json +3b97ba3ef957210eae26516b6eaf08303d5b6b33 assets/modern_industrialization/items/le_mox_fuel_rod_depleted.json +0cb0b8379e1bff837d73e0f5e37c6330fae7024b assets/modern_industrialization/items/le_mox_fuel_rod_double.json +1a144d400ec312414b74a5cd857ffad88deb107c assets/modern_industrialization/items/le_mox_fuel_rod_quad.json +d2a06b0df26a803e61c33bbc8068f8dca0aa29cc assets/modern_industrialization/items/le_mox_ingot.json +0619212315398ae13f60b102875621c040f12e2b assets/modern_industrialization/items/le_mox_nugget.json +7fb8538a49d9dbb12bf7b36a6a7dd4fb275bed19 assets/modern_industrialization/items/le_mox_rod.json +e38f44c82e103828d7a528ea975c69da4514564c assets/modern_industrialization/items/le_mox_tiny_dust.json +1cb1f35d035c3ae4a5671075fe2a9d9dd9970d5a assets/modern_industrialization/items/le_uranium_block.json +b0807a06e368ce032b61a021685e216ea3243b97 assets/modern_industrialization/items/le_uranium_dust.json +89cdfe56d7ea6074614dfdae46b9edb788540c63 assets/modern_industrialization/items/le_uranium_fuel_rod.json +12880f875864b858aa0b677902efd19251dc1d07 assets/modern_industrialization/items/le_uranium_fuel_rod_depleted.json +dc608e55f8d7e0c6a560192f79156e430af528cf assets/modern_industrialization/items/le_uranium_fuel_rod_double.json +7695a64884f90d79f82df7e85971b20b546c781d assets/modern_industrialization/items/le_uranium_fuel_rod_quad.json +1f0aede6b4083211b1e2edea2fd71d9434102492 assets/modern_industrialization/items/le_uranium_ingot.json +23ecb8ff18a001773daa2806ea2c0fb5a103ebc6 assets/modern_industrialization/items/le_uranium_nugget.json +9c1ad208061240bd439064a219528dc3dfc391a2 assets/modern_industrialization/items/le_uranium_rod.json +b2c2734a5c9130ea9a174a8099564d23106d07a2 assets/modern_industrialization/items/le_uranium_tiny_dust.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/light_blue_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/light_blue_item_pipe.json +d854926098939b0f8a6b2d0aef569b5b5c4c1ab0 assets/modern_industrialization/items/light_fuel_bucket.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/light_gray_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/light_gray_item_pipe.json +de74e26f1175520828be24665756fa9599c992cd assets/modern_industrialization/items/lignite_coal.json +c6d49920197f2e0e9c89a668b4e60b0fd729f087 assets/modern_industrialization/items/lignite_coal_block.json +d5b1cddbf2dc16da8c2341541930ea5423a14832 assets/modern_industrialization/items/lignite_coal_crushed_dust.json +f64dcd9138554d01803a447b98e060ead50d7fce assets/modern_industrialization/items/lignite_coal_dust.json +b927c1420b8e1146be878b3a0c92c82ed2cbc211 assets/modern_industrialization/items/lignite_coal_ore.json +f1b4c68157b1f41214d3b7d69ec46a0390d84e1e assets/modern_industrialization/items/lignite_coal_tiny_dust.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/lime_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/lime_item_pipe.json +5b7dac8f48729e97fa6f4e9d2de8d1b233482413 assets/modern_industrialization/items/liquid_air_bucket.json +ec3db86c2c34b71fb410f8e81ea6da771aa42f78 assets/modern_industrialization/items/lubricant_bucket.json +e5468d7fd0466329349c7361203ef0e4d1f823fc assets/modern_industrialization/items/lv_diesel_generator.json +e5f9a694b3d72202d0754ea50eb8f432616bf00e assets/modern_industrialization/items/lv_energy_input_hatch.json +cf5ee524e286238f325b998f3932078511690303 assets/modern_industrialization/items/lv_energy_output_hatch.json +0e41d089076cbf5e58e685caec4ef1f31f7db9e6 assets/modern_industrialization/items/lv_mv_transformer.json +ba61aefbd0fe92f6cf21c6dcd88c9ba889a17f32 assets/modern_industrialization/items/lv_steam_turbine.json +1c544e2968511bd58b34e0f7aa8505bf33e48f60 assets/modern_industrialization/items/lv_storage_unit.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/magenta_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/magenta_item_pipe.json +ed1c0d3598bfba89782103efd2cb375d681e8a8e assets/modern_industrialization/items/manganese_crushed_dust.json +e51210ab407eecbcf6e39a1558c9b52291c71eca assets/modern_industrialization/items/manganese_dust.json +89b7915e1b28f7cdcca7b46c1c83fadc36e25279 assets/modern_industrialization/items/manganese_sulfuric_solution_bucket.json +1f327c136f87eb6d2e47a84a1c3b12efeb3231e1 assets/modern_industrialization/items/manganese_tiny_dust.json +85d2ca0a76dd79d2f18612a0bad5f8b406eea868 assets/modern_industrialization/items/memory_management_unit.json +c5e79ac4c1eba357f257bd242931465e768c6b0f assets/modern_industrialization/items/methane_bucket.json +15a10f7a3aba5b55297fc410aa68bdaa16cdc67d assets/modern_industrialization/items/mixed_ingot_blastproof.json +bad397ac20e82e66e21805ba5d682d670b7ce629 assets/modern_industrialization/items/mixed_ingot_iridium.json +956fd8a5537d28f32b19298c49c7a8594ef2ca83 assets/modern_industrialization/items/mixed_plate_nuclear.json +4aae9fe6860615b3a24647c0766c83d9fdd65228 assets/modern_industrialization/items/molten_redstone_bucket.json +b3b346a83ba1c6b65dd1b510632fa692ff26de0a assets/modern_industrialization/items/monazite_block.json +e2cd910664d59cd23dd6a31c7610a94bfc393b76 assets/modern_industrialization/items/monazite_crushed_dust.json +1423428e1ddf1f19f13e91cd5e940b076e2027fe assets/modern_industrialization/items/monazite_dust.json +f41b2c87100a1e76528d9e4199125768a711780a assets/modern_industrialization/items/monazite_ore.json +3b72a83750a9ba8d8c0ae5712f5462c7a1e57c17 assets/modern_industrialization/items/monazite_tiny_dust.json +a0b6fe0ff9857cf6fe67816415093f4d3a75b05d assets/modern_industrialization/items/monocrystalline_silicon.json +b44a44453ed52b082c75cfd3b062eb233075d500 assets/modern_industrialization/items/motor.json +4f9affa7f590a97c127a75f4c50efa108f871d59 assets/modern_industrialization/items/mv_diesel_generator.json +ac7bfb0ffe0f031a0e56cb3bd2cfd25095dfce54 assets/modern_industrialization/items/mv_energy_input_hatch.json +ddf5d7c297d26d0aea95ee80c21eed0df4372f47 assets/modern_industrialization/items/mv_energy_output_hatch.json +4733bd070fff88ec5bf25d315e94b2b7000df03d assets/modern_industrialization/items/mv_hv_transformer.json +add1f0364a3347958247550dec1b8d24739c1064 assets/modern_industrialization/items/mv_lv_transformer.json +d381f23281fbaf036ce1306bf6bdf2ecf38b388c assets/modern_industrialization/items/mv_steam_turbine.json +83057d988b856cfba548299f5a890f314865e91c assets/modern_industrialization/items/mv_storage_unit.json +b936b937eea44041959a98b43cf65caad2b83b5e assets/modern_industrialization/items/naphtha_bucket.json +7f2daaaa7ea197e86cb29be9a6a878228727920f assets/modern_industrialization/items/neodymium_block.json +10b13c34a9d27a466639c64e842fae1107b75cd5 assets/modern_industrialization/items/neodymium_dust.json +5ca0612e737885a0466ecfbd6962e14d11db4672 assets/modern_industrialization/items/neodymium_tiny_dust.json +69a184de78681293719e9db86601b821d35eab52 assets/modern_industrialization/items/netherite_hammer.json +a7747b2965de6fc25afdadccf57ff861aa68bf7b assets/modern_industrialization/items/nickel_block.json +d625ff57decc87241e87046d8e39a07757431298 assets/modern_industrialization/items/nickel_double_ingot.json +ca1dd920f972e5d3fde50598830f841fc3bcd9ff assets/modern_industrialization/items/nickel_dust.json +3f6e381a727e9415efca87bab84b94e497671f74 assets/modern_industrialization/items/nickel_ingot.json +d95b4ceee852b6d5ecd4d4dbed64ccf67bfe82ba assets/modern_industrialization/items/nickel_nugget.json +6def1ec2cfdbe46281f3b8d4bb864b25b15d82e8 assets/modern_industrialization/items/nickel_ore.json +68a9be2d5f9fc9615c2d75051f88d0bb1479d785 assets/modern_industrialization/items/nickel_plate.json +f07cc692e92ce27040986be1cd9d3d9eea6a75af assets/modern_industrialization/items/nickel_tiny_dust.json +8da6846ed4773fbb86ea921ebbca11d3f8651986 assets/modern_industrialization/items/nitrogen_bucket.json +8370018963fa2d10da15381494f1a40da1b80136 assets/modern_industrialization/items/not_gate.json +7de429edeb0474719621009488190d96444d1994 assets/modern_industrialization/items/nuclear_alloy_large_plate.json +d8210352dee06c5805bfdd6c525ef84720142c91 assets/modern_industrialization/items/nuclear_alloy_machine_casing_pipe.json +81b3bde888993f282aac304afac76e6a39be19d4 assets/modern_industrialization/items/nuclear_alloy_plate.json +c8ab094a8f2eff4e390969dfd36b245518a0ee45 assets/modern_industrialization/items/nuclear_casing.json +ea00caf02ac4b15c5492813f1ebd8a18c4769878 assets/modern_industrialization/items/nuclear_fluid_hatch.json +68446a73a767bfa5a37fe3c074e34d7f9acd0c53 assets/modern_industrialization/items/nuclear_item_hatch.json +f3feb8f25185d80ededd1366c0d050ddbf9410c1 assets/modern_industrialization/items/nuclear_reactor.json +39d2198f6b965de2d45b8dac80967e63d4b0f117 assets/modern_industrialization/items/nuke.json +ea4dbaa0734c65b18da496ce2d19a66622b30a05 assets/modern_industrialization/items/nylon_bucket.json +782cb6c5aaa6f06f15b5164049a340269d577d3b assets/modern_industrialization/items/oil_drilling_rig.json +29e9da4d1e297f0f5cabf254ce5f47d16d5b2521 assets/modern_industrialization/items/op_amp.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/orange_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/orange_item_pipe.json +a06bd2d4a48c627dcfae2349d70da1a8deffa230 assets/modern_industrialization/items/or_gate.json +252c24e2f117f0db2361e08bc17e4108d8ce7a91 assets/modern_industrialization/items/overdrive_module.json +18a32a28f9e716066ec3e9917ccbec7c46468ef9 assets/modern_industrialization/items/oxygen_bucket.json +90f70e49c1c6588cbd29993d285c9a60dcfd0d35 assets/modern_industrialization/items/packer_block_template.json +2d98d492f475f7b75f4a83010222fbfa37c08a11 assets/modern_industrialization/items/packer_double_ingot_template.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/pink_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/pink_item_pipe.json +cc9de744d11801c961a0b10a1f850d6fc0ad7deb assets/modern_industrialization/items/piston.json +01c0721facc569e2a55bbf4a5e23891ddca59fed assets/modern_industrialization/items/plant_oil_bucket.json +edd4a516cc59c590b1d1c37171364ca8c05bc32d assets/modern_industrialization/items/plasma_handling_iridium_machine_casing.json +1fca1a938a935fafabc2425ecfe5c1cd315302a9 assets/modern_industrialization/items/plasma_turbine.json +836dbdee81f92059f87e48b0a4a09a50396d9cc0 assets/modern_industrialization/items/platinum_block.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/platinum_cable.json +69dd1d02c7e4337ef99cb05464bb80fd61358064 assets/modern_industrialization/items/platinum_double_ingot.json +debf55aeffceeea41a9945fe2aafe4f3dbd6497e assets/modern_industrialization/items/platinum_dust.json +30df8e9a4fe4bf7c54233e514a6a3aec50fd5615 assets/modern_industrialization/items/platinum_fine_wire.json +02944818f285cbc21ec44f56bfc2773f778ffd05 assets/modern_industrialization/items/platinum_hot_ingot.json +2c45138ae59ade6dcb3014db8d61634d0ddfb8cd assets/modern_industrialization/items/platinum_ingot.json +b4ad49ae48fe883ba844748c5c61c49738fe6ee9 assets/modern_industrialization/items/platinum_nugget.json +3f1c4b838c3ab0b2fe2539a5af4d90661653f493 assets/modern_industrialization/items/platinum_ore.json +367219ee836853b7c74fb43269da8f674868b3b9 assets/modern_industrialization/items/platinum_plate.json +a4484abc377d7139df17fedd4c5508b0a17abeb3 assets/modern_industrialization/items/platinum_sulfuric_solution_bucket.json +2da37726f1cbcb0e1bd3f893cfc6f82308a6d602 assets/modern_industrialization/items/platinum_tiny_dust.json +4eb3936c21ab171af6fbdb884594a9eb0b59cb27 assets/modern_industrialization/items/platinum_wire.json +d2037bed5d86188d000aba8fdbbb752cebe56cb1 assets/modern_industrialization/items/plutonium_battery.json +3654709f1506d342a82ef1ab727a750c45f6df55 assets/modern_industrialization/items/plutonium_block.json +2ecd181692c44803c6c899ff86b691936aa58365 assets/modern_industrialization/items/plutonium_dust.json +e099e8d979ebcbd8f3b76f9c599a2ee622edcfc3 assets/modern_industrialization/items/plutonium_ingot.json +2f0d53042f21dcf77ca4994194364c7d71c3c859 assets/modern_industrialization/items/plutonium_nugget.json +28c69c4cc64179dc1bb07a092a526652be5099b8 assets/modern_industrialization/items/plutonium_tiny_dust.json +81f628a17fd26071a14173521d54a488bce930f3 assets/modern_industrialization/items/polarizer.json +55c0c1c1a81466ec6e8854dc18f278fb80024b5b assets/modern_industrialization/items/polyethylene_bucket.json +9e90b5a128b93b42108a0c980f199fd507f01f4f assets/modern_industrialization/items/polyvinyl_chloride_bucket.json +daec1b9a5be4eee98c63b6f23532df570cd17a9f assets/modern_industrialization/items/portable_storage_unit.json +6d98f5b13dca5d831162ee591bb378fda77e3bea assets/modern_industrialization/items/pressurizer.json +091cbe8e49341670a89c0c8461bdd3c5ef63a0e8 assets/modern_industrialization/items/processing_unit.json +19d49d9879e05d19cc1d8e553746cc5009dba213 assets/modern_industrialization/items/processing_unit_board.json +d65ba956e2fbe00fd7c2d5188f0c8e725df85ede assets/modern_industrialization/items/propene_bucket.json +a088ac41c583e8472887640da2cee081bd6646c4 assets/modern_industrialization/items/pump.json +73e90ea584566f4f85f573e8063142fa3757eabd assets/modern_industrialization/items/purified_platinum_sulfuric_solution_bucket.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/purple_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/purple_item_pipe.json +cf677c36abed7a0dbb0188975a9c9e3aca1a0fb3 assets/modern_industrialization/items/quantum_barrel.json +346fc8b8d617cf521518881fc446eb6470684537 assets/modern_industrialization/items/quantum_boots.json +145d134b51632e1b0f8b569730d48cb399c92274 assets/modern_industrialization/items/quantum_chestplate.json +d09e46d1c49d830a51e4b6351e7a4b51ab0f04da assets/modern_industrialization/items/quantum_circuit.json +f4586fb2cc9695736cdd0f45e7bb87649943aaaa assets/modern_industrialization/items/quantum_circuit_board.json +ffd4acb18958eb5723b0eed3d64a703fcc33aed5 assets/modern_industrialization/items/quantum_helmet.json +6184e1874c5b6d7baf5507eeca16be5187025ac9 assets/modern_industrialization/items/quantum_leggings.json +25868cf30bf728a0c099d05ab6f45f3c9efde4ad assets/modern_industrialization/items/quantum_machine_casing.json +735531a634162f34d062110603cd5a45c0bfc997 assets/modern_industrialization/items/quantum_machine_hull.json +d23b975efe93474028efe4b59607411a63257392 assets/modern_industrialization/items/quantum_sword.json +a6657bb369bf8e7c868c0c83e8ec06204f6e137c assets/modern_industrialization/items/quantum_tank.json +0ccc10a9a6c26151408f54b77969acbf6160856b assets/modern_industrialization/items/quantum_upgrade.json +aa7eb5d1b390324229c95356c769f4bd709f7e5c assets/modern_industrialization/items/quartz_crushed_dust.json +abd746b124f70c76340e81ae21ac750e550c6284 assets/modern_industrialization/items/quartz_dust.json +c2d83f0efb65cd4b4730580096c8112ff3eec40d assets/modern_industrialization/items/quartz_ore.json +7c2a4db1ad5662c61fdb7924d54768abf6402fb9 assets/modern_industrialization/items/quartz_tiny_dust.json +6613203dfa6b304081bcb89a488c478784eeb4d1 assets/modern_industrialization/items/qubit.json +5210d33b0f5acb7187a5932ca42365359e2b0086 assets/modern_industrialization/items/random_access_memory.json +ecc0f4fd9f48e1b4e05bd8b1ed0ac69c330c5441 assets/modern_industrialization/items/raw_antimony.json +4172036a4ecdb39ec1fc0d20cd46f1d5ea1f1361 assets/modern_industrialization/items/raw_antimony_block.json +640ca8d29bdfbd2ba323c29932cf0958b84c8542 assets/modern_industrialization/items/raw_biodiesel_bucket.json +d764b86e986f3a458cb654c0b1b6d6dfdc930063 assets/modern_industrialization/items/raw_iridium.json +d6cb9a67caa227fe3006989672c62d511b67b191 assets/modern_industrialization/items/raw_iridium_block.json +5582ccd994ac04523d4cb55feb1db502eb41bbae assets/modern_industrialization/items/raw_lead.json +b2c7710d3927ecc7b2ae749efa6e1501c1254af5 assets/modern_industrialization/items/raw_lead_block.json +5652d50b9ae7346a2733870dd1755c1ff64a5d73 assets/modern_industrialization/items/raw_nickel.json +a3aa64aef6cab5bce7713dd1098ab992a1cb6d6a assets/modern_industrialization/items/raw_nickel_block.json +d6c0efc84c62c28fcf8d06e794ced9baa3a6943d assets/modern_industrialization/items/raw_platinum.json +ca15a9235a1b233d95edb7b3555079731303047a assets/modern_industrialization/items/raw_platinum_block.json +0840d535be1f01d01de5816681efbc3a7870df1a assets/modern_industrialization/items/raw_silver.json +bd1aae2a95ea397faa336375ce9159a40e4f14e0 assets/modern_industrialization/items/raw_silver_block.json +2b300059818fb0d1f1ce718ed6e6021d6e372640 assets/modern_industrialization/items/raw_synthetic_oil_bucket.json +fb5dc3b257eabfce1db7cc4577272bde79f2badf assets/modern_industrialization/items/raw_tin.json +4d27933efcb20577bf4bb3242e7b9058f983b174 assets/modern_industrialization/items/raw_tin_block.json +776d3842d14bf4f93eea078d9dff6ee320e064af assets/modern_industrialization/items/raw_titanium.json +e84eec52e240310b96cee7f440a2c2ade17a6d33 assets/modern_industrialization/items/raw_titanium_block.json +906fa44a3a7e934c78aff7485be3ed8c4913109d assets/modern_industrialization/items/raw_tungsten.json +a3fec58b760e7a1faa91225caac29c1a35bfc4bb assets/modern_industrialization/items/raw_tungsten_block.json +df21c082a8ab45e130ccd186a8e3274c18ed9659 assets/modern_industrialization/items/raw_uranium.json +e2a03f6060cd13b2689c74e7057bb6ac4c3adb8b assets/modern_industrialization/items/raw_uranium_block.json +2b84cad890d580ce73bf0e8fc2b137582e653b1d assets/modern_industrialization/items/redstone_battery.json +f816b9f4b486c86bad07a71fe800fd8c9ae11d53 assets/modern_industrialization/items/redstone_control_module.json +955048b491764490c2fdc2e00cbcf6e38e0f5503 assets/modern_industrialization/items/redstone_crushed_dust.json +0cfe49f9192662a0e620d133593208e6c6ad6956 assets/modern_industrialization/items/redstone_tiny_dust.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/red_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/red_item_pipe.json +f700f6ee5fb7a2b5ff180c8d8ae8bfa0538361e7 assets/modern_industrialization/items/replicator.json +f023eb3f4dc19951c29b8f5ed335ab2bc1402092 assets/modern_industrialization/items/resistor.json +2d0549bace650b8d95aba03c2d97a7dac6ad2ad1 assets/modern_industrialization/items/robot_arm.json +c536c59c4ad8a229c3d4f99248c97ebd9290b02b assets/modern_industrialization/items/rubber_boots.json +24f02b9eb0c7c66efe044cb69b3e1f0fdcbda660 assets/modern_industrialization/items/rubber_helmet.json +276c28001d0f8011cd3503b38fdac74d92ed9af5 assets/modern_industrialization/items/rubber_sheet.json +13092758b680bb342305c709358e9b7a6fe7a9c8 assets/modern_industrialization/items/ruby_dust.json +c62646d07d3063bcf5ce9676230f41c006477407 assets/modern_industrialization/items/ruby_tiny_dust.json +2f8535a270d2cd46250e789610b005a88828e30b assets/modern_industrialization/items/salt_block.json +17793a90c4a89c98c2affd363eaa3af40245fb1b assets/modern_industrialization/items/salt_crushed_dust.json +45e779df279c4adb9becb38af0dc1d321536365a assets/modern_industrialization/items/salt_dust.json +8a8befbfdd8a24c886486b8c2a0853c33029ec79 assets/modern_industrialization/items/salt_ore.json +eac77b81754b31f440822b5f048c930c0026f66b assets/modern_industrialization/items/salt_tiny_dust.json +6a0505e5d4df4ec53e90759f42d95169db741568 assets/modern_industrialization/items/shale_oil_bucket.json +e19ab0df21446aee36cb85c1e6889209e58c4246 assets/modern_industrialization/items/silicon_battery.json +ed91bb8f3a88723136f275627be8663188dec707 assets/modern_industrialization/items/silicon_block.json +84427b053c3cec7f4310c1f22c2dc8167784b7e2 assets/modern_industrialization/items/silicon_double_ingot.json +45fe638802f46c6864547c2cf3eb1948a9482ee6 assets/modern_industrialization/items/silicon_dust.json +cc88500e9138c99d137141554a7b32be2092ee9c assets/modern_industrialization/items/silicon_ingot.json +0e9628ccc74ec3edb709d206501a6bb85f84b9dd assets/modern_industrialization/items/silicon_nugget.json +6ac194e1fe0789a3b47d6e00c7c73105ec00d54b assets/modern_industrialization/items/silicon_n_doped_plate.json +4d9c6801422c115d8bb328e011501b7244e23f35 assets/modern_industrialization/items/silicon_plate.json +16aa1f7d436d159d665b6971141f3ccd00e45252 assets/modern_industrialization/items/silicon_p_doped_plate.json +088c62d407d83f9638648143f060c2b0a2b14486 assets/modern_industrialization/items/silicon_tiny_dust.json +bc30b8b6981b07216b018f71c81159be97880f07 assets/modern_industrialization/items/silicon_wafer.json +4d99eb8b4aede59bf7b880999211137dd3084d78 assets/modern_industrialization/items/silver_block.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/silver_cable.json +9ce0553cbdd394d9f3e7bb53cd49d8b226fbad7a assets/modern_industrialization/items/silver_double_ingot.json +a4761dc6fdac16f1df31b2ba36e3bba6d014df79 assets/modern_industrialization/items/silver_dust.json +47ddac9c6729dd378fb56cfcd42abcd896a19e41 assets/modern_industrialization/items/silver_ingot.json +92aba7b999a8702d5f6ddd1704ae5cddac1a89bb assets/modern_industrialization/items/silver_nugget.json +0eac4c0d832bd33d6a8b98a1ea26c782925ad6a6 assets/modern_industrialization/items/silver_plate.json +2ca8f305a22d99c1ac9ffcab6db186ce311396d3 assets/modern_industrialization/items/silver_tiny_dust.json +30912eb0e690664bd88f4077ac70a5e8cc652ee9 assets/modern_industrialization/items/silver_wire.json +211ee2434317276beb877e57c5bed33c0fb0e77f assets/modern_industrialization/items/singularity.json +2ee9e07e45cebd8a0d2f5df61f3603148be17f5f assets/modern_industrialization/items/small_heat_exchanger.json +3e6a718369691ae234e223570b05fb77db70f5e6 assets/modern_industrialization/items/sodium_battery.json +3e202ccea73e2b1b080cfdcbfe4a45b752b28211 assets/modern_industrialization/items/sodium_block.json +a01d17e4c40e7caff14b26eb119d5f97ac791279 assets/modern_industrialization/items/sodium_dust.json +49ef1e2804ca152dfd5f9dd0356732a0cde2480c assets/modern_industrialization/items/sodium_hydroxide_bucket.json +9c3749c9eb7d8d9c6973fc7e3a30a320812e6a3e assets/modern_industrialization/items/sodium_tiny_dust.json +ebb37fb10a7284658de19895a279cfd59feca05a assets/modern_industrialization/items/soldering_alloy_block.json +637fd532ea7a9ed1efce10f76d7b756a6ad0b03e assets/modern_industrialization/items/soldering_alloy_bucket.json +e2e66d6a73357f110266bf54a16155e0c5838760 assets/modern_industrialization/items/soldering_alloy_dust.json +864eb618258c75e9bbe81ae431d8c9878fdd3d24 assets/modern_industrialization/items/soldering_alloy_tiny_dust.json +360b8b2ae9c7c79daeae4dcaff94ae28f150de21 assets/modern_industrialization/items/solid_titanium_machine_casing.json +d203def5601e113711792ef5deb3bfbb848fab36 assets/modern_industrialization/items/stainless_steel_barrel.json +0f3abb92976664c48feab421d213129a8a037295 assets/modern_industrialization/items/stainless_steel_blade.json +423a84df5f00663deff9c69fe04cceb96b140938 assets/modern_industrialization/items/stainless_steel_block.json +9f6807df6ddf3e0a4273bcdf2bfec8f2942d4f78 assets/modern_industrialization/items/stainless_steel_bolt.json +2d2f815573dd265ed0a09597f77e4d3da8ed1466 assets/modern_industrialization/items/stainless_steel_curved_plate.json +99072cbcbab692e5a384e2586d7884a2333bebf3 assets/modern_industrialization/items/stainless_steel_double_ingot.json +789541592de1a01680f88563771a432224d6ee06 assets/modern_industrialization/items/stainless_steel_drill.json +fa4c12457c552a6afc245c3ccb5023f6e7ae98eb assets/modern_industrialization/items/stainless_steel_drill_head.json +f9b193363baad2323bc6437ceb99cfa51931e7eb assets/modern_industrialization/items/stainless_steel_dust.json +9b132894d81fb5a950fbc16fe49e99901d9ba747 assets/modern_industrialization/items/stainless_steel_gear.json +72ff09c3ca0a45d26d7d472ea47abb0cbe5dd3eb assets/modern_industrialization/items/stainless_steel_hot_ingot.json +f7df98d75c6bcc6028ecb573fa5d7d4a65fe2431 assets/modern_industrialization/items/stainless_steel_ingot.json +e3f9b9a14dc78e6fd9ae11a322a3de6913c62e20 assets/modern_industrialization/items/stainless_steel_large_plate.json +9fbb41e9e841b85c2b9043a7bd2eb99dcefc791b assets/modern_industrialization/items/stainless_steel_machine_casing_pipe.json +735106a7f934eeb47111d841e5047adeb2e835fe assets/modern_industrialization/items/stainless_steel_nugget.json +c0620c43c3cf07f24713b5ce3d9bbda93e76af7d assets/modern_industrialization/items/stainless_steel_plate.json +b9cc8f42c0d18cc6ea4d7154fe70de7fadef9878 assets/modern_industrialization/items/stainless_steel_ring.json +1272fc6658e1add7d5cb3aa2b99a832e5e770186 assets/modern_industrialization/items/stainless_steel_rod.json +aea96103067e10dafc36936e3e3911d8e8bf4a31 assets/modern_industrialization/items/stainless_steel_rod_magnetic.json +6545454aebc49d0d16aca3ff0948fd820c5a250e assets/modern_industrialization/items/stainless_steel_rotor.json +39f48222be6aeba1b7185b2407e6fd3d140c3a4a assets/modern_industrialization/items/stainless_steel_tank.json +af4407a8d32f54e28f234e32e0cd154b76b906e0 assets/modern_industrialization/items/stainless_steel_tiny_dust.json +bcf214bc222df284783badee179fba419197d1cd assets/modern_industrialization/items/steam_blast_furnace.json +289e76f168851a87dac79f8b0ca1e01e4bd6b662 assets/modern_industrialization/items/steam_bucket.json +a787645e5b008057acf990d03dcd4cfd46143fcc assets/modern_industrialization/items/steam_cracked_heavy_fuel_bucket.json +939c801e2762014beb89ce16e3766ee21cf87959 assets/modern_industrialization/items/steam_cracked_light_fuel_bucket.json +15ca02034d5e352f52e123bc2019c40e06edeb5d assets/modern_industrialization/items/steam_cracked_naphtha_bucket.json +a814b7120fe05af22c3b4da068c8ec28bb216d55 assets/modern_industrialization/items/steam_mining_drill.json +ea4f2599e9543fcabc41d0401f5a3aa4260c0753 assets/modern_industrialization/items/steam_quarry.json +6256d423be2de299a5eee24a34c2fe6124639498 assets/modern_industrialization/items/steel_barrel.json +664e3a58c201ad9ea134c1fb98cb7f1e0381cca3 assets/modern_industrialization/items/steel_block.json +c4c9fdc5b8f86dd5f1a7fe19364d36e53617d3e5 assets/modern_industrialization/items/steel_boiler.json +c604914420c8d86b2cbf67109e2c8a3729c7ef1f assets/modern_industrialization/items/steel_bolt.json +3ce69b739db735a0af4d0a6a1fe2bfc0d26ae4bf assets/modern_industrialization/items/steel_compressor.json +5323f5d12fa29dab680c66a692f7016fa8b8b153 assets/modern_industrialization/items/steel_curved_plate.json +4f91c9945bddaab7040e16ef422de02b1c189db2 assets/modern_industrialization/items/steel_cutting_machine.json +209a1d6bbd71f4ad1592ada1cf42569ab61c1749 assets/modern_industrialization/items/steel_double_ingot.json +f9065db2f5c8804ff718ae82fc241c36f67a44ef assets/modern_industrialization/items/steel_drill.json +bf38e3e3c800f41fbae9eb77a47798adbce4d942 assets/modern_industrialization/items/steel_drill_head.json +e814ea45152176f55e47db32198deb9b02e4b5a2 assets/modern_industrialization/items/steel_dust.json +22de675c4e12dd5874113389a34c4ef73f5f950a assets/modern_industrialization/items/steel_fluid_input_hatch.json +eb8b9d105a41652a7962c2de9c6f02fb5db9147d assets/modern_industrialization/items/steel_fluid_output_hatch.json +a80bae25d413373fbe433274b68295060f2d7cbf assets/modern_industrialization/items/steel_furnace.json +dc7e9afe38291df92c51c838a8cbc6d724ece780 assets/modern_industrialization/items/steel_gear.json +ba2e48536ad85a34ff8376d733cbc2a98ccc22ec assets/modern_industrialization/items/steel_hammer.json +16d94a7d8b806b3ee3c85a9b247c15bf90d91642 assets/modern_industrialization/items/steel_ingot.json +6456525aa5137c06e63a5252f79c47a4cb99fddd assets/modern_industrialization/items/steel_item_input_hatch.json +edfa75e5cc0f1c6459f2084f5fbaa9c4ab98e7e1 assets/modern_industrialization/items/steel_item_output_hatch.json +ca1e76a0be9d9c1a08793c157564ddd56a25775a assets/modern_industrialization/items/steel_large_plate.json +9ddf938b8803ab6b621fbf1c75f495b0c19db352 assets/modern_industrialization/items/steel_macerator.json +9ed149e7d3e1ad3e8c9622d3555486a6c84b549e assets/modern_industrialization/items/steel_machine_casing.json +707da3e1e16988f9c08098186a89f0e2b2812a3d assets/modern_industrialization/items/steel_machine_casing_pipe.json +5bf0263d32a379fea3db3403583d610a8b4b122a assets/modern_industrialization/items/steel_mixer.json +776c080ac36afaf4d0189e8a6e23ee75b7bde978 assets/modern_industrialization/items/steel_nugget.json +0a188b1b07669c8315021ecfbd6ceeee4a56b734 assets/modern_industrialization/items/steel_packer.json +817b98972fe184978a9749c5ad84c98aeb74210b assets/modern_industrialization/items/steel_plate.json +79ed515b91b70b491cdc9757c1e6b6ac360bd8c5 assets/modern_industrialization/items/steel_ring.json +99b1182991bb16850c4eeebbdb9fdd2480098dee assets/modern_industrialization/items/steel_rod.json +ace56e22f9c72897ea8a609a1111927822c8b431 assets/modern_industrialization/items/steel_rod_magnetic.json +b797e074805b6216cb4a59b7e58fc52af16a3aa7 assets/modern_industrialization/items/steel_tank.json +65f186cd73800ac27126c49d12590466698963f2 assets/modern_industrialization/items/steel_tiny_dust.json +c2bb3b1d40dfef584a67300648d7fb486cdd1e46 assets/modern_industrialization/items/steel_unpacker.json +fdb2e550d506a3a2c08ac6ca4cfc4ed03f20148e assets/modern_industrialization/items/steel_upgrade.json +db96c22d696ace32f1612c901fdeae7ed7e6c7e2 assets/modern_industrialization/items/steel_water_pump.json +1740d765badaa1df2aae05e7c50d4bf9db4453be assets/modern_industrialization/items/steel_wiremill.json +29f4b56c982ec3e8e7350a17077d59662747f440 assets/modern_industrialization/items/styrene_bucket.json +425b3e515878e7de34d60805e39edc7d0e91a776 assets/modern_industrialization/items/styrene_butadiene_bucket.json +a4163ff9163dc2adb0b9df34fb981dabfaa25a3c assets/modern_industrialization/items/styrene_butadiene_rubber_bucket.json +ec3268b89ab32b12396f713797cdc494784b461c assets/modern_industrialization/items/sugar_solution_bucket.json +e1fc4db786b7ca39eafe6a64ac3296fa0ef5b0fb assets/modern_industrialization/items/sulfuric_acid_bucket.json +788a5e731f06e655579e7736872f452e97547dfe assets/modern_industrialization/items/sulfuric_crude_oil_bucket.json +98c18ff94ac107e54d928ade41d693bac6346edb assets/modern_industrialization/items/sulfuric_heavy_fuel_bucket.json +a3b7588b4927bef3ab5fe942e41be4c0ff9283af assets/modern_industrialization/items/sulfuric_light_fuel_bucket.json +3bc6a7e7168549d7d7eab363e4efdd6c7f899617 assets/modern_industrialization/items/sulfuric_naphtha_bucket.json +e366df54241db722d770d2ef0a1e34f76178cce2 assets/modern_industrialization/items/sulfur_block.json +8b8c1a4df4367a1c3fd27f8848fd9062cba0ad71 assets/modern_industrialization/items/sulfur_dust.json +02cd49ce91211b0ccdb826d476cb2594d20f6e6e assets/modern_industrialization/items/sulfur_tiny_dust.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/superconductor_cable.json +e9082de8922940334a36bf96461fdec77ec4d81a assets/modern_industrialization/items/superconductor_coil.json +b4f1ed04483b7ec5226c022e4df82b42f3cc33b5 assets/modern_industrialization/items/superconductor_double_ingot.json +62607b3fec763219ab8a4fc87a5afa9ea012011e assets/modern_industrialization/items/superconductor_dust.json +bf856b515b75d342c70276cabd89561ef55d77e3 assets/modern_industrialization/items/superconductor_energy_input_hatch.json +7846a9a8202b6d6da607b75627c18db2c104d7f1 assets/modern_industrialization/items/superconductor_energy_output_hatch.json +f9b293854aab0c07e8b27326af71d0c0b73fa7d8 assets/modern_industrialization/items/superconductor_ev_transformer.json +17b03111fe8ec7aa59d2ba8241fecbf090ca4b3f assets/modern_industrialization/items/superconductor_hot_ingot.json +396f9b47898309f86d7a229948138a1a15593e0a assets/modern_industrialization/items/superconductor_ingot.json +38fceff03b54312eb4d12a72163c8187b63d82c8 assets/modern_industrialization/items/superconductor_nugget.json +8d501263ddd14c45ffe6af89d9c71426d0f96c5f assets/modern_industrialization/items/superconductor_plate.json +9da2de8a144a2f3031deff0f74f682762ef30867 assets/modern_industrialization/items/superconductor_storage_unit.json +7a9c050f77fdd2de7bcfcb2ac4c47651e417017d assets/modern_industrialization/items/superconductor_tiny_dust.json +b056411747a88c83b17a48932082306f6ba83ac9 assets/modern_industrialization/items/superconductor_wire.json +a2abae2b2d48b0592316cc8dea6d21831685bdd0 assets/modern_industrialization/items/synthetic_oil_bucket.json +2ea646aa6a5f5a94e30d364de0ba7e198dd96324 assets/modern_industrialization/items/synthetic_rubber_bucket.json +27c91ad1ff2943f3b129d8dede6bad32e401e634 assets/modern_industrialization/items/tin_blade.json +c5eec9cda2dd14dd53b7c920c19daffe045092d5 assets/modern_industrialization/items/tin_block.json +201aacaf8ad4e6188255d61340e1a3e5955b5654 assets/modern_industrialization/items/tin_bolt.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/tin_cable.json +9b3a1a661af1093f70fe49cccf7a43643b32ad8c assets/modern_industrialization/items/tin_curved_plate.json +73c9e19d19f83a7e8a253c2dc48207d511c375e8 assets/modern_industrialization/items/tin_double_ingot.json +d57eaa15b4efada018aab64f526bcb68ba1d3ccb assets/modern_industrialization/items/tin_dust.json +9ef733ba492298843ab860c75960666fe1b23da0 assets/modern_industrialization/items/tin_gear.json +f170d5f200e35285dc2dd2199d9a512a573fe60c assets/modern_industrialization/items/tin_ingot.json +dbe33594f4feffdaf44fe16f6ee75a34ac6ff531 assets/modern_industrialization/items/tin_nugget.json +c70305f150d8244558b7980c537bc8dafe2d48bd assets/modern_industrialization/items/tin_ore.json +8f1fa95e9aa018fae048979504260ed560988000 assets/modern_industrialization/items/tin_plate.json +6cd2e0b0115bb671aa8b469c3db689c31592cd6d assets/modern_industrialization/items/tin_ring.json +064ed3470ca3a8ac232c28f192ea38aa0e00bfae assets/modern_industrialization/items/tin_rod.json +4195c353428745634d53c25e0faf080cb7c7ecc1 assets/modern_industrialization/items/tin_rotor.json +5bc8fd1b16fa20884c6651e04ff1670f83a403c4 assets/modern_industrialization/items/tin_tiny_dust.json +eb9e4f2486798b52cc3d15baaa986406c78cbb2f assets/modern_industrialization/items/tin_wire.json +600669258394b4bf50fc42aa16d609d61335bc36 assets/modern_industrialization/items/titanium_barrel.json +927c24213838cdf394d61ef7fec05dd9dc9ed2c3 assets/modern_industrialization/items/titanium_blade.json +935978da774b42ae3ba8c1baf4532f4fef4e35be assets/modern_industrialization/items/titanium_block.json +af02939d17104a828eb994d6acba553b24becf2b assets/modern_industrialization/items/titanium_bolt.json +abb3c28ff54e1027f14533d0a3006e68fc029341 assets/modern_industrialization/items/titanium_curved_plate.json +61b6837b05788edcd9c2a63f0280bcb6f874b29d assets/modern_industrialization/items/titanium_double_ingot.json +2dc3b1504d059a30aa00e153cf233120f703a220 assets/modern_industrialization/items/titanium_drill.json +a5b3db2f870e0b54a48ea385099f9a9f4ddeedc5 assets/modern_industrialization/items/titanium_drill_head.json +7a21e8e5a0d64664fda38a6230f6f35ba8df4723 assets/modern_industrialization/items/titanium_dust.json +5803aff8aafe4e4fd9e7b16c80aa56fcffbacd19 assets/modern_industrialization/items/titanium_gear.json +126edba9b8fc0bcf4d4c9df3553a41e10435bb64 assets/modern_industrialization/items/titanium_hot_ingot.json +15adef083f2b502ab6b7899eb7bf2afa40e1ea69 assets/modern_industrialization/items/titanium_ingot.json +1c37ed7ae9e5be77b50f26bdd86ffc92d3365594 assets/modern_industrialization/items/titanium_large_plate.json +4b3755e568443f516c73abe6e1c998e3308517d2 assets/modern_industrialization/items/titanium_machine_casing_pipe.json +33dc356c0b691b3bd8940beecd6401fd4789224f assets/modern_industrialization/items/titanium_nugget.json +6fe5b0c13337d061b48f22c151e1584ddbed7aab assets/modern_industrialization/items/titanium_ore.json +6a10561b3ba90bf0d0eaac8c94334a64bcbafd69 assets/modern_industrialization/items/titanium_plate.json +d5ad515ced343f52989388fa527ed2b7e88fdb84 assets/modern_industrialization/items/titanium_ring.json +07637cdbb3a3826ed5fb182b68b30ebb4e8d4faa assets/modern_industrialization/items/titanium_rod.json +f7a906bfe079ae4d7e04e747a60484a5be63b129 assets/modern_industrialization/items/titanium_rotor.json +f8561012a7b9df7d877d1a28bd14e6566f5dd7cd assets/modern_industrialization/items/titanium_tank.json +a48cc851d81b2d69f993f32306740ba9fc6fbb71 assets/modern_industrialization/items/titanium_tiny_dust.json +9579005a734ac8ed4700c0c3588aaa1c38d44f8f assets/modern_industrialization/items/toluene_bucket.json +07d16d5b73f0e7f53ea3185c61b0dd8e4631e701 assets/modern_industrialization/items/transistor.json +250acae3e9a32e9bec821c25144e470d63142188 assets/modern_industrialization/items/trash_can.json +7a105f083e9f8e11355089457824d049565c2875 assets/modern_industrialization/items/tritium_bucket.json +bd47a8d65d5b4bc2920ad7f525b1740c4dd71d79 assets/modern_industrialization/items/tungsten_block.json +e6f65932b570c97ecb4740a414432b2f69808a67 assets/modern_industrialization/items/tungsten_double_ingot.json +be088dc9d8b691f9def7d87e0051801a15872010 assets/modern_industrialization/items/tungsten_dust.json +426af6bb2cfc44dd410ee3ba2d80037e528cf89a assets/modern_industrialization/items/tungsten_ingot.json +be3fb7cf348929b2bbcb0356d934a39faa5e2793 assets/modern_industrialization/items/tungsten_large_plate.json +b0f8690c3902b32a71cbbd5e3fc5c1312fc1c35a assets/modern_industrialization/items/tungsten_nugget.json +0cc6e45bc5b394487ae13c7cf89900d26df51ab3 assets/modern_industrialization/items/tungsten_ore.json +bc5ef40f8927bf919cf40c6a59abb24a8a7cb881 assets/modern_industrialization/items/tungsten_plate.json +497a51208720f48d7c03f4c481d875393f9d5662 assets/modern_industrialization/items/tungsten_tiny_dust.json +f4c993004b9dcffe4314f2d102c5385dfbdfd7de assets/modern_industrialization/items/turbo_fluid_input_hatch.json +8c61362c6ec123d9b042a23d35bf4da98083c632 assets/modern_industrialization/items/turbo_fluid_output_hatch.json +5d0e5fb8ba9c389f70efde4b76ce1445a2b6f9d1 assets/modern_industrialization/items/turbo_item_input_hatch.json +3547cdd75f648e079137498429df197bff08f24c assets/modern_industrialization/items/turbo_item_output_hatch.json +786a41f97d64cb9a91a3af5fc1d592bc3a9c51fd assets/modern_industrialization/items/turbo_machine_casing.json +be2f6544278f0d98a6d216dc6b061716d9af217d assets/modern_industrialization/items/turbo_machine_hull.json +d20b9486022bec7cdf954562e32678321f66242f assets/modern_industrialization/items/turbo_upgrade.json +2323ac0fb4708959b95e3276357d19cac1611038 assets/modern_industrialization/items/ultradense_metal_ball.json +ccef19b2ffc6530feaaa266827b60e4ef417c1ec assets/modern_industrialization/items/uncooked_steel_dust.json +275e453e17488a32d994e879da3396162cfa3c9e assets/modern_industrialization/items/uranium_235_block.json +cec68395bb6e30c092a582c325c1ee1de0b3981c assets/modern_industrialization/items/uranium_235_dust.json +e4e35c9cfc31ff1e1139553f3e29ce215ec2757d assets/modern_industrialization/items/uranium_235_ingot.json +c5884c59f86ced6e99aef1cccfe917d0a87918e8 assets/modern_industrialization/items/uranium_235_nugget.json +70f1c3d3c514927dff8021617ba3b32b1b4a5f1d assets/modern_industrialization/items/uranium_235_tiny_dust.json +aff8e09e47a51e30f2f73baa000b2b18bb7dfdec assets/modern_industrialization/items/uranium_238_block.json +8cb8a8cbaed65524a1b91f2617d956176fb28489 assets/modern_industrialization/items/uranium_238_dust.json +f5e3dc03d09b794e9fe23f18207184060fd72f6b assets/modern_industrialization/items/uranium_238_ingot.json +47cf0f2caf1d0e1ed377e586fd5e2458a30e131a assets/modern_industrialization/items/uranium_238_nugget.json +4e05b228baa395bcc793bbd31002f929a77100b6 assets/modern_industrialization/items/uranium_238_tiny_dust.json +6d9e41ce593dcf9836d974e5712888db010e5e64 assets/modern_industrialization/items/uranium_block.json +94455bec54f7c87c210dd875da2056146044c9a4 assets/modern_industrialization/items/uranium_dust.json +f6d8b374a3c2878461f80a4023ee785b28df19b8 assets/modern_industrialization/items/uranium_fuel_rod.json +68eef7afa9461f3dc581f50a5f668f1248954088 assets/modern_industrialization/items/uranium_fuel_rod_depleted.json +c80c97588d75690b28692bfb73f3e9c8eaefa172 assets/modern_industrialization/items/uranium_fuel_rod_double.json +135f72193586a00fd4a861cf20e71afb15f2bfe9 assets/modern_industrialization/items/uranium_fuel_rod_quad.json +bcccb0e71fe6b78fbdcdcc211577f9795ce38fa0 assets/modern_industrialization/items/uranium_ingot.json +973df69b2cb82469086d9bd363d917a90ff4e672 assets/modern_industrialization/items/uranium_nugget.json +d7274f3230542cbe49183c8754ec5e17e4bf6b5e assets/modern_industrialization/items/uranium_ore.json +e678e1f0d22edb7f0a2b50801aaedbfb8bd3132b assets/modern_industrialization/items/uranium_rod.json +3f74d21d3d2a92f1bc8d05de63b9868a764a4b9f assets/modern_industrialization/items/uranium_tiny_dust.json +f648e24f624c0b874014a1d8b4f58314a342f025 assets/modern_industrialization/items/uu_matter_bucket.json +433ef393ac02bbeb2b8eb5ea2f7878d36868982d assets/modern_industrialization/items/vacuum_freezer.json +266204429a4229e65e55f46cf10e5031e4250268 assets/modern_industrialization/items/vinyl_chloride_bucket.json +c16a4adc78eb34d8755e7661342f23ebb9d3c3cd assets/modern_industrialization/items/wax.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/white_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/white_item_pipe.json +3da2d2b2a3d94164d5c5f3b95919a65270dfd8c2 assets/modern_industrialization/items/wood_pulp.json +bfa8d55ca9f0a217a2fb0a62a1d9dbab4e36482e assets/modern_industrialization/items/wrench.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/yellow_fluid_pipe.json +45d261cebf53d51b810c061952dcd1ac10e4d5dc assets/modern_industrialization/items/yellow_item_pipe.json +d29e8ef08001a56fd745a79012ed2ab3f38ed8ae assets/modern_industrialization/items/yttrium_block.json +c11adf7207ec4d48c321232d87998e5847f19c70 assets/modern_industrialization/items/yttrium_dust.json +3bed02d05440a37008d00ede2558de8f65276f5e assets/modern_industrialization/items/yttrium_tiny_dust.json +94beafd19a89e6e158b3074d4173b8f83509f4f7 assets/modern_industrialization/models/block/advanced_machine_casing.json +002b76f781d2a54d6d826e14d6c2035871d509b0 assets/modern_industrialization/models/block/advanced_machine_hull.json +f42bc2df35143bc6f737f1bece445dc55567648b assets/modern_industrialization/models/block/aluminum_barrel.json +e728a336d91dd56e5469037eda168828ef25f5c2 assets/modern_industrialization/models/block/aluminum_block.json +3c58b303d67d4abaf91e8b4520abbf8bb97d0912 assets/modern_industrialization/models/block/aluminum_tank.json +20e14ac17471859bc6f69a5352988650603535e0 assets/modern_industrialization/models/block/annealed_copper_block.json +c6247389c361ab40be8f881d980d42252092f48a assets/modern_industrialization/models/block/antimony_block.json +e27dbdfbcd575239799617e6fd28f5c4af7e09cd assets/modern_industrialization/models/block/antimony_ore.json +bb2e61e926a7e2a7a6b45c05dab0589d31e06223 assets/modern_industrialization/models/block/basic_machine_hull.json +f858532ce3eaf88e3b192e4b907f178cf9c72fe1 assets/modern_industrialization/models/block/battery_alloy_block.json +bac697d95dcec2c2f6ebc0740cc77aaf66b1ac98 assets/modern_industrialization/models/block/bauxite_block.json +b351f26a36ad21c68530905fce027d0889f4629c assets/modern_industrialization/models/block/bauxite_ore.json +65b3350158984c7c570ff9ca5b9d90af62b8cc13 assets/modern_industrialization/models/block/beryllium_block.json +7e5514922beb5450becc0bd6d7c693ed61320580 assets/modern_industrialization/models/block/blastproof_casing.json +9f9adb468996fbe1ab4f6cbf1647ea95fd9d8a1b assets/modern_industrialization/models/block/bronze_barrel.json +d5b5f7264ab912b75e6b85416dbbce6b33601b9e assets/modern_industrialization/models/block/bronze_block.json +50b0bb6357245524953fc7b5fa199446e221b463 assets/modern_industrialization/models/block/bronze_machine_casing.json +fdb1e9d4a4e4eb3bac9847085b7c5387e6e6d427 assets/modern_industrialization/models/block/bronze_machine_casing_pipe.json +c2b6affcaec9358047b1d8dbd09efb5346f96efe assets/modern_industrialization/models/block/bronze_plated_bricks.json +00c5201fd068e61b80ab42dccd543f90858f4e0e assets/modern_industrialization/models/block/bronze_tank.json +ac84b02b726259c30cc836b21907c7c8291d7118 assets/modern_industrialization/models/block/chromium_block.json +0d7d29581e59d503aaffd6b6d04dcf8c61712019 assets/modern_industrialization/models/block/clean_stainless_steel_machine_casing.json +82a7228cc4c0bea7823cc3932eb2e4be32f7fdf5 assets/modern_industrialization/models/block/coke_block.json +8800737ea102f72ad199abf7c0cf71c5e6503790 assets/modern_industrialization/models/block/creative_barrel.json +d6a2d213e68109d36402344a0b87881eea42b916 assets/modern_industrialization/models/block/creative_storage_unit.json +62ed1a39da3ef75ca5804a45defbed771a6f5b22 assets/modern_industrialization/models/block/creative_tank.json +db13081313160f83ef961d483c991cb8263b06ce assets/modern_industrialization/models/block/cupronickel_block.json +4d63b03ee3b7b9da07f62a21a75920133a54b32d assets/modern_industrialization/models/block/cupronickel_coil.json +aa927f541bf18e5ec982db667f7a9d0de7a66f03 assets/modern_industrialization/models/block/deepslate_antimony_ore.json +472509658c89774701d5f2deff18b33fa9b650ce assets/modern_industrialization/models/block/deepslate_bauxite_ore.json +837a2b1bf031f0b06f06ad28d5a1ae347a3caa4b assets/modern_industrialization/models/block/deepslate_lead_ore.json +76650a64aa6a5a5af644fd5098d01e0c33b78662 assets/modern_industrialization/models/block/deepslate_lignite_coal_ore.json +02122b6e2904bf5de4e4fb7f67c159f0abd2a516 assets/modern_industrialization/models/block/deepslate_monazite_ore.json +1e347b8cf30a498f611d3e117f73fc48842d7a18 assets/modern_industrialization/models/block/deepslate_nickel_ore.json +5f47130eb629a1223cd779af9091877a07fb78fe assets/modern_industrialization/models/block/deepslate_salt_ore.json +45a82df152acf0433444b8693ff7c95714fcc692 assets/modern_industrialization/models/block/deepslate_tin_ore.json +16cdc7379ed8bae7ec87980758503d79e7ed8e69 assets/modern_industrialization/models/block/deepslate_tungsten_ore.json +8402dacba3bd46fa0c3d5075059c68de0adc60fb assets/modern_industrialization/models/block/deepslate_uranium_ore.json +8f7fdf38a5a38abe96f4ed60c3beb9e5469c2dfb assets/modern_industrialization/models/block/electrum_block.json +c97b941813053f0f97929e162a3d8a2a778a16da assets/modern_industrialization/models/block/fire_clay_bricks.json +145a7a796a7e416b055ae7bcf53ab94c57ef6496 assets/modern_industrialization/models/block/frostproof_machine_casing.json +14ee3a00e68ce939e494b84434675dd95dec1185 assets/modern_industrialization/models/block/fusion_chamber.json +8d0754b1515c4907b7aff0c284120450f13d92f0 assets/modern_industrialization/models/block/heatproof_machine_casing.json +ecb7bf7f373eb2b2118a7428242a596568db0938 assets/modern_industrialization/models/block/he_mox_block.json +9da1bf56d81c8ea40fa6ea0216ddc48ad9217db1 assets/modern_industrialization/models/block/he_uranium_block.json +153c39f640ed563874e234327e0c2f951e5a2a6a assets/modern_industrialization/models/block/highly_advanced_machine_casing.json +786f6c2882c16adc1b326ec351cbdd035bce27c9 assets/modern_industrialization/models/block/highly_advanced_machine_hull.json +2ff75f7bad9d80422296e39b026a05cd26e24556 assets/modern_industrialization/models/block/industrial_tnt.json +1353f6a2bb4e2afdda7aa23a047d5d94b2544e40 assets/modern_industrialization/models/block/invar_block.json +505372cd93acd72c5ac0b6d8b8127e1af6dbca0e assets/modern_industrialization/models/block/iridium_block.json +8d443e3f8662065592fc8aebc302137ed40f9a67 assets/modern_industrialization/models/block/iridium_machine_casing_pipe.json +dfe4d07752908f2bcd51bac04d8573e9645e7d41 assets/modern_industrialization/models/block/iridium_ore.json +b430c02e3babaf5d4f9c38e3dec968e76cbe2ade assets/modern_industrialization/models/block/iron_barrel.json +dd21c312dbcc04197af43ef8cb178f4609910091 assets/modern_industrialization/models/block/iron_tank.json +990da395b37e42b1023000b6f101381c4e3ce0f2 assets/modern_industrialization/models/block/kanthal_block.json +546f8b06506b56832a8afe1295a138d0ce79d585 assets/modern_industrialization/models/block/kanthal_coil.json +b254aa7b8b16d49839e34f87cdedde6ed48ded9a assets/modern_industrialization/models/block/lead_block.json +3e1077467f6eb0d79a15a1e82874593c4ddfde2c assets/modern_industrialization/models/block/lead_ore.json +86d8cdfd599a52d74390ebabe0d359aacb419825 assets/modern_industrialization/models/block/le_mox_block.json +81aac20fdcb554407321015c807339aeeaa23f22 assets/modern_industrialization/models/block/le_uranium_block.json +4554c9460971256668db5f3f9223b65921c97dcf assets/modern_industrialization/models/block/lignite_coal_block.json +fb16d63006d1f6f298daabe9a2e73656edca43d9 assets/modern_industrialization/models/block/lignite_coal_ore.json +933f4e066f0c245b2ec3de8fb536c9ac589dc1b6 assets/modern_industrialization/models/block/monazite_block.json +7b77c1d55333db12ed47a413cb0909b0bf638499 assets/modern_industrialization/models/block/monazite_ore.json +0a1155636b1bd42db67300be8b6e6cd63faefd01 assets/modern_industrialization/models/block/neodymium_block.json +2f726c4d8306fa0e1ed5a79a40325e2f6f4edd17 assets/modern_industrialization/models/block/nickel_block.json +9ac06875f6cb2c4f9dfad0d66fa5934f2d453934 assets/modern_industrialization/models/block/nickel_ore.json +a5bf0d483bd388437a2acc44c462f0cd23d21abf assets/modern_industrialization/models/block/nuclear_alloy_machine_casing_pipe.json +21351a04a8ec395f2032b26756facc61c2d500d4 assets/modern_industrialization/models/block/nuclear_casing.json +6abee507253dffb4b28882de8006e00f74e1fb2b assets/modern_industrialization/models/block/nuke.json +0d08a83ccbed27eeed8eeb5636e1de1852fe9a21 assets/modern_industrialization/models/block/plasma_handling_iridium_machine_casing.json +0ec7ff0e12d2fd5ec9ed24e3e326181efa9a9616 assets/modern_industrialization/models/block/platinum_block.json +a3f477e1899e504378b58326dfad80ed82c7226c assets/modern_industrialization/models/block/platinum_ore.json +ba77e9568a6125ea28772dc26f0e4e103726ce56 assets/modern_industrialization/models/block/plutonium_block.json +d0f9a201d36d642258f6884efa1f9304825783c9 assets/modern_industrialization/models/block/quantum_barrel.json +4dbbc1171de5747d849f3ad5bbc0907604326de5 assets/modern_industrialization/models/block/quantum_machine_casing.json +8646c16b69635cd935f4e4eed14fda9d836815b9 assets/modern_industrialization/models/block/quantum_machine_hull.json +ddc3043aede64014ee4c375f5e12999f0a367054 assets/modern_industrialization/models/block/quantum_tank.json +bccf5af67694d7206ab5ef24e7a7332906e21741 assets/modern_industrialization/models/block/quartz_ore.json +1dcf992113553b3f5f703b1679f0ce428a7b41c5 assets/modern_industrialization/models/block/raw_antimony_block.json +458f1641b72f23074cfb69faa708e53e9f1d0e5f assets/modern_industrialization/models/block/raw_iridium_block.json +a9bd3235187f6c19bb64135f6cbd4c2f4ab220f7 assets/modern_industrialization/models/block/raw_lead_block.json +50a291b5249d1e7026c241318ffe856a88bad4ef assets/modern_industrialization/models/block/raw_nickel_block.json +9e452568f292f7df92e27e2e2d7d1019d46c6ded assets/modern_industrialization/models/block/raw_platinum_block.json +5980547a8f0a0a4f021b11ee37bcb05156e23f05 assets/modern_industrialization/models/block/raw_silver_block.json +2d5aa6165fef56182777c7dd202c4396fb013a14 assets/modern_industrialization/models/block/raw_tin_block.json +5268a9521ce8935af1edd7d1369e814426dad6b6 assets/modern_industrialization/models/block/raw_titanium_block.json +ac0899e0a3f94220a1edfabc459f73b4224381a6 assets/modern_industrialization/models/block/raw_tungsten_block.json +8bc7b44a48896332735880ad5da22273cb1332a3 assets/modern_industrialization/models/block/raw_uranium_block.json +aca87775b774129f5214345b2c377ac950d878f1 assets/modern_industrialization/models/block/salt_block.json +c135f62e65f9f233cfa98f0c25877a2975ec4cb7 assets/modern_industrialization/models/block/salt_ore.json +64a99c034f25a419e7df92994c6edb91bf0959ad assets/modern_industrialization/models/block/silicon_block.json +f795acae8059460aa1f2d1c5228d902560fbea52 assets/modern_industrialization/models/block/silver_block.json +eb5dda338fca25537f81ba96064344263140cfe1 assets/modern_industrialization/models/block/sodium_block.json +a20e16ff555c023883a15b1a70435c90bc663506 assets/modern_industrialization/models/block/soldering_alloy_block.json +4bdb453c6ae656b228519904df539c4baf1fecd3 assets/modern_industrialization/models/block/solid_titanium_machine_casing.json +e8704a9204a8312b6086256bfc660237e5607cf5 assets/modern_industrialization/models/block/stainless_steel_barrel.json +cd8a0e1abd8d88890fa1f940abef5d21f9bc1a6c assets/modern_industrialization/models/block/stainless_steel_block.json +b3d6e84fc427386ccde8c2dc2b1997d631af70c5 assets/modern_industrialization/models/block/stainless_steel_machine_casing_pipe.json +eaa8e31b9c55f2127b9ff4cf6171b3cf9584b713 assets/modern_industrialization/models/block/stainless_steel_tank.json +32b0115ad2662e47a7765a6fd8e74495ab8642f3 assets/modern_industrialization/models/block/steel_barrel.json +0cfc46526f65b8af6cb7a9812414c836586b714d assets/modern_industrialization/models/block/steel_block.json +5142699818c93340fc0d7733fb66b183a283abe4 assets/modern_industrialization/models/block/steel_machine_casing.json +27078fb186d9f8b271288c396d62fa478073be7b assets/modern_industrialization/models/block/steel_machine_casing_pipe.json +8502851428d725e47735dbca39f03a77d4ff3903 assets/modern_industrialization/models/block/steel_tank.json +6718fdfcb1b39f1bc76b3b315c99592dbcc1e6a7 assets/modern_industrialization/models/block/sulfur_block.json +00551e5444f51ff8da2f899b92d09d3835e99ad3 assets/modern_industrialization/models/block/superconductor_coil.json +8fe7101d68e71ccde4244c1a71a3ae35fc9e86a0 assets/modern_industrialization/models/block/tin_block.json +30c37e2492bc63a054c7c2e2c8ca992216fdee0f assets/modern_industrialization/models/block/tin_ore.json +6514edf512e0db6b42df7b659073c7ea16af717f assets/modern_industrialization/models/block/titanium_barrel.json +60cd8dee147846596a3a30dd7f639f1ae5283eae assets/modern_industrialization/models/block/titanium_block.json +2b5c41809012aee4b5751471a8d6a7a1cc83339c assets/modern_industrialization/models/block/titanium_machine_casing_pipe.json +283664c9adac445b1dc7dfd244d1a9d2093ae2b3 assets/modern_industrialization/models/block/titanium_ore.json +c02793a41ef9e134c2654f5d30fbac747a0f65b2 assets/modern_industrialization/models/block/titanium_tank.json +b0b465db24b114dc31928151c3dc511d4c453a14 assets/modern_industrialization/models/block/trash_can.json +c50e8627603cb6bbc3a13f8e4e9a18e50155be1a assets/modern_industrialization/models/block/tungsten_block.json +9df2b6a100256bb643a58bc3889cee745a2f9dff assets/modern_industrialization/models/block/tungsten_ore.json +96252487e6215e02449605a78aa068f6ae5de3f3 assets/modern_industrialization/models/block/turbo_machine_casing.json +3c48c745530de291fab1f24f7c0f665e7402fccb assets/modern_industrialization/models/block/turbo_machine_hull.json +29cfd8f5c946fc4d0bc9acb5d53dfb136ca7fedd assets/modern_industrialization/models/block/uranium_235_block.json +feb5154d9b44ab2568facccc6ff78286be758758 assets/modern_industrialization/models/block/uranium_238_block.json +707157e9c4340dd00a43696deeee4eb20f69a87d assets/modern_industrialization/models/block/uranium_block.json +1e9d64a11b7d92fd4d6987048cd3e85b1ccf23ac assets/modern_industrialization/models/block/uranium_ore.json +f1b2a93d56d1af0a2bd1d73ffcdd93e14293fb35 assets/modern_industrialization/models/block/yttrium_block.json +dce2e0175bff04f24fcf72f3cfec6e338d41b981 assets/modern_industrialization/models/item/acetylene_bucket.json +6badf6f5348a1c893f8effc6336f0a04f39b2adf assets/modern_industrialization/models/item/acrylic_acid_bucket.json +7e46eab2a8b46937f2e372a97b948ce7db95f139 assets/modern_industrialization/models/item/acrylic_glue_bucket.json +0720e7078600ec3441fb6b74685f74b127afd5be assets/modern_industrialization/models/item/advanced_motor.json +fb8bd590ab2e881400b6a89e3c5906ca1dc3f23c assets/modern_industrialization/models/item/advanced_pump.json +f2aaa918ae9e85ddf85d0339a6c5dd25ec2e2eff assets/modern_industrialization/models/item/advanced_upgrade.json +522b05a10c173850a4555938ae041b5b92bf5b6b assets/modern_industrialization/models/item/air_intake.json +d231b21606d8b2f8427cfdd09bd4fe1d3a2c2b0c assets/modern_industrialization/models/item/aluminum_blade.json +fc3fae3f916040564d478c58d84a81ef00f00e16 assets/modern_industrialization/models/item/aluminum_bolt.json +dc08d767b3d0c73e1b3f901b2cc367ad204649a0 assets/modern_industrialization/models/item/aluminum_curved_plate.json +b49e2cb6a101e72918febafab2cda5be906e1abc assets/modern_industrialization/models/item/aluminum_double_ingot.json +a79750d50007d94a2d3e520eaabc30ba4ed62391 assets/modern_industrialization/models/item/aluminum_drill.json +d7a542f1efc4c478428fd044c451bfd85c8c9ad2 assets/modern_industrialization/models/item/aluminum_drill_head.json +e7ee9d717820f85fa943e64622c31e01ce5205ad assets/modern_industrialization/models/item/aluminum_dust.json +d0ac6bf8fe61a19f56bcc3836a4157efd9b654ba assets/modern_industrialization/models/item/aluminum_gear.json +bff3ba0049473aadc6213708ea1764e09cfc40b1 assets/modern_industrialization/models/item/aluminum_ingot.json +ac69f2c6ba8582f18c1b14f1070ce359895e1765 assets/modern_industrialization/models/item/aluminum_large_plate.json +5cb2a0e972a780c04385fd728e55bf9ca9f01556 assets/modern_industrialization/models/item/aluminum_nugget.json +5078f10fe0416f6e7ef7b7212acff35c7225bb2d assets/modern_industrialization/models/item/aluminum_plate.json +dad3ffa80af5b67a9188fbc8365b53258b56419c assets/modern_industrialization/models/item/aluminum_ring.json +83be21ee23d4c6fdb5c0e30d0bc75f49462fa7ab assets/modern_industrialization/models/item/aluminum_rod.json +1ce4da69343a739a73cdf521ec8600a1c38f29bf assets/modern_industrialization/models/item/aluminum_rotor.json +8b573bb743a3229eecde70f38c5ffc892035f5be assets/modern_industrialization/models/item/aluminum_tiny_dust.json +ca798b277fc35b7b81d0d696543c43a074d6cdcc assets/modern_industrialization/models/item/aluminum_wire.json +d358584fb8edb5efd4d74f1155013676f6aa836f assets/modern_industrialization/models/item/analog_circuit.json +0b470236a38160ab49036332dba2fab759dd2a0b assets/modern_industrialization/models/item/analog_circuit_board.json +c71e7bda78381ddaeefa285c6ba98f0baf9bf785 assets/modern_industrialization/models/item/and_gate.json +9777200fcffbada06609aeb6f19f8a60b11372b7 assets/modern_industrialization/models/item/annealed_copper_double_ingot.json +04ea0ad78c693effa183a62c1db6f06c81d30e19 assets/modern_industrialization/models/item/annealed_copper_dust.json +2e32dce5ca4ae8c4da634ce61aa89caaac8419a2 assets/modern_industrialization/models/item/annealed_copper_hot_ingot.json +69a3fb1b5983b6bc2afd9f5e7408bc1dbaa74af9 assets/modern_industrialization/models/item/annealed_copper_ingot.json +459893ba0e2c9ba7713328a37d8165fe74e4b001 assets/modern_industrialization/models/item/annealed_copper_nugget.json +02efd677a63b07cd938d7763645659974f0eff40 assets/modern_industrialization/models/item/annealed_copper_plate.json +04949a99063fdbf357618771c9acc9648e5e5659 assets/modern_industrialization/models/item/annealed_copper_tiny_dust.json +7cad7e8c054b9fa29b945f36e981ed856ca2116a assets/modern_industrialization/models/item/annealed_copper_wire.json +28b35e5663b91c3fc47a2f085cc9203bd0b7aec5 assets/modern_industrialization/models/item/antimony_dust.json +36e9c08761e0e93f2b1e078c3218f03f25fdec01 assets/modern_industrialization/models/item/antimony_ingot.json +ffcf4dd7e6d55d04e9cf6ff8dc73be6fdf29147b assets/modern_industrialization/models/item/antimony_nugget.json +beb18594dc970bea4080d6c82c2a5149a6f24a86 assets/modern_industrialization/models/item/antimony_tiny_dust.json +f70946c629d4261cf0d3b3753ae2b60e9cf2c5f7 assets/modern_industrialization/models/item/argon_bucket.json +f209ffb49938aaa4185a58c6cf6beed0d2dc8000 assets/modern_industrialization/models/item/arithmetic_logic_unit.json +3fd0294126a8ef9da39bf99ec66d731d48e7217f assets/modern_industrialization/models/item/basic_upgrade.json +029c0a00a33c288036bb01972aa2d30e683c1d01 assets/modern_industrialization/models/item/battery_alloy_curved_plate.json +898b3e6a1e373ea890944de791266e3e70d3dbbb assets/modern_industrialization/models/item/battery_alloy_double_ingot.json +b48f7c24e370377009f6875c44115c810bae4e08 assets/modern_industrialization/models/item/battery_alloy_dust.json +f8ac1a13c2bb6537c08723c9c7cc6067d1e7ef95 assets/modern_industrialization/models/item/battery_alloy_ingot.json +182fa0d43351b70205495e0c752d6d334f4dacf8 assets/modern_industrialization/models/item/battery_alloy_nugget.json +fa8f0368d71b0ebd4c74992af6421c8a7eee1742 assets/modern_industrialization/models/item/battery_alloy_plate.json +cbe0e6cae9a4b7fc174034e24a3cc64dce2b7a5e assets/modern_industrialization/models/item/battery_alloy_tiny_dust.json +98da5b489ac53722c27a71e652f19a715187b0a0 assets/modern_industrialization/models/item/bauxite_crushed_dust.json +dd2624938e4829e4ff585f49f6fd80076bae17c4 assets/modern_industrialization/models/item/bauxite_dust.json +7b3b546a2b59527cfeb2470a560f6e49791a33b3 assets/modern_industrialization/models/item/bauxite_tiny_dust.json +0e6f208232f5a3a1c2dd3f3b7523bab0caaf8aa3 assets/modern_industrialization/models/item/benzene_bucket.json +4a1f29429da025a2becdbeedc24abc0d14535456 assets/modern_industrialization/models/item/beryllium_double_ingot.json +0ea902fae8567dbe04abd61266700c5ca9ad9100 assets/modern_industrialization/models/item/beryllium_dust.json +a1131028929d4efcd018039ef3a7baf640abd7a1 assets/modern_industrialization/models/item/beryllium_ingot.json +3c281bef16b4324519f319899ff0c1525a45ccb5 assets/modern_industrialization/models/item/beryllium_nugget.json +17e869a2231fd4ffdc2f3ecafded86087e287d7e assets/modern_industrialization/models/item/beryllium_plate.json +dddfe65c9c9146e490e4f568660f043eeceaee06 assets/modern_industrialization/models/item/beryllium_tiny_dust.json +88ab7b5b9b63727a59353a69d1b74930cd453417 assets/modern_industrialization/models/item/biodiesel_bucket.json +74b745780bb3cc795d854153ae60633abc5fc145 assets/modern_industrialization/models/item/blastproof_alloy_curved_plate.json +724e39462c98d46483c58e2468d39c44a4d86593 assets/modern_industrialization/models/item/blastproof_alloy_ingot.json +1b4b86db3c8fd45e3a04d04070e44869b854a7be assets/modern_industrialization/models/item/blastproof_alloy_large_plate.json +344d054b75b0195b0a5003426f6b0b44bc0f9625 assets/modern_industrialization/models/item/blastproof_alloy_plate.json +91e112e43ef49f5d04422865e426f074589e0c90 assets/modern_industrialization/models/item/boosted_diesel_bucket.json +5a6f1a18054f8f4e1a528e5bd5aa6c9390dad940 assets/modern_industrialization/models/item/brick_dust.json +65048eea86e002ad676e36c3f918694a4377895b assets/modern_industrialization/models/item/brick_tiny_dust.json +43f28a84aa0bc44fbe15bdf2a9ac0d7d9106d572 assets/modern_industrialization/models/item/bronze_blade.json +0d57e1875c533c312d9a708af29fbbafe450a4ae assets/modern_industrialization/models/item/bronze_bolt.json +43632e937c7f9e697b0b001e92af2cadaf1eee42 assets/modern_industrialization/models/item/bronze_curved_plate.json +e0dfa05fe40c6b944ebf35312f04187f73755766 assets/modern_industrialization/models/item/bronze_double_ingot.json +596e3990a06c07756cbf6ce6cf5c7dae95d36ac1 assets/modern_industrialization/models/item/bronze_drill.json +dc9a8116a0d8754e3ca14ab7a8bdafa096b9834b assets/modern_industrialization/models/item/bronze_drill_head.json +5a0599ae7b3c0576c2927ab36bc58b752ce7a729 assets/modern_industrialization/models/item/bronze_dust.json +5ed5003f95d61a862fbbb111bafa9e639ba41ba3 assets/modern_industrialization/models/item/bronze_gear.json +0ab7adf8dd2fb8a3c38edfd8c99c700aa2b28867 assets/modern_industrialization/models/item/bronze_ingot.json +61ec64be67286ec70edd75fa05beda790041e110 assets/modern_industrialization/models/item/bronze_nugget.json +72363faccd68ca144aad34d74e1fb1021d25cbc4 assets/modern_industrialization/models/item/bronze_plate.json +3f108cc2671fab278dee23d155c533531a5779f5 assets/modern_industrialization/models/item/bronze_ring.json +e06e8a7aceabb8b13570f2e93b10925afd69fa5e assets/modern_industrialization/models/item/bronze_rod.json +dae45f66a1e8bfb79a4dc9a7aaabff0860364fc1 assets/modern_industrialization/models/item/bronze_rotor.json +2fa930c2ffdddf16f479646d58df6c1e8a22fb0f assets/modern_industrialization/models/item/bronze_tiny_dust.json +8585c7b1dfca4fe6661527a7c2e3f766b82c8148 assets/modern_industrialization/models/item/butadiene_bucket.json +9b451d8abb57fa3935acec5c6f233ed3b48a7371 assets/modern_industrialization/models/item/cadmium_battery.json +75b32ed310a3e0580179a083927c7dab1ad8945b assets/modern_industrialization/models/item/cadmium_control_rod.json +f3875b5e468897e0eaf9e779a683946c0a2a0cbc assets/modern_industrialization/models/item/cadmium_double_ingot.json +ec004a5f11c51c0cb42be785cb9fcb5cc7906630 assets/modern_industrialization/models/item/cadmium_dust.json +91e2e16610cb8a1d6fcc0443692b547644efeedb assets/modern_industrialization/models/item/cadmium_ingot.json +dd25facc43234e43230c75a920b403857c25230d assets/modern_industrialization/models/item/cadmium_plate.json +4c9b56458b28f14875a69fcdca70e67e11931edf assets/modern_industrialization/models/item/cadmium_rod.json +2a461461ffe7164d68b9544fe2c4a3c45f3f6c99 assets/modern_industrialization/models/item/cadmium_tiny_dust.json +bec852e53b085ef75b9594ceb074e02555878619 assets/modern_industrialization/models/item/capacitor.json +7ff9024457eab79e611ab3a67131f09d78d8f415 assets/modern_industrialization/models/item/caprolactam_bucket.json +d47ad816ee503498c6baeb7ea2f35792ba6f85c5 assets/modern_industrialization/models/item/carbon_dust.json +4d5790e967e2bedcbbd40453dc71ff6530673216 assets/modern_industrialization/models/item/carbon_large_plate.json +aa191ae062076bef770fa9b9c08ba2804899cf8e assets/modern_industrialization/models/item/carbon_plate.json +eb1dcc0c525b640a8aab9b418b3ba32ab71e0454 assets/modern_industrialization/models/item/carbon_tiny_dust.json +d458cbfe033debef78a97e462c2509d5b612f358 assets/modern_industrialization/models/item/chlorine_bucket.json +2e0b139f203fd02dfc55ba7a306e5f1363ef66ae assets/modern_industrialization/models/item/chromium_crushed_dust.json +b0f5048bf91a061a025d5e31d65322b629a3d9ac assets/modern_industrialization/models/item/chromium_double_ingot.json +ce18330d79407fb6e212d857b2186e47a376d42e assets/modern_industrialization/models/item/chromium_dust.json +05c03a1a984a2b6ad984c7796d870bd7e6e2e62c assets/modern_industrialization/models/item/chromium_hot_ingot.json +817e904df96339ebd0328e826a3022294af8ab8d assets/modern_industrialization/models/item/chromium_hydrochloric_solution_bucket.json +76ed1c41604111043a5a4e0848f4a843b71ce62a assets/modern_industrialization/models/item/chromium_ingot.json +47c31f5e91bc74971b257d7acae97550a83929f6 assets/modern_industrialization/models/item/chromium_nugget.json +ad2cdab241bc584573426f40eff59b2e56804711 assets/modern_industrialization/models/item/chromium_plate.json +6d76d5ad078fd1157629f70c65ba9455f6f43894 assets/modern_industrialization/models/item/chromium_tiny_dust.json +d1a750a1d4990f1cf80ad7127672b3bad9475907 assets/modern_industrialization/models/item/coal_crushed_dust.json +4eed2824a76ead712cdbda1de0ebb6068ddc2f2a assets/modern_industrialization/models/item/coal_dust.json +ba18891a720c75aff5f619f8c0f3504f3e19f4fc assets/modern_industrialization/models/item/coal_tiny_dust.json +63f85ac2c6aae4dbeefe687e5d7a6aca8305d5a9 assets/modern_industrialization/models/item/coke.json +3359b982919385b6fd4a515022034659f0a25893 assets/modern_industrialization/models/item/coke_dust.json +ad6c4d793785e51b2f4a2b692ea4ee4724989cf0 assets/modern_industrialization/models/item/config_card.json +7c33dc1bd1b95b82ccbd20376a231e7c3a51d641 assets/modern_industrialization/models/item/conveyor.json +07256ea71ac0e13fc42622b80619fa1d58e12e0d assets/modern_industrialization/models/item/cooling_cell.json +1eb7d9279c309ee2c9ad9860170f5277339a454e assets/modern_industrialization/models/item/copper_blade.json +ead2577a2096849a73bbb94e0d77e196e7f6966e assets/modern_industrialization/models/item/copper_bolt.json +43eded904be942339a32d1aeb12e21a72f1dbdb6 assets/modern_industrialization/models/item/copper_curved_plate.json +c774b34c3d500fa0666d8fb2e59dafce41b7a978 assets/modern_industrialization/models/item/copper_double_ingot.json +d22504da08789adb397e38de074906a853002f6f assets/modern_industrialization/models/item/copper_drill.json +ff6f1b77113401cf0f756486a0c19387562d14a6 assets/modern_industrialization/models/item/copper_drill_head.json +603c08f3315ed2f3165f217a57ccfe68d1b862fe assets/modern_industrialization/models/item/copper_dust.json +ef70787d2a2c7954e3f414d0f8ff2b6a2df9573d assets/modern_industrialization/models/item/copper_fine_wire.json +b20868b6364bc24176fcdf13ca20b5840ccca960 assets/modern_industrialization/models/item/copper_gear.json +ee869c39ed91b5ef7305291bb507028ee0a4b546 assets/modern_industrialization/models/item/copper_nugget.json +1badb2f75f3e73921d3f0b40cfd1bf0750c37947 assets/modern_industrialization/models/item/copper_plate.json +9299eaffbf28ee57d84cea90368e0fd883faf00d assets/modern_industrialization/models/item/copper_ring.json +8a6f78afe94b7aaaab21ea44bbbf1047ada68e8c assets/modern_industrialization/models/item/copper_rod.json +15b7bf45b0833dcfc9e011f13ade56a1fbc672e5 assets/modern_industrialization/models/item/copper_rotor.json +c506cb9ef746f24b88c54967016d3051f323bc50 assets/modern_industrialization/models/item/copper_tiny_dust.json +31c39e54a859ac16bf46da8d400c9b64b1ace687 assets/modern_industrialization/models/item/copper_wire.json +04b59de0d78b9c577265d632dd15b371acfe65e4 assets/modern_industrialization/models/item/creosote_bucket.json +774cec67513c9a2ba80edb7a7965f29fc57081c8 assets/modern_industrialization/models/item/crude_oil_bucket.json +f6cb543e7af31b09e575a5c7fa5f6bbc0cea32f2 assets/modern_industrialization/models/item/cryofluid_bucket.json +23f2381ee2300232089a46130e3b36687b0dad60 assets/modern_industrialization/models/item/cupronickel_double_ingot.json +448f3aa008725b8594b7909b1fc685236c91d7f9 assets/modern_industrialization/models/item/cupronickel_dust.json +cdd15f14ab985511e901ff8e853d91f0f19ac326 assets/modern_industrialization/models/item/cupronickel_ingot.json +5cbdcc526439f4bc667e851304acfa4fb1091de0 assets/modern_industrialization/models/item/cupronickel_nugget.json +abf5e2a6bc7fc6782be658144e24e795b53cbf78 assets/modern_industrialization/models/item/cupronickel_plate.json +5bb485a6b9c3e1dcb68f1feae50f098e8ccfdf80 assets/modern_industrialization/models/item/cupronickel_tiny_dust.json +579852e5338bf7dbb5876c24687649c0438dd066 assets/modern_industrialization/models/item/cupronickel_wire.json +825ca7f79d08d70bed96fa71b861254944893278 assets/modern_industrialization/models/item/cupronickel_wire_magnetic.json +1fd4aa65ba03a6c8e42e5cfcf80341085a66eb36 assets/modern_industrialization/models/item/deuterium_bucket.json +09e4c1bc8228aa89766242df5bc7cb1a9ce00d11 assets/modern_industrialization/models/item/diamond_crushed_dust.json +e3bc28612c50b2746675ef65e11c004020a3779f assets/modern_industrialization/models/item/diamond_dust.json +9ab3f8974b20df0bdc26ded8e83503045ff73d44 assets/modern_industrialization/models/item/diamond_hammer.json +07821f9d42e5b786ae5da5b2796fb5e082841095 assets/modern_industrialization/models/item/diamond_large_plate.json +b31c1df51585ea1fe1b7a57c51583ccb40346e81 assets/modern_industrialization/models/item/diamond_plate.json +1e2bef64806b57fad677d9299cb1cfd1aa789da4 assets/modern_industrialization/models/item/diamond_tiny_dust.json +7bd58f83ddef889903b19ac9280f642a91e68088 assets/modern_industrialization/models/item/diesel_bucket.json +217715582c32ee1f099da1dd3710fdfdcb6328bf assets/modern_industrialization/models/item/diesel_chainsaw.json +fae73d74b3b781e5a2efd136d219058ee3852a40 assets/modern_industrialization/models/item/diesel_jetpack.json +98532e4a26430f090aa318673fdf357063eb1efe assets/modern_industrialization/models/item/diesel_mining_drill.json +56e2e3032aa54d3614a4b4158569077f4c148619 assets/modern_industrialization/models/item/diethyl_ether_bucket.json +7b7af88256074d46687fe0f9f1fcca6cb2de78e2 assets/modern_industrialization/models/item/digital_circuit.json +a73d7fab347d1916f9b1db3ffd135dc010117a06 assets/modern_industrialization/models/item/digital_circuit_board.json +8512823614a616527d2b9c35b6ff8814d0a11ec5 assets/modern_industrialization/models/item/diode.json +0116e2e5b5e0ed3208bb125aa6787d62e9977f9f assets/modern_industrialization/models/item/electronic_circuit.json +4b7f4d95d5c192046da7b4e5b6522cd5a406b1b1 assets/modern_industrialization/models/item/electronic_circuit_board.json +91c99d708d7c06a87ab2e712c51abe45d838a251 assets/modern_industrialization/models/item/electrum_double_ingot.json +5b3e4db7b41cd992698f518fbf62332c5820d869 assets/modern_industrialization/models/item/electrum_dust.json +b56b8e3f323d90e16be0cc337cc430bd992bdf08 assets/modern_industrialization/models/item/electrum_fine_wire.json +cb096b9344dd6739d0de12233c9be660b5f90d3e assets/modern_industrialization/models/item/electrum_ingot.json +c7ab8dcc5821e1861d03aa38e3fccf66740c13df assets/modern_industrialization/models/item/electrum_nugget.json +3f7e587eb22cb1fe8ecd08c0f13abfa52811713f assets/modern_industrialization/models/item/electrum_plate.json +eb4ef9ed9ef99a3d8e95dd32ff632a6b156103d3 assets/modern_industrialization/models/item/electrum_tiny_dust.json +0f7078b8cc0e9385ea9b5b8ea1cf008d7e68bb56 assets/modern_industrialization/models/item/electrum_wire.json +4ebaf65f764234e223f87b220f43aca74ba5079b assets/modern_industrialization/models/item/emerald_crushed_dust.json +56778e3026128afc7e93b7af7a11a835a17faba3 assets/modern_industrialization/models/item/emerald_dust.json +36e822c0341b9d8514bd9d17ab0ce9723f2a7a5e assets/modern_industrialization/models/item/emerald_plate.json +f4d61691e55bbb0ebb1049ddda84cfc09af45d54 assets/modern_industrialization/models/item/emerald_tiny_dust.json +fa733f2627ac7da8efaa95a1a426e1b4db47eef5 assets/modern_industrialization/models/item/ethanol_bucket.json +73449e8d230e96e1f70434401eed3e1f243d5a40 assets/modern_industrialization/models/item/ethylbenzene_bucket.json +86add67ee326b37dcd418fad4f126de5e553b348 assets/modern_industrialization/models/item/ethylene_bucket.json +cfb274b236e1f6bfc979abf328177a5f2e547cb4 assets/modern_industrialization/models/item/fire_clay_brick.json +4ef25d64129e5c39faf4075fd3dc7d04a95e5eaa assets/modern_industrialization/models/item/fire_clay_dust.json +2d79953db46d55ff23dbf95394fe0daa61c83762 assets/modern_industrialization/models/item/gold_bolt.json +297cf1ca35106658222f1138d6bbb6fc272e9e0d assets/modern_industrialization/models/item/gold_curved_plate.json +b4acd888ab5476b8e25d3c5d298f2e86d2603c89 assets/modern_industrialization/models/item/gold_double_ingot.json +582effbcec988aaaeb5326e94e3955d92e21a0f1 assets/modern_industrialization/models/item/gold_drill.json +7ca5c32e78c287004b466b40099fef290e95bea1 assets/modern_industrialization/models/item/gold_drill_head.json +61dbf2839062caf5e390bb7ee9498843b92f1c8b assets/modern_industrialization/models/item/gold_dust.json +cf65a34069c8c681ff5f00150e623d6f87ea5d56 assets/modern_industrialization/models/item/gold_gear.json +9764b788efe17c2e9620077911e0b878a01cf0d4 assets/modern_industrialization/models/item/gold_plate.json +ce5576f1c3f95917d484df48c92edee09e259bc2 assets/modern_industrialization/models/item/gold_ring.json +f1a3a8dba2e3e5b6acc920b5eda461ed18a30e35 assets/modern_industrialization/models/item/gold_rod.json +9a54d57fd5feff13b9442d679cc24151fae32e98 assets/modern_industrialization/models/item/gold_tiny_dust.json +1623e269f41522c857fc9906323b47a78ac81793 assets/modern_industrialization/models/item/gravichestplate.json +73bf4f56bbb41805b111b058e97a9bea1beafd97 assets/modern_industrialization/models/item/guidebook.json +5b5a0116c8c184b8699009d4a68025693c02050d assets/modern_industrialization/models/item/heavy_fuel_bucket.json +d7acad2d93d453ac644366950ce54fd736c3bde8 assets/modern_industrialization/models/item/heavy_water_bucket.json +4a1ad5a2b7ff0ea094469cecde55a571a14855d7 assets/modern_industrialization/models/item/heavy_water_steam_bucket.json +7ee08ec12071d6c5e835e79c69b9eb5adfa7dc89 assets/modern_industrialization/models/item/helium_3_bucket.json +48300fc34fb4cee7683174c96aed74d30d4536e8 assets/modern_industrialization/models/item/helium_bucket.json +e8a0c5104d51fd633c33014459c03e2f668d7419 assets/modern_industrialization/models/item/helium_plasma_bucket.json +aef2ff2ff3b78010501b2cf062cbc25e2f485fb8 assets/modern_industrialization/models/item/he_mox_dust.json +6792fbe6b56b6f5b4a8f2b03bd016c12d438657e assets/modern_industrialization/models/item/he_mox_fuel_rod.json +34149e2f8c3b3951b6d9fabca025b258cbb7b8c2 assets/modern_industrialization/models/item/he_mox_fuel_rod_depleted.json +c6c227c0b65ce9b961ca2fc3f2d9e60535abee8a assets/modern_industrialization/models/item/he_mox_fuel_rod_double.json +fcd2e954326a38bfd9db4bef0c1495fc8c13d99e assets/modern_industrialization/models/item/he_mox_fuel_rod_quad.json +ac139e65301362d7d500152c9db9324e54c2cfb8 assets/modern_industrialization/models/item/he_mox_ingot.json +19201edbc5a1b9c7440ab6c5885e1d839d42dfba assets/modern_industrialization/models/item/he_mox_nugget.json +73e03aaaf0a26b059d207da04d0ad3f40f60761d assets/modern_industrialization/models/item/he_mox_rod.json +eaaec574789815eb01435c0dae3e996afdcc34e7 assets/modern_industrialization/models/item/he_mox_tiny_dust.json +06420e26a29a32c31c90b5da64d85d7b38986b67 assets/modern_industrialization/models/item/he_uranium_dust.json +180dd2340c7a60ae9f18dcea4f8b82fd3b5437c9 assets/modern_industrialization/models/item/he_uranium_fuel_rod.json +9d2d99fee9f662f4d18e37c59899f30ee8ef39ea assets/modern_industrialization/models/item/he_uranium_fuel_rod_depleted.json +90d73006f3bf1b8bcf55af7579f92561b9c4168d assets/modern_industrialization/models/item/he_uranium_fuel_rod_double.json +1e48836d1abe1af71ef005cdd18f026d75925567 assets/modern_industrialization/models/item/he_uranium_fuel_rod_quad.json +41520ffc22ad9198b52dcfa3bd11238416b302f8 assets/modern_industrialization/models/item/he_uranium_ingot.json +dc8bb882d33896db021b3af103042698c13bb7d3 assets/modern_industrialization/models/item/he_uranium_nugget.json +b03e9d07cd88286213c24796dbd36531658b0e4d assets/modern_industrialization/models/item/he_uranium_rod.json +bfa9dcc508c9517f1bbea8c9787da7c48b89803d assets/modern_industrialization/models/item/he_uranium_tiny_dust.json +d31074e4c9c06a540747b548df985db9d39d31e4 assets/modern_industrialization/models/item/highly_advanced_upgrade.json +75aa5b3b3ff9a1325d3a23f2acc099015c534289 assets/modern_industrialization/models/item/high_pressure_heavy_water_bucket.json +87813b487b204692449f7504c7ad865e851e8515 assets/modern_industrialization/models/item/high_pressure_heavy_water_steam_bucket.json +20a968f6f7e5a75021301a6ef526e2aa049347f7 assets/modern_industrialization/models/item/high_pressure_steam_bucket.json +b6a382c80ccca5e6ad2161a5fd9ac7140f690e2a assets/modern_industrialization/models/item/high_pressure_water_bucket.json +040f45f0d74de25e5d032687e6c53f94a655f002 assets/modern_industrialization/models/item/hydrochloric_acid_bucket.json +571df0e743d23fb0f1eca3a7eb0605166593dc53 assets/modern_industrialization/models/item/hydrogen_bucket.json +d78d6c1b419d776d742eb4d5057ed8f780c8162a assets/modern_industrialization/models/item/inductor.json +a7fb21563f3f0821ceb5112c87f34590e2b36a97 assets/modern_industrialization/models/item/invar_bolt.json +0787c386f453ad40be9f698615478e76b8c9f0be assets/modern_industrialization/models/item/invar_double_ingot.json +007f13a799bbd003f9f3b9774a0d174c52be95e5 assets/modern_industrialization/models/item/invar_dust.json +c58ba971098caabfe1ff327d9fcfc8647e20836c assets/modern_industrialization/models/item/invar_gear.json +eb53e9e52ce4360f14f25e18555b8b4dc158ce53 assets/modern_industrialization/models/item/invar_ingot.json +f0bda1181690305bec55990e3200225b594878c8 assets/modern_industrialization/models/item/invar_large_plate.json +4826e60d86559ae03da45e3f0b3f79a1ee19c1bc assets/modern_industrialization/models/item/invar_nugget.json +540a3d2c74966b83c7b8201067c677140b0dfd18 assets/modern_industrialization/models/item/invar_plate.json +37dd7875095ebfef5cb6a8496453b5e29f2ff5f5 assets/modern_industrialization/models/item/invar_ring.json +286a6dc1ff03efc5fe9bf52c228c44e90c574a54 assets/modern_industrialization/models/item/invar_rod.json +88409cbc4895e49feb4e1955fd462ce4acf9a9e7 assets/modern_industrialization/models/item/invar_rotary_blade.json +8c730c7621b4c9f59ca3b565909ed92df4bcf684 assets/modern_industrialization/models/item/invar_tiny_dust.json +ef74fd836aea3dc86b353eba2587160761c1a679 assets/modern_industrialization/models/item/iridium_curved_plate.json +e8d499273bcf2ded826d47e514cb7e1bc20a3e6f assets/modern_industrialization/models/item/iridium_dust.json +9f94420b3ce72a7884e19e0067c3021623cf09f2 assets/modern_industrialization/models/item/iridium_ingot.json +77ad70a5145e220679f11a5b030489b5e5ae2d2f assets/modern_industrialization/models/item/iridium_nugget.json +99cf0c9b65a569b0d0ea67a4dbfa2cf154f83b7a assets/modern_industrialization/models/item/iridium_plate.json +22ddff7ebfd8c12d97d3e8f8934fcf0b1d514fc7 assets/modern_industrialization/models/item/iridium_tiny_dust.json +fb1c4117520206465b02b044c8f7c0c1928fe8b6 assets/modern_industrialization/models/item/iron_bolt.json +1d6d3e9cd6d42bac0010c69a0db762428f8feebc assets/modern_industrialization/models/item/iron_double_ingot.json +150e2ee9cee8568853f55b6b50f7f353626854e4 assets/modern_industrialization/models/item/iron_dust.json +8c41c70a96e82d0ea16a3a37ab0f4d1977bdab1b assets/modern_industrialization/models/item/iron_gear.json +5ff52f32d1f34f7e053f51ee945f6ed5586c9d2f assets/modern_industrialization/models/item/iron_hammer.json +5c7ab4ed246eda4643f3dd0964f72528bcd71cd7 assets/modern_industrialization/models/item/iron_large_plate.json +466a5f0bb0375902031f9b2657e858d5736ff51b assets/modern_industrialization/models/item/iron_plate.json +5491974e273f3740dbf60a15a5517868b2a02b7d assets/modern_industrialization/models/item/iron_ring.json +994fbb9bbef1503bd1f51699b5bd43864c89e426 assets/modern_industrialization/models/item/iron_rod.json +c846f6638593dafce5ea7b623d6a92663b0192ad assets/modern_industrialization/models/item/iron_tiny_dust.json +0e6b611dc4684f301448029a3a1ad3a8548cf470 assets/modern_industrialization/models/item/kanthal_double_ingot.json +10c59b4f27e69ad78629f058f463be888c89e21e assets/modern_industrialization/models/item/kanthal_dust.json +77e08b2e70db7b322148c10abdb00d020985e279 assets/modern_industrialization/models/item/kanthal_hot_ingot.json +863b6668e54fcf4034d3c82688fa2a26067af556 assets/modern_industrialization/models/item/kanthal_ingot.json +05551a7b0ae7ccc18d8e017b956e3c73fd9cd411 assets/modern_industrialization/models/item/kanthal_nugget.json +5a03da99730d2a6a3f457ade712ea587749d9ff2 assets/modern_industrialization/models/item/kanthal_plate.json +1e7a92eefd71b6f8e61ad078cb1bba2d89cde724 assets/modern_industrialization/models/item/kanthal_tiny_dust.json +0eef5bc23b63a78e5b5f639e3b1751aecd57932a assets/modern_industrialization/models/item/kanthal_wire.json +ea2fec5c385e56afdb009e9ad01fe2142bd168c4 assets/modern_industrialization/models/item/lapis_crushed_dust.json +8d13f4318128bab08717497bb05524532ed2f7e0 assets/modern_industrialization/models/item/lapis_dust.json +c354659c399d13b96cd536bd84ccccfeefe37c69 assets/modern_industrialization/models/item/lapis_tiny_dust.json +41b8ca3cdbc335276dc6862849747f8a5f42de77 assets/modern_industrialization/models/item/large_advanced_motor.json +9d801dba7026e3ce75f324a176801c748c527da3 assets/modern_industrialization/models/item/large_advanced_pump.json +cb34f4d0875863f1868b52e0dbc56066545bc2fb assets/modern_industrialization/models/item/large_heat_exchanger.json +eb1a693f1e8961a461c67ae612cc0eabc59b60ad assets/modern_industrialization/models/item/large_motor.json +fa72f6f86cdf1df0b98e9b2b8b85a114996f4e6a assets/modern_industrialization/models/item/large_pump.json +affb44234d718c3ae3483f15d3273944afd4e197 assets/modern_industrialization/models/item/lead_double_ingot.json +4bdb2f37f8379e4701e0e390f5ed04e6b012c6de assets/modern_industrialization/models/item/lead_dust.json +dff929a4f08e0d89b47c687c00c9b68aad53fd5f assets/modern_industrialization/models/item/lead_ingot.json +b476c332c3a6c852621f88d831ddfd96a10bbf7b assets/modern_industrialization/models/item/lead_nugget.json +de10b04b53184360eef9717d5d296f399e6912d6 assets/modern_industrialization/models/item/lead_plate.json +130afff4430faaf7603a091563184047bcc2f7f3 assets/modern_industrialization/models/item/lead_tiny_dust.json +ba16940b5e2255ef0b7d3c2a4adaac0b6b9b97c9 assets/modern_industrialization/models/item/le_mox_dust.json +3ae8cfe6716adb18dbf477be96697413e00e30e5 assets/modern_industrialization/models/item/le_mox_fuel_rod.json +031651b0cdad4ad58e8be2943809a458df0c9f67 assets/modern_industrialization/models/item/le_mox_fuel_rod_depleted.json +f1c95dd2b11cc265bd0a83bf82abdcb55d814e41 assets/modern_industrialization/models/item/le_mox_fuel_rod_double.json +aa8041593ae0d1b992ff47d9f64ebfebcb55fe52 assets/modern_industrialization/models/item/le_mox_fuel_rod_quad.json +5c3a4639cb66dd597d3118450a93de6267472e5f assets/modern_industrialization/models/item/le_mox_ingot.json +fc39755cb5aeb7363cc900b5908020c8474b249b assets/modern_industrialization/models/item/le_mox_nugget.json +01f3c0a982b73d5bb3f04cddafeac7fe2b62b2d4 assets/modern_industrialization/models/item/le_mox_rod.json +d92be089d8f91a7a2e5a9142b6933b1b9b7f7d7c assets/modern_industrialization/models/item/le_mox_tiny_dust.json +adec7be548e71dea9ba7c5e965ffebd7cf4dd3dd assets/modern_industrialization/models/item/le_uranium_dust.json +f599ed80e65a2b174c49790c52f7d99cf9b880fe assets/modern_industrialization/models/item/le_uranium_fuel_rod.json +ccaf50b8d42eb5ea33d6557dbde015448fba9472 assets/modern_industrialization/models/item/le_uranium_fuel_rod_depleted.json +0358290720d3406332fc1f26b9a340d8adce58c3 assets/modern_industrialization/models/item/le_uranium_fuel_rod_double.json +33e775afeaebb25fe19791905f29c12a25307959 assets/modern_industrialization/models/item/le_uranium_fuel_rod_quad.json +062eaef663e61996af59d6aee9f0ddc23546998b assets/modern_industrialization/models/item/le_uranium_ingot.json +ce2b5a38ba8c23736d051dac081df671a50a76c3 assets/modern_industrialization/models/item/le_uranium_nugget.json +c7303a05e6100f55add1ad8ca3b39c68bc894dcb assets/modern_industrialization/models/item/le_uranium_rod.json +833fcbf07bc96ce9c4ce13f9dab76c8ffd77f703 assets/modern_industrialization/models/item/le_uranium_tiny_dust.json +376a02f5473e2e4245507cd0415194cceae63ecd assets/modern_industrialization/models/item/light_fuel_bucket.json +6f718db895bde27420a6e841ea69e682edb42515 assets/modern_industrialization/models/item/lignite_coal.json +63ba7511f763844b003ea0a717093bdc28217fc5 assets/modern_industrialization/models/item/lignite_coal_crushed_dust.json +360735c6501e690f6238d4605f00af815f324989 assets/modern_industrialization/models/item/lignite_coal_dust.json +703b192831ece1ef8713b65da8954d3506d25687 assets/modern_industrialization/models/item/lignite_coal_tiny_dust.json +c43b2a530be613e7a4f41b1af2103f8b2857a7e4 assets/modern_industrialization/models/item/liquid_air_bucket.json +2ec46b0af92f6d1b27109de9041ca9de9df0befb assets/modern_industrialization/models/item/lubricant_bucket.json +72a1e8f3183fb8dd636d72530ca50dd9a2406d7a assets/modern_industrialization/models/item/manganese_crushed_dust.json +bfc6ccffdd499e8496ac72069b88549b7ba419ee assets/modern_industrialization/models/item/manganese_dust.json +46b1e195b0cdbd0661229ecf8675ee6a4adec7bc assets/modern_industrialization/models/item/manganese_sulfuric_solution_bucket.json +919212fcf36c5c2a9dc7cd192f5572be27cc62d5 assets/modern_industrialization/models/item/manganese_tiny_dust.json +847bc6fba252466243e075dae31151ada26ec0c9 assets/modern_industrialization/models/item/memory_management_unit.json +4aeba9b8d505c2d5394bb3b8876a13c5eac20610 assets/modern_industrialization/models/item/methane_bucket.json +2eb956d20de250a71f15c128aeb6cebb1eb5c6f8 assets/modern_industrialization/models/item/mixed_ingot_blastproof.json +b84a3cd4d5de90146a6ea000175854ec92ab8f4e assets/modern_industrialization/models/item/mixed_ingot_iridium.json +70230d621ec921be070bb2ed588d0379e5f7cc5c assets/modern_industrialization/models/item/mixed_plate_nuclear.json +1b0b8ee0f593491b951e67ec9a0e84d71f021167 assets/modern_industrialization/models/item/molten_redstone_bucket.json +8e60bea66265abed7df11e762db762c55ab91766 assets/modern_industrialization/models/item/monazite_crushed_dust.json +bf6a917599af8bfe8550cf063260cd260a35299e assets/modern_industrialization/models/item/monazite_dust.json +9ed616ba0ea3f0f455f8506290849bcff443342f assets/modern_industrialization/models/item/monazite_tiny_dust.json +0acd8376a6cf786cedbc9fe544a333172012582f assets/modern_industrialization/models/item/monocrystalline_silicon.json +1b14d3b3e21289cd05f1b01f256cff26c917f620 assets/modern_industrialization/models/item/motor.json +26fb33803376b566856c275c1d20069543a8d7f1 assets/modern_industrialization/models/item/naphtha_bucket.json +df6ee170727f8f5cd0f8a31aa439a0a6a50ccc8b assets/modern_industrialization/models/item/neodymium_dust.json +7a17f25fe6495d35088dfb0ea682d0aa3925318c assets/modern_industrialization/models/item/neodymium_tiny_dust.json +7541b693efcb303c65e3867fd4b1ef6bf244adc6 assets/modern_industrialization/models/item/netherite_hammer.json +92655beacaf68a57551894e371dc45b8eddbb98c assets/modern_industrialization/models/item/nickel_double_ingot.json +7811cb82e12c4498311aa936623f93c7fef7ae35 assets/modern_industrialization/models/item/nickel_dust.json +6510daa35d09585d4398d5d17a37a3dc0bef18c6 assets/modern_industrialization/models/item/nickel_ingot.json +2e95b6cee41157fe09157714eda8e2538560d03e assets/modern_industrialization/models/item/nickel_nugget.json +0a78827b4357e74aedbd7a8b11bdcfc8f4b8bee2 assets/modern_industrialization/models/item/nickel_plate.json +e207bb04cb9c9116faa74c751bbdc0570a7da1e4 assets/modern_industrialization/models/item/nickel_tiny_dust.json +49f23b9e69c10bdbeb6d31831f3ce5e62c1a5dd4 assets/modern_industrialization/models/item/nitrogen_bucket.json +3d7917f63edbdae95262c864bdc46583d4b26080 assets/modern_industrialization/models/item/not_gate.json +7c82ad45e1dfe0a4d786cdd96e6f5b025bfc2e5c assets/modern_industrialization/models/item/nuclear_alloy_large_plate.json +5fad659d4a23dd75a75edadc1ed1f5f43b353ac8 assets/modern_industrialization/models/item/nuclear_alloy_plate.json +725fa55131ea4c4d2a2ffa90d8683cbd4303fb2d assets/modern_industrialization/models/item/nylon_bucket.json +4ee98e91333ba9474a0d2e0428ea67c538d96154 assets/modern_industrialization/models/item/op_amp.json +44352856e4969651ccb530322070bd427e0e13d1 assets/modern_industrialization/models/item/or_gate.json +97899b6a3157f8f1366e14db9e7ece3db457e8b3 assets/modern_industrialization/models/item/overdrive_module.json +7ce2208812ae1b2d2e174a587dff7d4e03bfdf79 assets/modern_industrialization/models/item/oxygen_bucket.json +8c0f98597f861619f59510d90fcb138ebef69d7f assets/modern_industrialization/models/item/packer_block_template.json +63b844e2ab4e159a9f7584254e592164873d6347 assets/modern_industrialization/models/item/packer_double_ingot_template.json +d2b5c3974bf9f9bd46d503bc72eeb70421484cd4 assets/modern_industrialization/models/item/piston.json +d4e068caf6d05bb31f8c426b424c8abc48005291 assets/modern_industrialization/models/item/plant_oil_bucket.json +0ad65b189bb23d34b1d0a38287c8927a6667d343 assets/modern_industrialization/models/item/platinum_double_ingot.json +4b5c82b51810b7256563b40d3736851c0cd8d8e0 assets/modern_industrialization/models/item/platinum_dust.json +36a10ec03112a877fd8f844921cbe946afcc8977 assets/modern_industrialization/models/item/platinum_fine_wire.json +67651f2539ce848009ea9872caf49636d7c6f9f5 assets/modern_industrialization/models/item/platinum_hot_ingot.json +dddfae02dfa050b90b984fc9a76fb6761e514d1b assets/modern_industrialization/models/item/platinum_ingot.json +daaaba3bb00984d359867ef080129ede9655c672 assets/modern_industrialization/models/item/platinum_nugget.json +83481cbb7faa5c417da59d96a8bd3bfaae39f384 assets/modern_industrialization/models/item/platinum_plate.json +1f75c888f13f35ed927344d4b982df1ca7c01626 assets/modern_industrialization/models/item/platinum_sulfuric_solution_bucket.json +28508b3f398fe4725d6d613f1c9083c5c0e04a79 assets/modern_industrialization/models/item/platinum_tiny_dust.json +f47848b0bf9aa896f54d24bddc88bb4f986030b2 assets/modern_industrialization/models/item/platinum_wire.json +25c9df637979747ddbdd327aafa70f765661a9a4 assets/modern_industrialization/models/item/plutonium_battery.json +bd2001752eb304e116a3d720bf728ddbd1b3ca75 assets/modern_industrialization/models/item/plutonium_dust.json +80c891e93ade601b6173125f79678529f7dedb34 assets/modern_industrialization/models/item/plutonium_ingot.json +83e5a57a841bf561730bf190d8136013f0a7cd0f assets/modern_industrialization/models/item/plutonium_nugget.json +f3fe594a8386a772e513a7483e7836a4e4375b07 assets/modern_industrialization/models/item/plutonium_tiny_dust.json +1f888e908f3d0a42176621cc6fc12f614f586c64 assets/modern_industrialization/models/item/polyethylene_bucket.json +9babc9b7f0aaf10cd0e382736094247a2a2174d4 assets/modern_industrialization/models/item/polyvinyl_chloride_bucket.json +7f41913074deecf8b12c42b46a26f7827379a533 assets/modern_industrialization/models/item/portable_storage_unit.json +60c327e4da861c7d47b2e056e77f8b65fe4ab808 assets/modern_industrialization/models/item/processing_unit.json +c1b341d76e65c9eca30964e6ca5b2f111678e582 assets/modern_industrialization/models/item/processing_unit_board.json +8e5f197a3e99637c5decb27196afaee853e52f3f assets/modern_industrialization/models/item/propene_bucket.json +62aa240bbd209de12d0fb7e2bf053080795cc7a2 assets/modern_industrialization/models/item/pump.json +5b691469848a113804e94d12d32aea855a74d0f6 assets/modern_industrialization/models/item/purified_platinum_sulfuric_solution_bucket.json +951823c11ef78b5ce699fa0cba111ee4cbe98d3a assets/modern_industrialization/models/item/quantum_boots.json +f3827cf6a5806c6d5f32e0cea2c6a95ddfd35b5c assets/modern_industrialization/models/item/quantum_chestplate.json +15f8a255bd0551af25dfe3aa022af30c4c2120f4 assets/modern_industrialization/models/item/quantum_circuit.json +f3f799317679c0f7565435839a231222b412bb29 assets/modern_industrialization/models/item/quantum_circuit_board.json +82f6d03362bc75972e27639c8d241ed476b202f1 assets/modern_industrialization/models/item/quantum_helmet.json +e3d57582912c0d3cc200bbef09529bc9a27c6c0f assets/modern_industrialization/models/item/quantum_leggings.json +306b8470b53beaeac97f466e565c105757ac0f24 assets/modern_industrialization/models/item/quantum_sword.json +d1497e2fb520819d24ca197f25b9b7c484221b15 assets/modern_industrialization/models/item/quantum_upgrade.json +91e8b71b26cf4668c1154eb6309f91979e1ccda6 assets/modern_industrialization/models/item/quartz_crushed_dust.json +90e80735c26e5157ea87ae4990849da36cd7e711 assets/modern_industrialization/models/item/quartz_dust.json +43456254ec54c9e3f04be3168f8abda7be1bc3b6 assets/modern_industrialization/models/item/quartz_tiny_dust.json +2a1134806393a405da29c652a5c3da0975d569f6 assets/modern_industrialization/models/item/qubit.json +926a464f940ac850aaf0b62b90526aab15eba613 assets/modern_industrialization/models/item/random_access_memory.json +282cd3397ebe6db396223f41f864e74a8e3ddc16 assets/modern_industrialization/models/item/raw_antimony.json +76bca9c7e46d0183a987b562110ca2f0e376cfa6 assets/modern_industrialization/models/item/raw_biodiesel_bucket.json +c0ab0558f58543d8cc73dab0dcca8205bbb886be assets/modern_industrialization/models/item/raw_iridium.json +082cc48b32f991cbc763c4d9fd5eee09450de924 assets/modern_industrialization/models/item/raw_lead.json +7a8815b7d2a8a7a9d5ef096922f351c65317b36c assets/modern_industrialization/models/item/raw_nickel.json +ac992d8b9601240d13f5a5104c035f7954e5c694 assets/modern_industrialization/models/item/raw_platinum.json +4610831f40fcb1cef2da50363a2d31b036fae12c assets/modern_industrialization/models/item/raw_silver.json +83d7ab842386345353e723c20662c375d73d5d25 assets/modern_industrialization/models/item/raw_synthetic_oil_bucket.json +dc0e66449741dd243bcbc8f6b2c353691af89632 assets/modern_industrialization/models/item/raw_tin.json +dccf011e20c13b487aa98f8f9d18fd4a2a7880e2 assets/modern_industrialization/models/item/raw_titanium.json +7ca0f7a057af2dc6a3e6004b59c37421cefcbe82 assets/modern_industrialization/models/item/raw_tungsten.json +080bea339184bd05ddac651fe2b13efcf47ac0f6 assets/modern_industrialization/models/item/raw_uranium.json +8bb6b92260cd1e1d0c31c26d194c10c7c4c74c25 assets/modern_industrialization/models/item/redstone_battery.json +126d577284809b98a73e5c196534d60c806653dd assets/modern_industrialization/models/item/redstone_control_module_high.json +3c53d116743452a271e9c30c50518e2f0dd8d24f assets/modern_industrialization/models/item/redstone_control_module_low.json +eb625f9aeed5882147bb6f43172be94b17c12802 assets/modern_industrialization/models/item/redstone_crushed_dust.json +19d0cfc610c93c6e8dfc21821f05e44d54454959 assets/modern_industrialization/models/item/redstone_tiny_dust.json +493c3d209cd952f52e3ba469b68a58e1992f31dc assets/modern_industrialization/models/item/resistor.json +28efdd5cec79aeed69b44014d74903ad9580d4f4 assets/modern_industrialization/models/item/robot_arm.json +2889e75de3f5d64826590ff794de323b1c555d6e assets/modern_industrialization/models/item/rubber_boots.json +f51873a36adabb307d57d6373880110147e4021b assets/modern_industrialization/models/item/rubber_helmet.json +5229ce71b9e19b474e735c3ebe01d0bd639c9840 assets/modern_industrialization/models/item/rubber_sheet.json +7c7e414f45d356b4acc9f859139e295de502a4c6 assets/modern_industrialization/models/item/ruby_dust.json +80246b563280be374ba4fa713b8050c5f990a3f2 assets/modern_industrialization/models/item/ruby_tiny_dust.json +5286b1d4323a9411452781e7670a818bfe69d7cc assets/modern_industrialization/models/item/salt_crushed_dust.json +a804577a77e741a032061741126890fcd4a567e5 assets/modern_industrialization/models/item/salt_dust.json +7f8314b11def793b5a0e03669f8489b42705a7bd assets/modern_industrialization/models/item/salt_tiny_dust.json +b5cc77a06f98e3a1ecd06b9f43aa22e29e68710e assets/modern_industrialization/models/item/shale_oil_bucket.json +3dd0643fd72ca6e57100b785fa30308adda42bd2 assets/modern_industrialization/models/item/silicon_battery.json +5ced5a90329a680831ff80338488391ae36b4ceb assets/modern_industrialization/models/item/silicon_double_ingot.json +47c59b61adb25da0d386486801f9893230356ed8 assets/modern_industrialization/models/item/silicon_dust.json +26851c465e09ead4796b37f86e411c799fedf870 assets/modern_industrialization/models/item/silicon_ingot.json +00602a13e53e7a5641623f9560e40e4da60a659b assets/modern_industrialization/models/item/silicon_nugget.json +b10e15ef98a20306d0d3961c4f120b3d291694e7 assets/modern_industrialization/models/item/silicon_n_doped_plate.json +50693f04610ec4de40ffbb6785b1a142f3ee8f3a assets/modern_industrialization/models/item/silicon_plate.json +088247ddd8f3b2fccbf0ccbda33eb09674860a86 assets/modern_industrialization/models/item/silicon_p_doped_plate.json +6b38db3bdb6574ba87d9ee5b161e010f7bb56ef0 assets/modern_industrialization/models/item/silicon_tiny_dust.json +f0553ea276e94431e0882758ebcf4957473ebc36 assets/modern_industrialization/models/item/silicon_wafer.json +ed5c6d29a7e33a57357b84b2561c17bc5b33a1c0 assets/modern_industrialization/models/item/silver_double_ingot.json +2581712f8060d9a9f3fde927e4351776194ed02f assets/modern_industrialization/models/item/silver_dust.json +7652156eb39f66e8eb49f643daeeac6e7fda5453 assets/modern_industrialization/models/item/silver_ingot.json +e1c63a035cebd6ead0f44d0c03964b538b782ede assets/modern_industrialization/models/item/silver_nugget.json +be39f2c4dff7f5a51107e016fc75a60792a4cf32 assets/modern_industrialization/models/item/silver_plate.json +a18d8f0f3de5bc79398782a954791244fb84e97d assets/modern_industrialization/models/item/silver_tiny_dust.json +1af91188c430ff758f29f39fe40a7768a0f875f7 assets/modern_industrialization/models/item/silver_wire.json +5e82e9387d0386beec0c419bb737d296b4a8c4cb assets/modern_industrialization/models/item/singularity.json +1818a8be8dda94891669d943f7fb16be361f2ca0 assets/modern_industrialization/models/item/small_heat_exchanger.json +81332e18694676c3a1d5d5dc98a550a98b05710f assets/modern_industrialization/models/item/sodium_battery.json +c06307104984a3cdad3e9df07b3244829d5cb457 assets/modern_industrialization/models/item/sodium_dust.json +27d9401a18a205afa70adacb0d003ffe4648eb10 assets/modern_industrialization/models/item/sodium_hydroxide_bucket.json +b3004f28f6120609d788d969b318df4e1b265237 assets/modern_industrialization/models/item/sodium_tiny_dust.json +ede8d6f2d7a3395a0d7e96abff8040d2b316978d assets/modern_industrialization/models/item/soldering_alloy_bucket.json +8f333749c63d0e8ed7917d976de2c4e82c177e8e assets/modern_industrialization/models/item/soldering_alloy_dust.json +81e3d80b59f0797137b6216cb753c6c8e06e0890 assets/modern_industrialization/models/item/soldering_alloy_tiny_dust.json +b6c87e928d221ba77c35cce84c0aad0f6912f0a0 assets/modern_industrialization/models/item/stainless_steel_blade.json +dd69118815ed4c5d02337f986790db810c658c30 assets/modern_industrialization/models/item/stainless_steel_bolt.json +d9d7aec9030ab8ca32ebbb45c6da719126041b46 assets/modern_industrialization/models/item/stainless_steel_curved_plate.json +48e8959959b5c909560188ea5ee56e36c68e4795 assets/modern_industrialization/models/item/stainless_steel_double_ingot.json +e26a08834602ce944531009aa1a41718bc24224b assets/modern_industrialization/models/item/stainless_steel_drill.json +a6649218cd196b5387ce3cd1452570df3119eed2 assets/modern_industrialization/models/item/stainless_steel_drill_head.json +db5bf24b02a557189a9be17011ae7ccba5bea630 assets/modern_industrialization/models/item/stainless_steel_dust.json +1f49d9ea72a883d3617535c84280ad911f2d564f assets/modern_industrialization/models/item/stainless_steel_gear.json +eed1701e376416228634fa48f860baa7903f26e7 assets/modern_industrialization/models/item/stainless_steel_hot_ingot.json +2c6d5ecf07d6ac45536903e36d5a3398fd4bc894 assets/modern_industrialization/models/item/stainless_steel_ingot.json +bd54f10977c27475c26e0210dcb35f9395c05dea assets/modern_industrialization/models/item/stainless_steel_large_plate.json +c7f22d602cc735af5ef0bd9d5146164385b19b87 assets/modern_industrialization/models/item/stainless_steel_nugget.json +1777bd159c8151e8c2360cf2c2ab22023ec18248 assets/modern_industrialization/models/item/stainless_steel_plate.json +13ab2e74137f0b6248a6db1b5e039fdceda095c9 assets/modern_industrialization/models/item/stainless_steel_ring.json +bce8e38967cf43adbadfd7ac4954bb12dc78b7cf assets/modern_industrialization/models/item/stainless_steel_rod.json +ca818ada5df3f88b4908deb04e9f613a50560c64 assets/modern_industrialization/models/item/stainless_steel_rod_magnetic.json +8519e143100e196c63ab710cbc926d3b62081f1e assets/modern_industrialization/models/item/stainless_steel_rotor.json +150bc7b37b2870e03a0efee62b44d7963d9bfe59 assets/modern_industrialization/models/item/stainless_steel_tiny_dust.json +2122053f1d0b1a4cab404ad91c78194a45771193 assets/modern_industrialization/models/item/steam_bucket.json +7886141e6c6dd414847f3c5303b4bb2fc6bb3a94 assets/modern_industrialization/models/item/steam_cracked_heavy_fuel_bucket.json +8119acd77f265cf3220369c3e341243e9dc1c0b7 assets/modern_industrialization/models/item/steam_cracked_light_fuel_bucket.json +b4255911dab185b31b5977104f5231ce9a20567b assets/modern_industrialization/models/item/steam_cracked_naphtha_bucket.json +621a23f87a276d91708cf1df44f926988d6a8ccf assets/modern_industrialization/models/item/steam_mining_drill.json +c9574387b44f0a3811d8efb08fa52ac8c78e77b1 assets/modern_industrialization/models/item/steel_bolt.json +3957fd75ebf15bcb84350a5a6651885deb8f41dc assets/modern_industrialization/models/item/steel_curved_plate.json +3b6e953251df44a95dfb2360031167162c77bf69 assets/modern_industrialization/models/item/steel_double_ingot.json +497e4839016f0394b42ea5da4ea1cb852a8cb984 assets/modern_industrialization/models/item/steel_drill.json +3495bd8b6adae8f0a7de834fc454e7f53ff40ef6 assets/modern_industrialization/models/item/steel_drill_head.json +838f5693455b667abf394965dfe8c61f441cd663 assets/modern_industrialization/models/item/steel_dust.json +a1fcbd1d3c2f8250df6e7d704ab460e5765a2dff assets/modern_industrialization/models/item/steel_gear.json +5a110547ed0b72f1211a39f5616d820484b55904 assets/modern_industrialization/models/item/steel_hammer.json +86cf76342a1d31ce62f6c04de266fcb14adce6fd assets/modern_industrialization/models/item/steel_ingot.json +2a1b88abdfe3e944ce56de89a10ba1106fedc507 assets/modern_industrialization/models/item/steel_large_plate.json +ef344574184aaa6ae18ae1ce44abdd39ded6b5db assets/modern_industrialization/models/item/steel_nugget.json +6e772b9f5aafa38faca3f6326a333a50765b38e1 assets/modern_industrialization/models/item/steel_plate.json +b0368fbaaf9969b45c7fed8da8e5496feabbbd23 assets/modern_industrialization/models/item/steel_ring.json +e1c55b69f31b28b6400b28d6549e56755d959a3a assets/modern_industrialization/models/item/steel_rod.json +3f9721eb72ecc0dfc0a2475903a6d8f990cf369e assets/modern_industrialization/models/item/steel_rod_magnetic.json +591ee00650d9351723aabe2f7f1b1d650183e3ca assets/modern_industrialization/models/item/steel_tiny_dust.json +19690c7cffddbfc5b7c80382b700d47612bcae60 assets/modern_industrialization/models/item/steel_upgrade.json +406d999a5b831977e93e247a3d4060ece2f617e7 assets/modern_industrialization/models/item/styrene_bucket.json +1e3b8551d32d4d2e4f15dd66c086f18753dcee53 assets/modern_industrialization/models/item/styrene_butadiene_bucket.json +f08432f3375654d8d0d11d0068c8896baee8ccf8 assets/modern_industrialization/models/item/styrene_butadiene_rubber_bucket.json +4d921937c8f1653b7005ccaa36f96c0f23e3cc2b assets/modern_industrialization/models/item/sugar_solution_bucket.json +9a3dcc8b0fa7a1f584d453306c5bc120eab87d68 assets/modern_industrialization/models/item/sulfuric_acid_bucket.json +10260c8317e96857b271cb07592ac04326fadb4a assets/modern_industrialization/models/item/sulfuric_crude_oil_bucket.json +fc958c0f12f6ff9bfd288e2bdd463006087a9e2a assets/modern_industrialization/models/item/sulfuric_heavy_fuel_bucket.json +8d2ce5e9dff51f54aa77483400f0a821fab2d280 assets/modern_industrialization/models/item/sulfuric_light_fuel_bucket.json +4ba149e3d343d8318d80226612944ac556abe06e assets/modern_industrialization/models/item/sulfuric_naphtha_bucket.json +d7cad940999bf464d9e4cfba9bd1b135cfd17eae assets/modern_industrialization/models/item/sulfur_dust.json +dde1e4ef887e63b5d1c2b6571538bfd72c023bee assets/modern_industrialization/models/item/sulfur_tiny_dust.json +7d59c5dc08e4e7522f39b35e7763b93ad3fafe80 assets/modern_industrialization/models/item/superconductor_double_ingot.json +1ff478f74f65f8acd28f631f269cade5c8975114 assets/modern_industrialization/models/item/superconductor_dust.json +594f55cac9b2aac70d95d8cb7e74c42b2cd2363d assets/modern_industrialization/models/item/superconductor_hot_ingot.json +efc6eb8a14ec82dd7f6d499704e96e5deb58ae37 assets/modern_industrialization/models/item/superconductor_ingot.json +63669af6316ababfe9e41adeb239123f5c105aff assets/modern_industrialization/models/item/superconductor_nugget.json +13933e61d80af9439cc54c4cd6207cdbe1e13fb5 assets/modern_industrialization/models/item/superconductor_plate.json +2cc5d169362548935507b14ac31738a1e2ee7463 assets/modern_industrialization/models/item/superconductor_tiny_dust.json +7cd110fb19cad0c0183bea716fbd10941f3e3ce3 assets/modern_industrialization/models/item/superconductor_wire.json +aa1cf4abff2f4576d7c11b95e47d62ae47322e01 assets/modern_industrialization/models/item/synthetic_oil_bucket.json +95d22ec326ac0e24f27cd727f98bb8581f9e46c1 assets/modern_industrialization/models/item/synthetic_rubber_bucket.json +6ee48eb4f1cf7e8256220cce5ced8ea042beb2cf assets/modern_industrialization/models/item/tin_blade.json +43c33526aa18f43a399748eeeaa5a15122e99827 assets/modern_industrialization/models/item/tin_bolt.json +e6c17d8fb9b21e55b7cb1238ad7199ffef41d2ee assets/modern_industrialization/models/item/tin_curved_plate.json +c7c41b4d926b510f5d8850d3f8cc3c5deb08201e assets/modern_industrialization/models/item/tin_double_ingot.json +04f83a89b82ddc376d9bd19f0dc9893e4ee6ddfc assets/modern_industrialization/models/item/tin_dust.json +6d30dc6efb520da3b2a5a0d763d249b70c829494 assets/modern_industrialization/models/item/tin_gear.json +5e15362a0644222436f72d8b835cfc76a76efe41 assets/modern_industrialization/models/item/tin_ingot.json +7ce8134a02a6d96c752c8dd612b9f15a45eeb4d3 assets/modern_industrialization/models/item/tin_nugget.json +de6612e2c75b8b1e834119aba15fb079bd4f92b4 assets/modern_industrialization/models/item/tin_plate.json +c5ce173ab31639cd45387f164b18e3c4e4f5ee0f assets/modern_industrialization/models/item/tin_ring.json +264f830c7c1a9e01ba6f9b993f26d9113ee05a5d assets/modern_industrialization/models/item/tin_rod.json +26ba91b78d7fabf1df823e41725f9db4ded81e7c assets/modern_industrialization/models/item/tin_rotor.json +3048a3b5f14a8c780ad45b2c1633eca1e01b44ee assets/modern_industrialization/models/item/tin_tiny_dust.json +18caf7122ec6904011c9122bd8b33defdb8ba5f9 assets/modern_industrialization/models/item/tin_wire.json +ed38b1c51183a44cbcdf55b3704a905b7ca77904 assets/modern_industrialization/models/item/titanium_blade.json +5f064621da2228c78ff0de50e8fd927a3a3b7955 assets/modern_industrialization/models/item/titanium_bolt.json +dddebcb583a24103c263ccbfe2f4d33d79ef3a92 assets/modern_industrialization/models/item/titanium_curved_plate.json +e1df9d5a109bf7f30f42349ef830f8712677af90 assets/modern_industrialization/models/item/titanium_double_ingot.json +f7d57816d8c24d670b085350ab316e5e12715ee9 assets/modern_industrialization/models/item/titanium_drill.json +662c8221754241a824eaeaa730b95cbbd6fa66cc assets/modern_industrialization/models/item/titanium_drill_head.json +4e15b1ef896bd27e5d96171b0c52e36d13acbbe7 assets/modern_industrialization/models/item/titanium_dust.json +f74d0f0dab1b05e422cc91fb34a267fab71b48a3 assets/modern_industrialization/models/item/titanium_gear.json +616fca675130e5d57ef48e245a4e56a79c9a8911 assets/modern_industrialization/models/item/titanium_hot_ingot.json +eba2092cfa342e1662a1a7e5127471203fc63f38 assets/modern_industrialization/models/item/titanium_ingot.json +8192f58f639cb2b606035be156ff984a0aeeae25 assets/modern_industrialization/models/item/titanium_large_plate.json +5e08a4712365e807a85ab70c5440d2c35b2b8d8c assets/modern_industrialization/models/item/titanium_nugget.json +a3b57b36b77f5865075083bc6dc9df607b8eb950 assets/modern_industrialization/models/item/titanium_plate.json +468d55a80b081aef002012b5bc2ae177d7c72ea9 assets/modern_industrialization/models/item/titanium_ring.json +a9cd395e2c98bd789c58f7f940e482a264867777 assets/modern_industrialization/models/item/titanium_rod.json +c71a53863fbe6848528a3b03ad6ef5f3ceaeb223 assets/modern_industrialization/models/item/titanium_rotor.json +c55e5625aba062d301a199c65a442f77df9be3d9 assets/modern_industrialization/models/item/titanium_tiny_dust.json +610e444967ada59137f523874d4fc0beb887a4c2 assets/modern_industrialization/models/item/toluene_bucket.json +88bb3cbcc068964976812948ac64e81c075be64e assets/modern_industrialization/models/item/transistor.json +4bc6a7124d778f85b6d7ac1b1c052e6e1600d82f assets/modern_industrialization/models/item/tritium_bucket.json +4fa108e65004d6c28d00ecd376898300eb5576e4 assets/modern_industrialization/models/item/tungsten_double_ingot.json +cd0dd2a0744e0791a70fc3e25599ed3995e76f4b assets/modern_industrialization/models/item/tungsten_dust.json +9513a8ecef04ffc839968286b159e3ed8a9225f3 assets/modern_industrialization/models/item/tungsten_ingot.json +7b9e5e16c581cad16b02eeac8792f5ff212a9128 assets/modern_industrialization/models/item/tungsten_large_plate.json +6ec4aba90a7bbb271ccb6664663d2cca67f92c84 assets/modern_industrialization/models/item/tungsten_nugget.json +7891ad701bd3c30ebf440dd34eb1ce5c94204aae assets/modern_industrialization/models/item/tungsten_plate.json +9bdef6794b7ea6ace1393fb865990c8a062e29d5 assets/modern_industrialization/models/item/tungsten_tiny_dust.json +95234d20698671010f1e2464a40bc954368f9920 assets/modern_industrialization/models/item/turbo_upgrade.json +6cf281e9d50a8dd54391b1ebc1103546a940e10f assets/modern_industrialization/models/item/ultradense_metal_ball.json +7238ee4f1903787312d0b45dd91d5fa12146daca assets/modern_industrialization/models/item/uncooked_steel_dust.json +b5bca7e74d4d0d1b60ecdd427cd773330375b5dc assets/modern_industrialization/models/item/uranium_235_dust.json +63ff7bd612f16a68e38e782f077dd875b2fed81c assets/modern_industrialization/models/item/uranium_235_ingot.json +4e6c5c55947c483e80bc2eb6f706ab3173a04550 assets/modern_industrialization/models/item/uranium_235_nugget.json +21033253f13f973d1d2cd36d66a76282cf519953 assets/modern_industrialization/models/item/uranium_235_tiny_dust.json +dcc2d63d8a95e4fc8e906ccac5a44c68007070a9 assets/modern_industrialization/models/item/uranium_238_dust.json +a55e9850e46e5c25403104eadf0fe36936f2df82 assets/modern_industrialization/models/item/uranium_238_ingot.json +60f7476b130c430ffc831c77f4971d9dad82a222 assets/modern_industrialization/models/item/uranium_238_nugget.json +54b56e19f2e8b5144389bf13b226bc13476cb4ca assets/modern_industrialization/models/item/uranium_238_tiny_dust.json +da1925cd5b4c8b3a16420082617e2d17d6a8155b assets/modern_industrialization/models/item/uranium_dust.json +4babe4ec369070ff083e09234570d84481b70b1a assets/modern_industrialization/models/item/uranium_fuel_rod.json +11c32364ac0f80531028578660f9fac7601c6d8c assets/modern_industrialization/models/item/uranium_fuel_rod_depleted.json +3c78f1b3d3712a71722e00b6c2bb16f024b15bd7 assets/modern_industrialization/models/item/uranium_fuel_rod_double.json +92e3ee97b1a0e643eca04561a87283249a3881cc assets/modern_industrialization/models/item/uranium_fuel_rod_quad.json +8d2b288eaa91095523c2d2f3e5e1396ef9d18446 assets/modern_industrialization/models/item/uranium_ingot.json +a72245878429c667c9d0c1086ec93efd20c3d3d7 assets/modern_industrialization/models/item/uranium_nugget.json +0897203d855774e71c4fd8d5a5f2216269fb4c24 assets/modern_industrialization/models/item/uranium_rod.json +6dfd7c427a099decbaa1cc2971b23d0ff6f5e14c assets/modern_industrialization/models/item/uranium_tiny_dust.json +4ca53cf44462f1f4d1dffe2adb1b445e7e1cb2e4 assets/modern_industrialization/models/item/uu_matter_bucket.json +6e754b584d4f8417da06f101435fcf83f5b0fd4b assets/modern_industrialization/models/item/vinyl_chloride_bucket.json +8bcae51b679c071f5b7144b70be1acdf142a0ff5 assets/modern_industrialization/models/item/wax.json +c2bcf6d5d8b18fda3c7c75f39644ad2b3d28d60d assets/modern_industrialization/models/item/wood_pulp.json +186b5871971ab73f79f8d8af0eba124bb135ebdc assets/modern_industrialization/models/item/yttrium_dust.json +90f5b28a17c9315df84ecd2b65a34b63a9f052cf assets/modern_industrialization/models/item/yttrium_tiny_dust.json +8d30b453b942ca162a605262040ae30b3e5a1a65 assets/modern_industrialization/models/machine_casing/bricked_bronze.json +5d7b5c9dafe6ca0178d07e71a4d29dabbae51a47 assets/modern_industrialization/models/machine_casing/bricked_steel.json +c09cb0cd102c92eba08c80118206a0f9ace10e04 assets/modern_industrialization/models/machine_casing/configurable_tank.json +7adeaa8d4ef9fe76cf205bdc344f085901b87cde assets/modern_industrialization/models/machine_casing/steel_crate.json +01f52e0ffa11aaa142e0417f39149433af07a473 assets/modern_industrialization/modern_industrialization/machine_casings/bricked_bronze.json +cdaad1c78ec6602beb838c02d218f417de4a8b60 assets/modern_industrialization/modern_industrialization/machine_casings/bricked_steel.json +10ee7b79095f72b158505f73844dc585469fff67 assets/modern_industrialization/modern_industrialization/machine_casings/bricks.json +a9cce3eaa83c2afa7b4717854fc05e6e0487498c assets/modern_industrialization/modern_industrialization/machine_casings/bronze.json +05e91416dde5a6e7b03b78e29d1fc4c22443074e assets/modern_industrialization/modern_industrialization/machine_casings/bronze_plated_bricks.json +3f526a9846ff89afb754d3707d2259848cb1d2e4 assets/modern_industrialization/modern_industrialization/machine_casings/clean_stainless_steel_machine_casing.json +b0620fdb1a01935d70f42b6739625a83e49f067e assets/modern_industrialization/modern_industrialization/machine_casings/configurable_tank.json +5f5f14f3efef2b0d0b6b4a0056f061de4188e9e1 assets/modern_industrialization/modern_industrialization/machine_casings/ev.json +214ef232f255a39d1e8aba0eda73c5840544c65e assets/modern_industrialization/modern_industrialization/machine_casings/firebricks.json +c409e77a576f0a57d2ce9641547b1f309e5c25bd assets/modern_industrialization/modern_industrialization/machine_casings/frostproof_machine_casing.json +111d299d2ea3640c9c510affa27e30212870a801 assets/modern_industrialization/modern_industrialization/machine_casings/heatproof_machine_casing.json +f1da173b8b3d8df4ef8126b6b672d791e15191f4 assets/modern_industrialization/modern_industrialization/machine_casings/hv.json +e0dc8159b655f26ca5924a640d345a86c8b22dff assets/modern_industrialization/modern_industrialization/machine_casings/lv.json +d063dc8eb9793a7b5e8cd24db95942a4d39d2d5c assets/modern_industrialization/modern_industrialization/machine_casings/mv.json +4a2bf75063e90f16bbfed0e24666fb697d239689 assets/modern_industrialization/modern_industrialization/machine_casings/nuclear_casing.json +db6f1ccc51e3ea2ad36725d92373aa63e24240d5 assets/modern_industrialization/modern_industrialization/machine_casings/plasma_handling_iridium_machine_casing.json +0bf1bb6254f4fa1d8c7edb92dd71fa1ab779d0e5 assets/modern_industrialization/modern_industrialization/machine_casings/solid_titanium_machine_casing.json +23a09e6824b75ea44f97622923f52cc2f16a2eb9 assets/modern_industrialization/modern_industrialization/machine_casings/stainless_steel_machine_casing_pipe.json +8eaf1dedda769f0cff67682fe2a89cf22aadb271 assets/modern_industrialization/modern_industrialization/machine_casings/steel.json +76fdcbcc1f3246c243096ddec1b1ed126c52c018 assets/modern_industrialization/modern_industrialization/machine_casings/steel_crate.json +97f8b540bce0962de8c0de988eeb6974b684dbb8 assets/modern_industrialization/modern_industrialization/machine_casings/superconductor.json +b5fced7898503e17b653c4561333fdb8e16b2315 assets/modern_industrialization/modern_industrialization/machine_casings/titanium.json +b97ddda99e2e5e60ffd0986d0df1162eb66ef090 assets/modern_industrialization/modern_industrialization/machine_casings/titanium_machine_casing_pipe.json diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_input_hatch.json index 85f7c8af6..a60006a7d 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/advanced_fluid_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_output_hatch.json index ed4a639f2..a60006a7d 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_fluid_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/advanced_fluid_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_input_hatch.json index a4dbe94ba..c5a511e9b 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/advanced_item_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_output_hatch.json index bbf221d88..c5a511e9b 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_item_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/advanced_item_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_large_steam_boiler.json index 8f00d1923..895f99952 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/advanced_large_steam_boiler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/advanced_large_steam_boiler.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/advanced_large_steam_boiler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze_plated_bricks", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/large_boiler/overlay_front", + "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/assembler.json b/src/generated/resources/assets/modern_industrialization/blockstates/assembler.json index f8ef3ed93..e24ef7207 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/assembler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/assembler.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/assembler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/assembler/overlay_front", + "front_active": "modern_industrialization:block/machines/assembler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/assembler/overlay_top", + "top_active": "modern_industrialization:block/machines/assembler/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_boiler.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_boiler.json index 9991f7ffe..1c6eb46a3 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_boiler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_boiler.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_boiler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bricked_bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/boiler/overlay_front", + "front_active": "modern_industrialization:block/machines/boiler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_compressor.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_compressor.json index dd45f535c..4eac1c2a0 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_compressor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_compressor.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_compressor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/compressor/overlay_front", + "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/compressor/overlay_side", + "side_active": "modern_industrialization:block/machines/compressor/overlay_side_active", + "top": "modern_industrialization:block/machines/compressor/overlay_top", + "top_active": "modern_industrialization:block/machines/compressor/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_cutting_machine.json index 10b298c18..1996f221d 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_cutting_machine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_cutting_machine.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_cutting_machine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/cutting_machine/overlay_front", + "front_active": "modern_industrialization:block/machines/cutting_machine/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_input_hatch.json index 245adc96e..862021205 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_fluid_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_output_hatch.json index 00d518e04..862021205 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_fluid_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_fluid_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_furnace.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_furnace.json index 6e6d0e289..c3fd35bef 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_furnace.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_furnace.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_furnace" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/furnace/overlay_front", + "front_active": "modern_industrialization:block/machines/furnace/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_input_hatch.json index 2086a8fc4..421754db4 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_item_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_output_hatch.json index 7e89a897f..421754db4 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_item_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_item_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_macerator.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_macerator.json index 780a2b9e3..9b682d984 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_macerator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_macerator.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_macerator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/macerator/overlay_front", + "front_active": "modern_industrialization:block/machines/macerator/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/macerator/overlay_top", + "top_active": "modern_industrialization:block/machines/macerator/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_mixer.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_mixer.json index 380da04d2..f41f0995e 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_mixer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_mixer.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_mixer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/mixer/overlay_front", + "front_active": "modern_industrialization:block/machines/mixer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/mixer/overlay_side", + "side_active": "modern_industrialization:block/machines/mixer/overlay_side_active", + "top": "modern_industrialization:block/machines/mixer/overlay_top", + "top_active": "modern_industrialization:block/machines/mixer/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_water_pump.json b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_water_pump.json index b418372c5..3eadc2cca 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/bronze_water_pump.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/bronze_water_pump.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/bronze_water_pump" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/water_pump/overlay_front", + "front_active": "modern_industrialization:block/machines/water_pump/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/water_pump/overlay_side", + "side_active": "modern_industrialization:block/machines/water_pump/overlay_side_active", + "top": "modern_industrialization:block/machines/water_pump/overlay_top", + "top_active": "modern_industrialization:block/machines/water_pump/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/centrifuge.json b/src/generated/resources/assets/modern_industrialization/blockstates/centrifuge.json index 37a9be36e..9acd72169 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/centrifuge.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/centrifuge.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/centrifuge" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/centrifuge/overlay_front", + "front_active": "modern_industrialization:block/machines/centrifuge/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/centrifuge/overlay_side", + "side_active": "modern_industrialization:block/machines/centrifuge/overlay_side_active", + "top": "modern_industrialization:block/machines/centrifuge/overlay_top", + "top_active": "modern_industrialization:block/machines/centrifuge/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/chemical_reactor.json b/src/generated/resources/assets/modern_industrialization/blockstates/chemical_reactor.json index 15e7a8a40..6588ab058 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/chemical_reactor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/chemical_reactor.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/chemical_reactor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/chemical_reactor/overlay_front", + "front_active": "modern_industrialization:block/machines/chemical_reactor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/coke_oven.json b/src/generated/resources/assets/modern_industrialization/blockstates/coke_oven.json index 7ef6dc437..27eeb6fb9 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/coke_oven.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/coke_oven.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/coke_oven" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bricks", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/coke_oven/overlay_front", + "front_active": "modern_industrialization:block/machines/coke_oven/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/configurable_chest.json b/src/generated/resources/assets/modern_industrialization/blockstates/configurable_chest.json index 95af8c355..c6ce3ef30 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/configurable_chest.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/configurable_chest.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/configurable_chest" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel_crate", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/configurable_tank.json b/src/generated/resources/assets/modern_industrialization/blockstates/configurable_tank.json index 795afc161..a9daed9ca 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/configurable_tank.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/configurable_tank.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/configurable_tank" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:configurable_tank", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/distillation_tower.json b/src/generated/resources/assets/modern_industrialization/blockstates/distillation_tower.json index 96eb2f50a..2b3e443f9 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/distillation_tower.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/distillation_tower.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/distillation_tower" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:clean_stainless_steel_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/distillation_tower/overlay_front", + "front_active": "modern_industrialization:block/machines/distillation_tower/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/distillery.json b/src/generated/resources/assets/modern_industrialization/blockstates/distillery.json index 6cbb538d5..163e7f3e8 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/distillery.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/distillery.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/distillery" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/distillery/overlay_front", + "front_active": "modern_industrialization:block/machines/distillery/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_blast_furnace.json index 590ca3713..9d57ac47f 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_blast_furnace.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_blast_furnace.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_blast_furnace" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:heatproof_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/electric_blast_furnace/overlay_front", + "front_active": "modern_industrialization:block/machines/electric_blast_furnace/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_compressor.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_compressor.json index 1bbd7fe9c..0b1ed7bf2 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_compressor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_compressor.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_compressor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/compressor/overlay_front", + "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/compressor/overlay_side", + "side_active": "modern_industrialization:block/machines/compressor/overlay_side_active", + "top": "modern_industrialization:block/machines/compressor/overlay_top", + "top_active": "modern_industrialization:block/machines/compressor/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_cutting_machine.json index 42b46b420..c466a2bb0 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_cutting_machine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_cutting_machine.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_cutting_machine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/cutting_machine/overlay_front", + "front_active": "modern_industrialization:block/machines/cutting_machine/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_furnace.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_furnace.json index 05bbb3cdd..cb202be07 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_furnace.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_furnace.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_furnace" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/furnace/overlay_front", + "front_active": "modern_industrialization:block/machines/furnace/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_macerator.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_macerator.json index bb46eddc2..4c54d8821 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_macerator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_macerator.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_macerator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/macerator/overlay_front", + "front_active": "modern_industrialization:block/machines/macerator/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/macerator/overlay_top", + "top_active": "modern_industrialization:block/machines/macerator/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_mixer.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_mixer.json index 5a3d8595c..162bf401a 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_mixer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_mixer.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_mixer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/mixer/overlay_front", + "front_active": "modern_industrialization:block/machines/mixer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/mixer/overlay_side", + "side_active": "modern_industrialization:block/machines/mixer/overlay_side_active", + "top": "modern_industrialization:block/machines/mixer/overlay_top", + "top_active": "modern_industrialization:block/machines/mixer/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_packer.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_packer.json index 160aabd1e..921158d46 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_packer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_packer.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_packer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/packer/overlay_front", + "front_active": "modern_industrialization:block/machines/packer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_quarry.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_quarry.json index 9b4ae027b..dcc5b0449 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_quarry.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_quarry.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_quarry" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/electric_quarry/overlay_front", + "front_active": "modern_industrialization:block/machines/electric_quarry/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_unpacker.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_unpacker.json index f3a5a206e..abd793437 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_unpacker.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_unpacker.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_unpacker" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/unpacker/overlay_front", + "front_active": "modern_industrialization:block/machines/unpacker/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_water_pump.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_water_pump.json index cd70706e0..55f74111e 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_water_pump.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_water_pump.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_water_pump" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/water_pump/overlay_front", + "front_active": "modern_industrialization:block/machines/water_pump/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/water_pump/overlay_side", + "side_active": "modern_industrialization:block/machines/water_pump/overlay_side_active", + "top": "modern_industrialization:block/machines/water_pump/overlay_top", + "top_active": "modern_industrialization:block/machines/water_pump/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electric_wiremill.json b/src/generated/resources/assets/modern_industrialization/blockstates/electric_wiremill.json index 630aafbdf..42014de23 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electric_wiremill.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electric_wiremill.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/electric_wiremill" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/wiremill/overlay_front", + "front_active": "modern_industrialization:block/machines/wiremill/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/wiremill/overlay_top", + "top_active": "modern_industrialization:block/machines/wiremill/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/electrolyzer.json b/src/generated/resources/assets/modern_industrialization/blockstates/electrolyzer.json index b103c3e9d..15e55bd55 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/electrolyzer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/electrolyzer.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/electrolyzer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/electrolyzer/overlay_front", + "front_active": "modern_industrialization:block/machines/electrolyzer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/electrolyzer/overlay_side", + "side_active": "modern_industrialization:block/machines/electrolyzer/overlay_side_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_input_hatch.json index de1663db9..51bb772a3 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_input_hatch.json @@ -1,7 +1,13 @@ { "variants": { "": { - "model": "modern_industrialization:block/ev_energy_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_output_hatch.json index 377d91d74..56b72af9d 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/ev_energy_output_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/ev_energy_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/ev_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/ev_hv_transformer.json index 68b3b897c..2340be36a 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/ev_hv_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/ev_hv_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/ev_hv_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "output": "modern_industrialization:block/machines/transformer/overlay_side", + "side": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": true, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/ev_storage_unit.json b/src/generated/resources/assets/modern_industrialization/blockstates/ev_storage_unit.json index bd749807b..089b40130 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/ev_storage_unit.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/ev_storage_unit.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/ev_storage_unit" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/electric_storage/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/ev_superconductor_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/ev_superconductor_transformer.json index 403c2954e..e0460e19b 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/ev_superconductor_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/ev_superconductor_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/ev_superconductor_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:superconductor", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/transformer/overlay_side", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/fusion_reactor.json b/src/generated/resources/assets/modern_industrialization/blockstates/fusion_reactor.json index e0c6b4721..850d4ce32 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/fusion_reactor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/fusion_reactor.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/fusion_reactor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/fusion_reactor/overlay_front", + "front_active": "modern_industrialization:block/machines/fusion_reactor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/heat_exchanger.json b/src/generated/resources/assets/modern_industrialization/blockstates/heat_exchanger.json index 708018b97..7c0578707 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/heat_exchanger.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/heat_exchanger.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/heat_exchanger" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:stainless_steel_machine_casing_pipe", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/heat_exchanger/overlay_front", + "front_active": "modern_industrialization:block/machines/heat_exchanger/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_advanced_large_steam_boiler.json index 26ff51741..10b68c423 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_advanced_large_steam_boiler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_advanced_large_steam_boiler.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/high_pressure_advanced_large_steam_boiler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:clean_stainless_steel_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/large_boiler/overlay_front", + "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_large_steam_boiler.json index 2caca25a9..10b68c423 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_large_steam_boiler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/high_pressure_large_steam_boiler.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/high_pressure_large_steam_boiler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:clean_stainless_steel_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/large_boiler/overlay_front", + "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_input_hatch.json index d50fd8605..93aa9f508 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/highly_advanced_fluid_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_output_hatch.json index ddde820b1..93aa9f508 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_fluid_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/highly_advanced_fluid_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_input_hatch.json index 71ead9349..7741dfa09 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/highly_advanced_item_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_output_hatch.json index a3bc7c0b3..7741dfa09 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/highly_advanced_item_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/highly_advanced_item_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_diesel_generator.json index 4f61bbbf5..4ce12607a 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_diesel_generator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_diesel_generator.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_diesel_generator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", + "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", + "output": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", + "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_input_hatch.json index bffb3853f..48f93d5a9 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_input_hatch.json @@ -1,7 +1,13 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_energy_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_output_hatch.json index 4198b4347..e130b0496 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_energy_output_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_energy_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_ev_transformer.json index 462ada80b..801d7bf61 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_ev_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_ev_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_ev_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:ev", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/transformer/overlay_side", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_mv_transformer.json index 1493636da..cb1c6357b 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_mv_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_mv_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_mv_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "output": "modern_industrialization:block/machines/transformer/overlay_side", + "side": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": true, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_steam_turbine.json index 14ae9ecc9..5354d2542 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_steam_turbine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_steam_turbine.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_steam_turbine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", + "output": "modern_industrialization:block/overlays/output_energy" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/hv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/blockstates/hv_storage_unit.json index d13576925..150f2c182 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/hv_storage_unit.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/hv_storage_unit.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/hv_storage_unit" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/electric_storage/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/implosion_compressor.json b/src/generated/resources/assets/modern_industrialization/blockstates/implosion_compressor.json index 7e30906cc..2c3cedc20 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/implosion_compressor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/implosion_compressor.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/implosion_compressor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:solid_titanium_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/compressor/overlay_front", + "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/large_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/blockstates/large_diesel_generator.json index 466811f03..922926ed6 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/large_diesel_generator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/large_diesel_generator.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/large_diesel_generator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:solid_titanium_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", + "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_boiler.json index 0c02ccd67..895f99952 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_boiler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_boiler.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/large_steam_boiler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bronze_plated_bricks", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/large_boiler/overlay_front", + "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_turbine.json index 5a7005d22..1907bafc1 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_turbine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/large_steam_turbine.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/large_steam_turbine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:clean_stainless_steel_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/large_tank.json b/src/generated/resources/assets/modern_industrialization/blockstates/large_tank.json index 30b6aee91..84b0c62c1 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/large_tank.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/large_tank.json @@ -1,7 +1,16 @@ { "variants": { "": { - "model": "modern_industrialization:block/large_tank" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/large_tank/overlay_front", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/large_tank_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/large_tank_hatch.json index 3868a3a39..e0e4dd475 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/large_tank_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/large_tank_hatch.json @@ -1,7 +1,16 @@ { "variants": { "": { - "model": "modern_industrialization:block/large_tank_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/lv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/blockstates/lv_diesel_generator.json index c91b0504a..ae18fb6db 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/lv_diesel_generator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/lv_diesel_generator.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/lv_diesel_generator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", + "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", + "output": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", + "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_input_hatch.json index 3bbea8a12..d2f504efd 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_input_hatch.json @@ -1,7 +1,13 @@ { "variants": { "": { - "model": "modern_industrialization:block/lv_energy_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_output_hatch.json index 46ee9ded0..ff60c377c 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/lv_energy_output_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/lv_energy_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/lv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/lv_mv_transformer.json index 800967c82..014b2b47e 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/lv_mv_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/lv_mv_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/lv_mv_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/transformer/overlay_side", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/lv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/blockstates/lv_steam_turbine.json index 7b343a002..837dc092c 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/lv_steam_turbine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/lv_steam_turbine.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/lv_steam_turbine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", + "output": "modern_industrialization:block/overlays/output_energy" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/lv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/blockstates/lv_storage_unit.json index 909e2ef52..ceb727466 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/lv_storage_unit.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/lv_storage_unit.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/lv_storage_unit" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/electric_storage/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_diesel_generator.json index b3b1e8249..d8d5a01b9 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_diesel_generator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_diesel_generator.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_diesel_generator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", + "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", + "output": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", + "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_input_hatch.json index 2fa6b5685..69ae21933 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_input_hatch.json @@ -1,7 +1,13 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_energy_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_output_hatch.json index 28fe23767..6e0bef820 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_energy_output_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_energy_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_hv_transformer.json index 6e6e8ae8e..4025ebfd6 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_hv_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_hv_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_hv_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/transformer/overlay_side", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_lv_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_lv_transformer.json index 37bae8300..0387fd027 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_lv_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_lv_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_lv_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "output": "modern_industrialization:block/machines/transformer/overlay_side", + "side": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": true, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_steam_turbine.json index 9aec38664..87b872b73 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_steam_turbine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_steam_turbine.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_steam_turbine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", + "output": "modern_industrialization:block/overlays/output_energy" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/mv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/blockstates/mv_storage_unit.json index d5bfcfb79..6f796c5f4 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/mv_storage_unit.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/mv_storage_unit.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/mv_storage_unit" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:mv", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/electric_storage/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_fluid_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_fluid_hatch.json index 9d4c7afeb..e16bca151 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_fluid_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_fluid_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/nuclear_fluid_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:nuclear_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "top": "modern_industrialization:block/overlays/output_fluid" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_item_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_item_hatch.json index 7a4e3fce3..ad2be5ce0 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_item_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_item_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/nuclear_item_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:nuclear_casing", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "top": "modern_industrialization:block/overlays/output_item" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_reactor.json b/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_reactor.json index 66ebe1c36..e70697075 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_reactor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/nuclear_reactor.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/nuclear_reactor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:nuclear_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/nuclear_reactor/overlay_front", + "front_active": "modern_industrialization:block/machines/nuclear_reactor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/oil_drilling_rig.json b/src/generated/resources/assets/modern_industrialization/blockstates/oil_drilling_rig.json index 2df3871da..bef205788 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/oil_drilling_rig.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/oil_drilling_rig.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/oil_drilling_rig" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/oil_drilling_rig/overlay_front", + "front_active": "modern_industrialization:block/machines/oil_drilling_rig/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/pipe.json b/src/generated/resources/assets/modern_industrialization/blockstates/pipe.json index 4bda810ee..8f49abf56 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/pipe.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/pipe.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "modern_industrialization:block/pipe" + "type": "modern_industrialization:pipe" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/plasma_turbine.json b/src/generated/resources/assets/modern_industrialization/blockstates/plasma_turbine.json index e2b2757d5..da49b299a 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/plasma_turbine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/plasma_turbine.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/plasma_turbine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:plasma_handling_iridium_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/polarizer.json b/src/generated/resources/assets/modern_industrialization/blockstates/polarizer.json index e290682e7..4feca8960 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/polarizer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/polarizer.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/polarizer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:lv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/polarizer/overlay_front", + "front_active": "modern_industrialization:block/machines/polarizer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/polarizer/overlay_top", + "top_active": "modern_industrialization:block/machines/polarizer/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/pressurizer.json b/src/generated/resources/assets/modern_industrialization/blockstates/pressurizer.json index cc6c62fc9..9b2890f69 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/pressurizer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/pressurizer.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/pressurizer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:titanium_machine_casing_pipe", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/pressurizer/overlay_front", + "front_active": "modern_industrialization:block/machines/pressurizer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/replicator.json b/src/generated/resources/assets/modern_industrialization/blockstates/replicator.json index b66661aaa..735d06119 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/replicator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/replicator.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/replicator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:superconductor", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/replicator/overlay_front", + "front_active": "modern_industrialization:block/machines/replicator/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/replicator/overlay_side", + "side_active": "modern_industrialization:block/machines/replicator/overlay_side_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steam_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/blockstates/steam_blast_furnace.json index 6efa8fd5a..24b13c36f 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steam_blast_furnace.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steam_blast_furnace.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steam_blast_furnace" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:firebricks", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/steam_blast_furnace/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_blast_furnace/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steam_quarry.json b/src/generated/resources/assets/modern_industrialization/blockstates/steam_quarry.json index b127b4819..f87fd539e 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steam_quarry.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steam_quarry.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steam_quarry" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/steam_quarry/overlay_front", + "front_active": "modern_industrialization:block/machines/steam_quarry/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_boiler.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_boiler.json index 0cd9b2444..f8a1bcae5 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_boiler.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_boiler.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_boiler" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:bricked_steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/boiler/overlay_front", + "front_active": "modern_industrialization:block/machines/boiler/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_compressor.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_compressor.json index 1cb900f2e..c523d3282 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_compressor.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_compressor.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_compressor" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/compressor/overlay_front", + "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/compressor/overlay_side", + "side_active": "modern_industrialization:block/machines/compressor/overlay_side_active", + "top": "modern_industrialization:block/machines/compressor/overlay_top", + "top_active": "modern_industrialization:block/machines/compressor/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_cutting_machine.json index 6449321a9..1088383a6 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_cutting_machine.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_cutting_machine.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_cutting_machine" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/cutting_machine/overlay_front", + "front_active": "modern_industrialization:block/machines/cutting_machine/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_input_hatch.json index 922c204f1..a413bbbad 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_fluid_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_output_hatch.json index df5ba746c..a413bbbad 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_fluid_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_fluid_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_furnace.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_furnace.json index 7c80ea52b..4b0baa3e4 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_furnace.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_furnace.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_furnace" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/furnace/overlay_front", + "front_active": "modern_industrialization:block/machines/furnace/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_input_hatch.json index 9ea76e230..3a6e26545 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_item_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_output_hatch.json index 1aa32f95a..3a6e26545 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_item_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_item_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_macerator.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_macerator.json index 9a94ea7a9..1871f9f13 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_macerator.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_macerator.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_macerator" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/macerator/overlay_front", + "front_active": "modern_industrialization:block/machines/macerator/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/macerator/overlay_top", + "top_active": "modern_industrialization:block/machines/macerator/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_mixer.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_mixer.json index e0a93c1a8..7318900e1 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_mixer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_mixer.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_mixer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/mixer/overlay_front", + "front_active": "modern_industrialization:block/machines/mixer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/mixer/overlay_side", + "side_active": "modern_industrialization:block/machines/mixer/overlay_side_active", + "top": "modern_industrialization:block/machines/mixer/overlay_top", + "top_active": "modern_industrialization:block/machines/mixer/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_packer.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_packer.json index af4ea6b6f..419857f04 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_packer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_packer.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_packer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/packer/overlay_front", + "front_active": "modern_industrialization:block/machines/packer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_unpacker.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_unpacker.json index 7d3aa8a91..59d70ffa5 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_unpacker.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_unpacker.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_unpacker" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/unpacker/overlay_front", + "front_active": "modern_industrialization:block/machines/unpacker/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_water_pump.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_water_pump.json index 91d069c27..73f9c3a2f 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_water_pump.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_water_pump.json @@ -1,7 +1,21 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_water_pump" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/water_pump/overlay_front", + "front_active": "modern_industrialization:block/machines/water_pump/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "side": "modern_industrialization:block/machines/water_pump/overlay_side", + "side_active": "modern_industrialization:block/machines/water_pump/overlay_side_active", + "top": "modern_industrialization:block/machines/water_pump/overlay_top", + "top_active": "modern_industrialization:block/machines/water_pump/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/steel_wiremill.json b/src/generated/resources/assets/modern_industrialization/blockstates/steel_wiremill.json index 097bd32de..26c0e495a 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/steel_wiremill.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/steel_wiremill.json @@ -1,7 +1,19 @@ { "variants": { "": { - "model": "modern_industrialization:block/steel_wiremill" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:steel", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/wiremill/overlay_front", + "front_active": "modern_industrialization:block/machines/wiremill/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output", + "top": "modern_industrialization:block/machines/wiremill/overlay_top", + "top_active": "modern_industrialization:block/machines/wiremill/overlay_top_active" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_input_hatch.json index 59451f395..8b51e338f 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_input_hatch.json @@ -1,7 +1,13 @@ { "variants": { "": { - "model": "modern_industrialization:block/superconductor_energy_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:superconductor", + "default_overlays": { + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_output_hatch.json index 134e757bf..a7c0adcd0 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_energy_output_hatch.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/superconductor_energy_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:superconductor", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_ev_transformer.json index f2ff0dcbe..835151643 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_ev_transformer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_ev_transformer.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/superconductor_ev_transformer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:superconductor", + "default_overlays": { + "output": "modern_industrialization:block/machines/transformer/overlay_side", + "side": "modern_industrialization:block/overlays/output_energy", + "top": "modern_industrialization:block/machines/transformer/overlay_top" + }, + "no_overlay_on_output_side": true, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_storage_unit.json b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_storage_unit.json index 6e8fe7921..98a544cc1 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_storage_unit.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/superconductor_storage_unit.json @@ -1,7 +1,14 @@ { "variants": { "": { - "model": "modern_industrialization:block/superconductor_storage_unit" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:superconductor", + "default_overlays": { + "output": "modern_industrialization:block/overlays/output_energy", + "side": "modern_industrialization:block/machines/electric_storage/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_input_hatch.json index a98d5e5d0..98e7f5667 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/turbo_fluid_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_output_hatch.json index 24cb05f38..98e7f5667 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_fluid_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/turbo_fluid_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "output": "modern_industrialization:block/overlays/output_fluid", + "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_input_hatch.json index eb54ccc5f..81247036c 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_input_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_input_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/turbo_item_input_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_output_hatch.json index 4340e525b..81247036c 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_output_hatch.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/turbo_item_output_hatch.json @@ -1,7 +1,15 @@ { "variants": { "": { - "model": "modern_industrialization:block/turbo_item_output_hatch" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:hv", + "default_overlays": { + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output_item", + "side": "modern_industrialization:block/machines/hatch_item/overlay_side" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/vacuum_freezer.json b/src/generated/resources/assets/modern_industrialization/blockstates/vacuum_freezer.json index 4abf6a21d..55a4d0fcb 100644 --- a/src/generated/resources/assets/modern_industrialization/blockstates/vacuum_freezer.json +++ b/src/generated/resources/assets/modern_industrialization/blockstates/vacuum_freezer.json @@ -1,7 +1,17 @@ { "variants": { "": { - "model": "modern_industrialization:block/vacuum_freezer" + "type": "modern_industrialization:machine", + "casing": "modern_industrialization:frostproof_machine_casing", + "default_overlays": { + "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", + "front": "modern_industrialization:block/machines/vacuum_freezer/overlay_front", + "front_active": "modern_industrialization:block/machines/vacuum_freezer/overlay_front_active", + "item_auto": "modern_industrialization:block/overlays/item_auto", + "output": "modern_industrialization:block/overlays/output" + }, + "no_overlay_on_output_side": false, + "tiered_overlays": {} } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/acetylene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/acetylene_bucket.json new file mode 100644 index 000000000..384b85d67 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/acetylene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/acetylene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/acrylic_acid_bucket.json b/src/generated/resources/assets/modern_industrialization/items/acrylic_acid_bucket.json new file mode 100644 index 000000000..fd4ef0edb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/acrylic_acid_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/acrylic_acid_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/acrylic_glue_bucket.json b/src/generated/resources/assets/modern_industrialization/items/acrylic_glue_bucket.json new file mode 100644 index 000000000..107cef9df --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/acrylic_glue_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/acrylic_glue_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/advanced_fluid_input_hatch.json new file mode 100644 index 000000000..559904c27 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_fluid_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:advanced_fluid_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/advanced_fluid_output_hatch.json new file mode 100644 index 000000000..7e8272b75 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_fluid_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:advanced_fluid_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/advanced_item_input_hatch.json new file mode 100644 index 000000000..3c6a38eeb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_item_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:advanced_item_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/advanced_item_output_hatch.json new file mode 100644 index 000000000..6369ad901 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_item_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:advanced_item_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/items/advanced_large_steam_boiler.json new file mode 100644 index 000000000..f888b514d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_large_steam_boiler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:advanced_large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/advanced_machine_casing.json new file mode 100644 index 000000000..61ea8780f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/advanced_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_machine_hull.json b/src/generated/resources/assets/modern_industrialization/items/advanced_machine_hull.json new file mode 100644 index 000000000..21dc8f42c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_machine_hull.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/advanced_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_motor.json b/src/generated/resources/assets/modern_industrialization/items/advanced_motor.json new file mode 100644 index 000000000..8c0288ad7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_motor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/advanced_motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_pump.json b/src/generated/resources/assets/modern_industrialization/items/advanced_pump.json new file mode 100644 index 000000000..35d4220ec --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/advanced_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/advanced_upgrade.json b/src/generated/resources/assets/modern_industrialization/items/advanced_upgrade.json new file mode 100644 index 000000000..ff9a87ce3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/advanced_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/advanced_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/air_intake.json b/src/generated/resources/assets/modern_industrialization/items/air_intake.json new file mode 100644 index 000000000..d9aa99a92 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/air_intake.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/air_intake" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_barrel.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_barrel.json new file mode 100644 index 000000000..c4f02dfe2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/aluminum_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/aluminum_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_blade.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_blade.json new file mode 100644 index 000000000..c70db23a3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_block.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_block.json new file mode 100644 index 000000000..bfc81dd60 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/aluminum_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_bolt.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_bolt.json new file mode 100644 index 000000000..73e5891b8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_cable.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_curved_plate.json new file mode 100644 index 000000000..05871ff82 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_double_ingot.json new file mode 100644 index 000000000..2dde16ed9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_drill.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_drill.json new file mode 100644 index 000000000..c772eabdc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_drill_head.json new file mode 100644 index 000000000..fe5727938 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_dust.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_dust.json new file mode 100644 index 000000000..a50e37590 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_gear.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_gear.json new file mode 100644 index 000000000..14f111324 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_ingot.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_ingot.json new file mode 100644 index 000000000..2593361fc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_large_plate.json new file mode 100644 index 000000000..d1b497d59 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_nugget.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_nugget.json new file mode 100644 index 000000000..c846be9ea --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_plate.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_plate.json new file mode 100644 index 000000000..892de467f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_ring.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_ring.json new file mode 100644 index 000000000..a6accee17 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_rod.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_rod.json new file mode 100644 index 000000000..ff015075c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_rotor.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_rotor.json new file mode 100644 index 000000000..b92e51f53 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_rotor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_rotor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_tank.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_tank.json new file mode 100644 index 000000000..cdf661094 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/aluminum_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/aluminum_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_tiny_dust.json new file mode 100644 index 000000000..e7248594e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/aluminum_wire.json b/src/generated/resources/assets/modern_industrialization/items/aluminum_wire.json new file mode 100644 index 000000000..4074558b2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/aluminum_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/aluminum_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/analog_circuit.json b/src/generated/resources/assets/modern_industrialization/items/analog_circuit.json new file mode 100644 index 000000000..98ad55da3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/analog_circuit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/analog_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/analog_circuit_board.json b/src/generated/resources/assets/modern_industrialization/items/analog_circuit_board.json new file mode 100644 index 000000000..9283bed2d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/analog_circuit_board.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/analog_circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/and_gate.json b/src/generated/resources/assets/modern_industrialization/items/and_gate.json new file mode 100644 index 000000000..c2a0d3a39 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/and_gate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/and_gate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_block.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_block.json new file mode 100644 index 000000000..38f8d09f4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/annealed_copper_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_cable.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_double_ingot.json new file mode 100644 index 000000000..577d213c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_dust.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_dust.json new file mode 100644 index 000000000..08d9d2291 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_hot_ingot.json new file mode 100644 index 000000000..c95a8873d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_ingot.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_ingot.json new file mode 100644 index 000000000..823fd65c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_nugget.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_nugget.json new file mode 100644 index 000000000..298d04355 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_plate.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_plate.json new file mode 100644 index 000000000..0317c784c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_tiny_dust.json new file mode 100644 index 000000000..78b42a76b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/annealed_copper_wire.json b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_wire.json new file mode 100644 index 000000000..cb84a2d5d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/annealed_copper_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/annealed_copper_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/antimony_block.json b/src/generated/resources/assets/modern_industrialization/items/antimony_block.json new file mode 100644 index 000000000..887779f10 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/antimony_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/antimony_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/antimony_dust.json b/src/generated/resources/assets/modern_industrialization/items/antimony_dust.json new file mode 100644 index 000000000..48a71b2fe --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/antimony_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/antimony_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/antimony_ingot.json b/src/generated/resources/assets/modern_industrialization/items/antimony_ingot.json new file mode 100644 index 000000000..f2eb22969 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/antimony_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/antimony_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/antimony_nugget.json b/src/generated/resources/assets/modern_industrialization/items/antimony_nugget.json new file mode 100644 index 000000000..76929523f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/antimony_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/antimony_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/antimony_ore.json b/src/generated/resources/assets/modern_industrialization/items/antimony_ore.json new file mode 100644 index 000000000..0748231ca --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/antimony_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/antimony_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/antimony_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/antimony_tiny_dust.json new file mode 100644 index 000000000..624b1ac76 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/antimony_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/antimony_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/argon_bucket.json b/src/generated/resources/assets/modern_industrialization/items/argon_bucket.json new file mode 100644 index 000000000..8224182dc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/argon_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/argon_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/arithmetic_logic_unit.json b/src/generated/resources/assets/modern_industrialization/items/arithmetic_logic_unit.json new file mode 100644 index 000000000..fbb26b98d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/arithmetic_logic_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/arithmetic_logic_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/assembler.json b/src/generated/resources/assets/modern_industrialization/items/assembler.json new file mode 100644 index 000000000..17e043220 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/assembler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:assembler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/basic_machine_hull.json b/src/generated/resources/assets/modern_industrialization/items/basic_machine_hull.json new file mode 100644 index 000000000..8cfa8ddfa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/basic_machine_hull.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/basic_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/basic_upgrade.json b/src/generated/resources/assets/modern_industrialization/items/basic_upgrade.json new file mode 100644 index 000000000..7dbf4a438 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/basic_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/basic_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_block.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_block.json new file mode 100644 index 000000000..868f1f7a5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/battery_alloy_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_curved_plate.json new file mode 100644 index 000000000..90c5370d8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_double_ingot.json new file mode 100644 index 000000000..52d4bfa04 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_dust.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_dust.json new file mode 100644 index 000000000..8836d2a04 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_ingot.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_ingot.json new file mode 100644 index 000000000..73c512202 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_nugget.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_nugget.json new file mode 100644 index 000000000..548ab5ded --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_plate.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_plate.json new file mode 100644 index 000000000..dd04f3ece --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/battery_alloy_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_tiny_dust.json new file mode 100644 index 000000000..faba6476c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/battery_alloy_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/battery_alloy_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bauxite_block.json b/src/generated/resources/assets/modern_industrialization/items/bauxite_block.json new file mode 100644 index 000000000..e278bd90d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bauxite_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/bauxite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bauxite_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/bauxite_crushed_dust.json new file mode 100644 index 000000000..092e0ac53 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bauxite_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bauxite_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bauxite_dust.json b/src/generated/resources/assets/modern_industrialization/items/bauxite_dust.json new file mode 100644 index 000000000..e4f118b08 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bauxite_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bauxite_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bauxite_ore.json b/src/generated/resources/assets/modern_industrialization/items/bauxite_ore.json new file mode 100644 index 000000000..d3ae8df3e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bauxite_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/bauxite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bauxite_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/bauxite_tiny_dust.json new file mode 100644 index 000000000..6155b43ad --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bauxite_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bauxite_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/benzene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/benzene_bucket.json new file mode 100644 index 000000000..d1154c9d4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/benzene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/benzene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_block.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_block.json new file mode 100644 index 000000000..8c32f5995 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/beryllium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_double_ingot.json new file mode 100644 index 000000000..2bfd96d59 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/beryllium_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_dust.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_dust.json new file mode 100644 index 000000000..4201b84a3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/beryllium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_ingot.json new file mode 100644 index 000000000..d6425a45d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/beryllium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_nugget.json new file mode 100644 index 000000000..9b7066ddc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/beryllium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_plate.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_plate.json new file mode 100644 index 000000000..1e8ae604e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/beryllium_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/beryllium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/beryllium_tiny_dust.json new file mode 100644 index 000000000..ea4577cdb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/beryllium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/beryllium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/biodiesel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/biodiesel_bucket.json new file mode 100644 index 000000000..52497a864 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/biodiesel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/biodiesel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/black_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/black_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/black_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/black_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/black_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/black_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_curved_plate.json new file mode 100644 index 000000000..1d93a8823 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/blastproof_alloy_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_ingot.json b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_ingot.json new file mode 100644 index 000000000..fd9c3b6f0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/blastproof_alloy_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_large_plate.json new file mode 100644 index 000000000..6b7f7f356 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/blastproof_alloy_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_plate.json b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_plate.json new file mode 100644 index 000000000..b3f2c1311 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blastproof_alloy_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/blastproof_alloy_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blastproof_casing.json b/src/generated/resources/assets/modern_industrialization/items/blastproof_casing.json new file mode 100644 index 000000000..d87888377 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blastproof_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/blastproof_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blue_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/blue_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blue_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/blue_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/blue_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/blue_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/boosted_diesel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/boosted_diesel_bucket.json new file mode 100644 index 000000000..f70abbb0b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/boosted_diesel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/boosted_diesel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/brick_dust.json b/src/generated/resources/assets/modern_industrialization/items/brick_dust.json new file mode 100644 index 000000000..8811ce36d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/brick_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/brick_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/brick_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/brick_tiny_dust.json new file mode 100644 index 000000000..3d0c579cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/brick_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/brick_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_barrel.json b/src/generated/resources/assets/modern_industrialization/items/bronze_barrel.json new file mode 100644 index 000000000..7a1b76c81 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/bronze_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/bronze_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_blade.json b/src/generated/resources/assets/modern_industrialization/items/bronze_blade.json new file mode 100644 index 000000000..fcbaf17f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_block.json b/src/generated/resources/assets/modern_industrialization/items/bronze_block.json new file mode 100644 index 000000000..64dfb045f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/bronze_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_boiler.json b/src/generated/resources/assets/modern_industrialization/items/bronze_boiler.json new file mode 100644 index 000000000..3adeda625 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_boiler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_bolt.json b/src/generated/resources/assets/modern_industrialization/items/bronze_bolt.json new file mode 100644 index 000000000..fc82a10cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_compressor.json b/src/generated/resources/assets/modern_industrialization/items/bronze_compressor.json new file mode 100644 index 000000000..500e759fb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_compressor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/bronze_curved_plate.json new file mode 100644 index 000000000..6c954aee8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/items/bronze_cutting_machine.json new file mode 100644 index 000000000..e949e615d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_cutting_machine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_cutting_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/bronze_double_ingot.json new file mode 100644 index 000000000..ef3f32b91 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_drill.json b/src/generated/resources/assets/modern_industrialization/items/bronze_drill.json new file mode 100644 index 000000000..4857aefd0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/bronze_drill_head.json new file mode 100644 index 000000000..0d695a9a5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_dust.json b/src/generated/resources/assets/modern_industrialization/items/bronze_dust.json new file mode 100644 index 000000000..a937b8121 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/bronze_fluid_input_hatch.json new file mode 100644 index 000000000..dcbc2d76f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_fluid_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_fluid_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/bronze_fluid_output_hatch.json new file mode 100644 index 000000000..9aa8650c6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_fluid_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_fluid_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_furnace.json b/src/generated/resources/assets/modern_industrialization/items/bronze_furnace.json new file mode 100644 index 000000000..a2cb0e819 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_furnace.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_gear.json b/src/generated/resources/assets/modern_industrialization/items/bronze_gear.json new file mode 100644 index 000000000..9e0cc0eaa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_ingot.json b/src/generated/resources/assets/modern_industrialization/items/bronze_ingot.json new file mode 100644 index 000000000..985a23e05 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/bronze_item_input_hatch.json new file mode 100644 index 000000000..28e65f4b7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_item_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_item_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/bronze_item_output_hatch.json new file mode 100644 index 000000000..a92a928d7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_item_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_item_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_macerator.json b/src/generated/resources/assets/modern_industrialization/items/bronze_macerator.json new file mode 100644 index 000000000..f2b50f900 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_macerator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_macerator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/bronze_machine_casing.json new file mode 100644 index 000000000..5201ff578 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/bronze_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/items/bronze_machine_casing_pipe.json new file mode 100644 index 000000000..bf2fee7c7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_machine_casing_pipe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/bronze_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_mixer.json b/src/generated/resources/assets/modern_industrialization/items/bronze_mixer.json new file mode 100644 index 000000000..968ef26a1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_mixer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_mixer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_nugget.json b/src/generated/resources/assets/modern_industrialization/items/bronze_nugget.json new file mode 100644 index 000000000..621892f2a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_plate.json b/src/generated/resources/assets/modern_industrialization/items/bronze_plate.json new file mode 100644 index 000000000..3d06f9d00 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_plated_bricks.json b/src/generated/resources/assets/modern_industrialization/items/bronze_plated_bricks.json new file mode 100644 index 000000000..327efb7db --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_plated_bricks.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/bronze_plated_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_ring.json b/src/generated/resources/assets/modern_industrialization/items/bronze_ring.json new file mode 100644 index 000000000..0071d3a8b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_rod.json b/src/generated/resources/assets/modern_industrialization/items/bronze_rod.json new file mode 100644 index 000000000..6c70e6adf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_rotor.json b/src/generated/resources/assets/modern_industrialization/items/bronze_rotor.json new file mode 100644 index 000000000..9f6421816 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_rotor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_rotor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_tank.json b/src/generated/resources/assets/modern_industrialization/items/bronze_tank.json new file mode 100644 index 000000000..62d3ae9cd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/bronze_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/bronze_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/bronze_tiny_dust.json new file mode 100644 index 000000000..06bf55a3d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/bronze_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/bronze_water_pump.json b/src/generated/resources/assets/modern_industrialization/items/bronze_water_pump.json new file mode 100644 index 000000000..ba9b2eb68 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/bronze_water_pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:bronze_water_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/brown_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/brown_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/brown_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/brown_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/brown_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/brown_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/butadiene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/butadiene_bucket.json new file mode 100644 index 000000000..25df468dd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/butadiene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/butadiene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_battery.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_battery.json new file mode 100644 index 000000000..df34e2b29 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_battery.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_control_rod.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_control_rod.json new file mode 100644 index 000000000..e83006772 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_control_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_control_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_double_ingot.json new file mode 100644 index 000000000..91548d170 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_dust.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_dust.json new file mode 100644 index 000000000..1376695cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_ingot.json new file mode 100644 index 000000000..024a90b1c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_plate.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_plate.json new file mode 100644 index 000000000..ffef668eb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_rod.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_rod.json new file mode 100644 index 000000000..e54228290 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cadmium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/cadmium_tiny_dust.json new file mode 100644 index 000000000..852ca9b41 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cadmium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cadmium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/capacitor.json b/src/generated/resources/assets/modern_industrialization/items/capacitor.json new file mode 100644 index 000000000..dc4867d48 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/capacitor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/capacitor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/caprolactam_bucket.json b/src/generated/resources/assets/modern_industrialization/items/caprolactam_bucket.json new file mode 100644 index 000000000..3b652ee7c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/caprolactam_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/caprolactam_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/carbon_dust.json b/src/generated/resources/assets/modern_industrialization/items/carbon_dust.json new file mode 100644 index 000000000..c57a4c71b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/carbon_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/carbon_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/carbon_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/carbon_large_plate.json new file mode 100644 index 000000000..d80136863 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/carbon_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/carbon_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/carbon_plate.json b/src/generated/resources/assets/modern_industrialization/items/carbon_plate.json new file mode 100644 index 000000000..b4f218183 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/carbon_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/carbon_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/carbon_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/carbon_tiny_dust.json new file mode 100644 index 000000000..936e6bdac --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/carbon_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/carbon_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/centrifuge.json b/src/generated/resources/assets/modern_industrialization/items/centrifuge.json new file mode 100644 index 000000000..7945c8284 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/centrifuge.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:centrifuge" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chemical_reactor.json b/src/generated/resources/assets/modern_industrialization/items/chemical_reactor.json new file mode 100644 index 000000000..344d24941 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chemical_reactor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:chemical_reactor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chlorine_bucket.json b/src/generated/resources/assets/modern_industrialization/items/chlorine_bucket.json new file mode 100644 index 000000000..f4e7d5d1a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chlorine_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chlorine_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_block.json b/src/generated/resources/assets/modern_industrialization/items/chromium_block.json new file mode 100644 index 000000000..eba8cdfba --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/chromium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/chromium_crushed_dust.json new file mode 100644 index 000000000..1a20cca35 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/chromium_double_ingot.json new file mode 100644 index 000000000..e9001ff1c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_dust.json b/src/generated/resources/assets/modern_industrialization/items/chromium_dust.json new file mode 100644 index 000000000..06d6a4f9b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/chromium_hot_ingot.json new file mode 100644 index 000000000..91d73eb93 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_hydrochloric_solution_bucket.json b/src/generated/resources/assets/modern_industrialization/items/chromium_hydrochloric_solution_bucket.json new file mode 100644 index 000000000..84b0c79bb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_hydrochloric_solution_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_hydrochloric_solution_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/chromium_ingot.json new file mode 100644 index 000000000..8116b2ca2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/chromium_nugget.json new file mode 100644 index 000000000..a8014e9d3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_plate.json b/src/generated/resources/assets/modern_industrialization/items/chromium_plate.json new file mode 100644 index 000000000..c30451f90 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/chromium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/chromium_tiny_dust.json new file mode 100644 index 000000000..7f8e53a03 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/chromium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/chromium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/clean_stainless_steel_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/clean_stainless_steel_machine_casing.json new file mode 100644 index 000000000..fa4b23fd5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/clean_stainless_steel_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/clean_stainless_steel_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coal_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/coal_crushed_dust.json new file mode 100644 index 000000000..fe5c9884b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coal_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/coal_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coal_dust.json b/src/generated/resources/assets/modern_industrialization/items/coal_dust.json new file mode 100644 index 000000000..d88f05709 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coal_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/coal_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coal_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/coal_tiny_dust.json new file mode 100644 index 000000000..5dd311c2b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coal_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/coal_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coke.json b/src/generated/resources/assets/modern_industrialization/items/coke.json new file mode 100644 index 000000000..230b68cec --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coke.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/coke" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coke_block.json b/src/generated/resources/assets/modern_industrialization/items/coke_block.json new file mode 100644 index 000000000..a54d575ef --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coke_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/coke_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coke_dust.json b/src/generated/resources/assets/modern_industrialization/items/coke_dust.json new file mode 100644 index 000000000..acd7bcc20 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coke_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/coke_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/coke_oven.json b/src/generated/resources/assets/modern_industrialization/items/coke_oven.json new file mode 100644 index 000000000..845745c2f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/coke_oven.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:coke_oven" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/config_card.json b/src/generated/resources/assets/modern_industrialization/items/config_card.json new file mode 100644 index 000000000..a0be51aa0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/config_card.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/config_card" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/configurable_chest.json b/src/generated/resources/assets/modern_industrialization/items/configurable_chest.json new file mode 100644 index 000000000..3180b7732 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/configurable_chest.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:configurable_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/configurable_tank.json b/src/generated/resources/assets/modern_industrialization/items/configurable_tank.json new file mode 100644 index 000000000..d5a663874 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/configurable_tank.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:configurable_tank" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/conveyor.json b/src/generated/resources/assets/modern_industrialization/items/conveyor.json new file mode 100644 index 000000000..c54809713 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/conveyor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/conveyor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cooling_cell.json b/src/generated/resources/assets/modern_industrialization/items/cooling_cell.json new file mode 100644 index 000000000..3a5c588e1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cooling_cell.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cooling_cell" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_blade.json b/src/generated/resources/assets/modern_industrialization/items/copper_blade.json new file mode 100644 index 000000000..519243e0a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_bolt.json b/src/generated/resources/assets/modern_industrialization/items/copper_bolt.json new file mode 100644 index 000000000..b17936274 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_cable.json b/src/generated/resources/assets/modern_industrialization/items/copper_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/copper_curved_plate.json new file mode 100644 index 000000000..bf878bba6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/copper_double_ingot.json new file mode 100644 index 000000000..915529da2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_drill.json b/src/generated/resources/assets/modern_industrialization/items/copper_drill.json new file mode 100644 index 000000000..743fc4530 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/copper_drill_head.json new file mode 100644 index 000000000..9e0719302 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_dust.json b/src/generated/resources/assets/modern_industrialization/items/copper_dust.json new file mode 100644 index 000000000..130549b30 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_fine_wire.json b/src/generated/resources/assets/modern_industrialization/items/copper_fine_wire.json new file mode 100644 index 000000000..b055caefb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_fine_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_fine_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_gear.json b/src/generated/resources/assets/modern_industrialization/items/copper_gear.json new file mode 100644 index 000000000..17714271b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_nugget.json b/src/generated/resources/assets/modern_industrialization/items/copper_nugget.json new file mode 100644 index 000000000..fec9661f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_plate.json b/src/generated/resources/assets/modern_industrialization/items/copper_plate.json new file mode 100644 index 000000000..5d2a1d268 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_ring.json b/src/generated/resources/assets/modern_industrialization/items/copper_ring.json new file mode 100644 index 000000000..9f11db563 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_rod.json b/src/generated/resources/assets/modern_industrialization/items/copper_rod.json new file mode 100644 index 000000000..e0eaf145e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_rotor.json b/src/generated/resources/assets/modern_industrialization/items/copper_rotor.json new file mode 100644 index 000000000..c2d9689e6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_rotor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_rotor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/copper_tiny_dust.json new file mode 100644 index 000000000..72f322ec0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/copper_wire.json b/src/generated/resources/assets/modern_industrialization/items/copper_wire.json new file mode 100644 index 000000000..2cb110de6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/copper_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/copper_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/creative_barrel.json b/src/generated/resources/assets/modern_industrialization/items/creative_barrel.json new file mode 100644 index 000000000..a79fbbaa2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/creative_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/creative_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/creative_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/creative_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/creative_storage_unit.json new file mode 100644 index 000000000..cf8bb276a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/creative_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/creative_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/creative_tank.json b/src/generated/resources/assets/modern_industrialization/items/creative_tank.json new file mode 100644 index 000000000..022d9be76 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/creative_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/creative_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/creative_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/creosote_bucket.json b/src/generated/resources/assets/modern_industrialization/items/creosote_bucket.json new file mode 100644 index 000000000..d1f9c83cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/creosote_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/creosote_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/crude_oil_bucket.json b/src/generated/resources/assets/modern_industrialization/items/crude_oil_bucket.json new file mode 100644 index 000000000..c4fe6b6a6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/crude_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/crude_oil_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cryofluid_bucket.json b/src/generated/resources/assets/modern_industrialization/items/cryofluid_bucket.json new file mode 100644 index 000000000..70af2f979 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cryofluid_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cryofluid_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_block.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_block.json new file mode 100644 index 000000000..100cef8c6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/cupronickel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_cable.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_coil.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_coil.json new file mode 100644 index 000000000..9853a7082 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_coil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/cupronickel_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_double_ingot.json new file mode 100644 index 000000000..d5066d268 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_dust.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_dust.json new file mode 100644 index 000000000..2783971ae --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_ingot.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_ingot.json new file mode 100644 index 000000000..25a053418 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_nugget.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_nugget.json new file mode 100644 index 000000000..7c8dfc614 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_plate.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_plate.json new file mode 100644 index 000000000..aee81dd2a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_tiny_dust.json new file mode 100644 index 000000000..0649e616c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_wire.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_wire.json new file mode 100644 index 000000000..500f05559 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cupronickel_wire_magnetic.json b/src/generated/resources/assets/modern_industrialization/items/cupronickel_wire_magnetic.json new file mode 100644 index 000000000..559af9913 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cupronickel_wire_magnetic.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/cupronickel_wire_magnetic" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cyan_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/cyan_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cyan_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/cyan_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/cyan_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/cyan_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_antimony_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_antimony_ore.json new file mode 100644 index 000000000..1baa4aaef --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_antimony_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_antimony_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_bauxite_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_bauxite_ore.json new file mode 100644 index 000000000..86946e73a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_bauxite_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_bauxite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_lead_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_lead_ore.json new file mode 100644 index 000000000..464ab79e8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_lead_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_lignite_coal_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_lignite_coal_ore.json new file mode 100644 index 000000000..1a6b90291 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_lignite_coal_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_lignite_coal_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_monazite_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_monazite_ore.json new file mode 100644 index 000000000..5e7e8df2d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_monazite_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_monazite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_nickel_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_nickel_ore.json new file mode 100644 index 000000000..d2eaf34da --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_nickel_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_nickel_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_salt_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_salt_ore.json new file mode 100644 index 000000000..ee1879f51 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_salt_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_salt_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_tin_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_tin_ore.json new file mode 100644 index 000000000..fc2fb5bcf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_tin_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_tungsten_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_tungsten_ore.json new file mode 100644 index 000000000..2fb285ae5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deepslate_uranium_ore.json b/src/generated/resources/assets/modern_industrialization/items/deepslate_uranium_ore.json new file mode 100644 index 000000000..de9665e46 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deepslate_uranium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/deepslate_uranium_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/deuterium_bucket.json b/src/generated/resources/assets/modern_industrialization/items/deuterium_bucket.json new file mode 100644 index 000000000..86f3a579b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/deuterium_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/deuterium_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diamond_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/diamond_crushed_dust.json new file mode 100644 index 000000000..32872ae49 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diamond_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diamond_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diamond_dust.json b/src/generated/resources/assets/modern_industrialization/items/diamond_dust.json new file mode 100644 index 000000000..d1c27a8d6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diamond_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diamond_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diamond_hammer.json b/src/generated/resources/assets/modern_industrialization/items/diamond_hammer.json new file mode 100644 index 000000000..4ef230363 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diamond_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diamond_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diamond_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/diamond_large_plate.json new file mode 100644 index 000000000..b45af4a39 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diamond_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diamond_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diamond_plate.json b/src/generated/resources/assets/modern_industrialization/items/diamond_plate.json new file mode 100644 index 000000000..096da9134 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diamond_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diamond_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diamond_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/diamond_tiny_dust.json new file mode 100644 index 000000000..e2fb46685 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diamond_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diamond_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diesel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/diesel_bucket.json new file mode 100644 index 000000000..172c09860 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diesel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diesel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diesel_chainsaw.json b/src/generated/resources/assets/modern_industrialization/items/diesel_chainsaw.json new file mode 100644 index 000000000..c3e0066aa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diesel_chainsaw.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diesel_chainsaw" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diesel_jetpack.json b/src/generated/resources/assets/modern_industrialization/items/diesel_jetpack.json new file mode 100644 index 000000000..c0a78bf38 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diesel_jetpack.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diesel_jetpack" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diesel_mining_drill.json b/src/generated/resources/assets/modern_industrialization/items/diesel_mining_drill.json new file mode 100644 index 000000000..4af60b60e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diesel_mining_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diesel_mining_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diethyl_ether_bucket.json b/src/generated/resources/assets/modern_industrialization/items/diethyl_ether_bucket.json new file mode 100644 index 000000000..9097a2c2e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diethyl_ether_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diethyl_ether_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/digital_circuit.json b/src/generated/resources/assets/modern_industrialization/items/digital_circuit.json new file mode 100644 index 000000000..ce1959ef0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/digital_circuit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/digital_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/digital_circuit_board.json b/src/generated/resources/assets/modern_industrialization/items/digital_circuit_board.json new file mode 100644 index 000000000..7e2835e18 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/digital_circuit_board.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/digital_circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/diode.json b/src/generated/resources/assets/modern_industrialization/items/diode.json new file mode 100644 index 000000000..deed30115 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/diode.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/diode" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/distillation_tower.json b/src/generated/resources/assets/modern_industrialization/items/distillation_tower.json new file mode 100644 index 000000000..5144ef59b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/distillation_tower.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:distillation_tower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/distillery.json b/src/generated/resources/assets/modern_industrialization/items/distillery.json new file mode 100644 index 000000000..ce3837a0f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/distillery.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:distillery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/items/electric_blast_furnace.json new file mode 100644 index 000000000..00c3dd2ec --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_blast_furnace.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_blast_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_compressor.json b/src/generated/resources/assets/modern_industrialization/items/electric_compressor.json new file mode 100644 index 000000000..98eb69dfa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_compressor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/items/electric_cutting_machine.json new file mode 100644 index 000000000..be28e5259 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_cutting_machine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_cutting_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_furnace.json b/src/generated/resources/assets/modern_industrialization/items/electric_furnace.json new file mode 100644 index 000000000..9f430654f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_furnace.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_macerator.json b/src/generated/resources/assets/modern_industrialization/items/electric_macerator.json new file mode 100644 index 000000000..d64317798 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_macerator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_macerator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_mixer.json b/src/generated/resources/assets/modern_industrialization/items/electric_mixer.json new file mode 100644 index 000000000..9cccca504 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_mixer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_mixer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_packer.json b/src/generated/resources/assets/modern_industrialization/items/electric_packer.json new file mode 100644 index 000000000..295f85f0c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_packer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_packer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_quarry.json b/src/generated/resources/assets/modern_industrialization/items/electric_quarry.json new file mode 100644 index 000000000..d20baa55b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_quarry.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_quarry" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_unpacker.json b/src/generated/resources/assets/modern_industrialization/items/electric_unpacker.json new file mode 100644 index 000000000..581ebf6b9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_unpacker.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_unpacker" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_water_pump.json b/src/generated/resources/assets/modern_industrialization/items/electric_water_pump.json new file mode 100644 index 000000000..546b98394 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_water_pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_water_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electric_wiremill.json b/src/generated/resources/assets/modern_industrialization/items/electric_wiremill.json new file mode 100644 index 000000000..702fdfc6a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electric_wiremill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electric_wiremill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrolyzer.json b/src/generated/resources/assets/modern_industrialization/items/electrolyzer.json new file mode 100644 index 000000000..85afc6550 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrolyzer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:electrolyzer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electronic_circuit.json b/src/generated/resources/assets/modern_industrialization/items/electronic_circuit.json new file mode 100644 index 000000000..2aadff8e1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electronic_circuit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electronic_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electronic_circuit_board.json b/src/generated/resources/assets/modern_industrialization/items/electronic_circuit_board.json new file mode 100644 index 000000000..2c67e1e91 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electronic_circuit_board.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electronic_circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_block.json b/src/generated/resources/assets/modern_industrialization/items/electrum_block.json new file mode 100644 index 000000000..e6de7e9c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/electrum_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_cable.json b/src/generated/resources/assets/modern_industrialization/items/electrum_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/electrum_double_ingot.json new file mode 100644 index 000000000..93f36b10b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_dust.json b/src/generated/resources/assets/modern_industrialization/items/electrum_dust.json new file mode 100644 index 000000000..1f5a47d80 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_fine_wire.json b/src/generated/resources/assets/modern_industrialization/items/electrum_fine_wire.json new file mode 100644 index 000000000..d489868ed --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_fine_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_fine_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_ingot.json b/src/generated/resources/assets/modern_industrialization/items/electrum_ingot.json new file mode 100644 index 000000000..bc73312a8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_nugget.json b/src/generated/resources/assets/modern_industrialization/items/electrum_nugget.json new file mode 100644 index 000000000..5691f0d3a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_plate.json b/src/generated/resources/assets/modern_industrialization/items/electrum_plate.json new file mode 100644 index 000000000..f4c23ba6b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/electrum_tiny_dust.json new file mode 100644 index 000000000..ffc116e67 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/electrum_wire.json b/src/generated/resources/assets/modern_industrialization/items/electrum_wire.json new file mode 100644 index 000000000..55b3a62a7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/electrum_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/electrum_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/emerald_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/emerald_crushed_dust.json new file mode 100644 index 000000000..7c4888e56 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/emerald_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/emerald_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/emerald_dust.json b/src/generated/resources/assets/modern_industrialization/items/emerald_dust.json new file mode 100644 index 000000000..234a799ba --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/emerald_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/emerald_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/emerald_plate.json b/src/generated/resources/assets/modern_industrialization/items/emerald_plate.json new file mode 100644 index 000000000..8906f6a04 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/emerald_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/emerald_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/emerald_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/emerald_tiny_dust.json new file mode 100644 index 000000000..f9f543d05 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/emerald_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/emerald_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ethanol_bucket.json b/src/generated/resources/assets/modern_industrialization/items/ethanol_bucket.json new file mode 100644 index 000000000..fb5135ce3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ethanol_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/ethanol_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ethylbenzene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/ethylbenzene_bucket.json new file mode 100644 index 000000000..207f05bfb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ethylbenzene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/ethylbenzene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ethylene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/ethylene_bucket.json new file mode 100644 index 000000000..f7b015fa4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ethylene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/ethylene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ev_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/ev_energy_input_hatch.json new file mode 100644 index 000000000..21601d95f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ev_energy_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:ev_energy_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ev_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/ev_energy_output_hatch.json new file mode 100644 index 000000000..b63686fa4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ev_energy_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:ev_energy_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ev_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/items/ev_hv_transformer.json new file mode 100644 index 000000000..b6aff3551 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ev_hv_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:ev_hv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ev_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/ev_storage_unit.json new file mode 100644 index 000000000..5539fb7ac --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ev_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:ev_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ev_superconductor_transformer.json b/src/generated/resources/assets/modern_industrialization/items/ev_superconductor_transformer.json new file mode 100644 index 000000000..cbfae5e93 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ev_superconductor_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:ev_superconductor_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/fire_clay_brick.json b/src/generated/resources/assets/modern_industrialization/items/fire_clay_brick.json new file mode 100644 index 000000000..3bc6adb38 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/fire_clay_brick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/fire_clay_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/fire_clay_bricks.json b/src/generated/resources/assets/modern_industrialization/items/fire_clay_bricks.json new file mode 100644 index 000000000..29dfc5f5f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/fire_clay_bricks.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/fire_clay_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/fire_clay_dust.json b/src/generated/resources/assets/modern_industrialization/items/fire_clay_dust.json new file mode 100644 index 000000000..d56b53145 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/fire_clay_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/fire_clay_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/forge_hammer.json b/src/generated/resources/assets/modern_industrialization/items/forge_hammer.json new file mode 100644 index 000000000..eeb6d33f5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/forge_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/forge_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/frostproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/frostproof_machine_casing.json new file mode 100644 index 000000000..8418f4c79 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/frostproof_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/frostproof_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/fusion_chamber.json b/src/generated/resources/assets/modern_industrialization/items/fusion_chamber.json new file mode 100644 index 000000000..f2720c16a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/fusion_chamber.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/fusion_chamber" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/fusion_reactor.json b/src/generated/resources/assets/modern_industrialization/items/fusion_reactor.json new file mode 100644 index 000000000..97cf7a87b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/fusion_reactor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:fusion_reactor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_bolt.json b/src/generated/resources/assets/modern_industrialization/items/gold_bolt.json new file mode 100644 index 000000000..477a9fb89 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/gold_curved_plate.json new file mode 100644 index 000000000..cf37bc772 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/gold_double_ingot.json new file mode 100644 index 000000000..15fbfc936 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_drill.json b/src/generated/resources/assets/modern_industrialization/items/gold_drill.json new file mode 100644 index 000000000..8a05ce3c0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/gold_drill_head.json new file mode 100644 index 000000000..144843c24 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_dust.json b/src/generated/resources/assets/modern_industrialization/items/gold_dust.json new file mode 100644 index 000000000..1a38dca8f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_gear.json b/src/generated/resources/assets/modern_industrialization/items/gold_gear.json new file mode 100644 index 000000000..c29485adf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_plate.json b/src/generated/resources/assets/modern_industrialization/items/gold_plate.json new file mode 100644 index 000000000..44b934cc6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_ring.json b/src/generated/resources/assets/modern_industrialization/items/gold_ring.json new file mode 100644 index 000000000..26faddf8e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_rod.json b/src/generated/resources/assets/modern_industrialization/items/gold_rod.json new file mode 100644 index 000000000..3bdb425f9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gold_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/gold_tiny_dust.json new file mode 100644 index 000000000..2b3fd231e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gold_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gold_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gravichestplate.json b/src/generated/resources/assets/modern_industrialization/items/gravichestplate.json new file mode 100644 index 000000000..564270c5b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gravichestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/gravichestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gray_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/gray_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gray_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/gray_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/gray_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/gray_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/green_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/green_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/green_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/green_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/green_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/green_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/guidebook.json b/src/generated/resources/assets/modern_industrialization/items/guidebook.json new file mode 100644 index 000000000..92932f825 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/guidebook.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/guidebook" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_block.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_block.json new file mode 100644 index 000000000..b3bd31b10 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/he_mox_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_dust.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_dust.json new file mode 100644 index 000000000..153ac0bf5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod.json new file mode 100644 index 000000000..380232120 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_fuel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_depleted.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_depleted.json new file mode 100644 index 000000000..957edeb60 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_depleted.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_fuel_rod_depleted" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_double.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_double.json new file mode 100644 index 000000000..017770a82 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_double.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_fuel_rod_double" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_quad.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_quad.json new file mode 100644 index 000000000..afb2db7ab --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_fuel_rod_quad.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_fuel_rod_quad" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_ingot.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_ingot.json new file mode 100644 index 000000000..18c4a9f18 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_nugget.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_nugget.json new file mode 100644 index 000000000..5da5f4692 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_rod.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_rod.json new file mode 100644 index 000000000..3ae0b72dd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_mox_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/he_mox_tiny_dust.json new file mode 100644 index 000000000..b68d36902 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_mox_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_mox_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_block.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_block.json new file mode 100644 index 000000000..c922d9010 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/he_uranium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_dust.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_dust.json new file mode 100644 index 000000000..86493d124 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod.json new file mode 100644 index 000000000..da22035a7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_fuel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_depleted.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_depleted.json new file mode 100644 index 000000000..314799903 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_depleted.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_fuel_rod_depleted" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_double.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_double.json new file mode 100644 index 000000000..92cdd730c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_double.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_fuel_rod_double" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_quad.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_quad.json new file mode 100644 index 000000000..b7a9e6ec5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_fuel_rod_quad.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_fuel_rod_quad" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_ingot.json new file mode 100644 index 000000000..9c557fc82 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_nugget.json new file mode 100644 index 000000000..488978855 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_rod.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_rod.json new file mode 100644 index 000000000..01c55f586 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/he_uranium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/he_uranium_tiny_dust.json new file mode 100644 index 000000000..91ab656cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/he_uranium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/he_uranium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/heat_exchanger.json b/src/generated/resources/assets/modern_industrialization/items/heat_exchanger.json new file mode 100644 index 000000000..0498c73f5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/heat_exchanger.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:heat_exchanger" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/heatproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/heatproof_machine_casing.json new file mode 100644 index 000000000..c6a296ec5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/heatproof_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/heatproof_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/heavy_fuel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/heavy_fuel_bucket.json new file mode 100644 index 000000000..034732a96 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/heavy_fuel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/heavy_fuel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/heavy_water_bucket.json b/src/generated/resources/assets/modern_industrialization/items/heavy_water_bucket.json new file mode 100644 index 000000000..46aaba420 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/heavy_water_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/heavy_water_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/heavy_water_steam_bucket.json b/src/generated/resources/assets/modern_industrialization/items/heavy_water_steam_bucket.json new file mode 100644 index 000000000..958d94df9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/heavy_water_steam_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/heavy_water_steam_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/helium_3_bucket.json b/src/generated/resources/assets/modern_industrialization/items/helium_3_bucket.json new file mode 100644 index 000000000..9e64876ac --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/helium_3_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/helium_3_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/helium_bucket.json b/src/generated/resources/assets/modern_industrialization/items/helium_bucket.json new file mode 100644 index 000000000..3156fcaa2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/helium_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/helium_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/helium_plasma_bucket.json b/src/generated/resources/assets/modern_industrialization/items/helium_plasma_bucket.json new file mode 100644 index 000000000..dc0a063c4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/helium_plasma_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/helium_plasma_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/items/high_pressure_advanced_large_steam_boiler.json new file mode 100644 index 000000000..fd6675e7a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/high_pressure_advanced_large_steam_boiler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:high_pressure_advanced_large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/high_pressure_heavy_water_bucket.json b/src/generated/resources/assets/modern_industrialization/items/high_pressure_heavy_water_bucket.json new file mode 100644 index 000000000..9edc439ce --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/high_pressure_heavy_water_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/high_pressure_heavy_water_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/high_pressure_heavy_water_steam_bucket.json b/src/generated/resources/assets/modern_industrialization/items/high_pressure_heavy_water_steam_bucket.json new file mode 100644 index 000000000..19e04e721 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/high_pressure_heavy_water_steam_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/high_pressure_heavy_water_steam_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/high_pressure_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/items/high_pressure_large_steam_boiler.json new file mode 100644 index 000000000..f305a4f45 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/high_pressure_large_steam_boiler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:high_pressure_large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/high_pressure_steam_bucket.json b/src/generated/resources/assets/modern_industrialization/items/high_pressure_steam_bucket.json new file mode 100644 index 000000000..1dc8cfcbb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/high_pressure_steam_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/high_pressure_steam_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/high_pressure_water_bucket.json b/src/generated/resources/assets/modern_industrialization/items/high_pressure_water_bucket.json new file mode 100644 index 000000000..2180e9049 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/high_pressure_water_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/high_pressure_water_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_fluid_input_hatch.json new file mode 100644 index 000000000..ea20cb2c6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_fluid_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:highly_advanced_fluid_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_fluid_output_hatch.json new file mode 100644 index 000000000..7996a52cb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_fluid_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:highly_advanced_fluid_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_item_input_hatch.json new file mode 100644 index 000000000..37193023a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_item_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:highly_advanced_item_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_item_output_hatch.json new file mode 100644 index 000000000..9da0147c8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_item_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:highly_advanced_item_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_machine_casing.json new file mode 100644 index 000000000..b4dcd9242 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/highly_advanced_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_machine_hull.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_machine_hull.json new file mode 100644 index 000000000..f8e7715b0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_machine_hull.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/highly_advanced_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/highly_advanced_upgrade.json b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_upgrade.json new file mode 100644 index 000000000..fa0888fd4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/highly_advanced_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/highly_advanced_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/items/hv_diesel_generator.json new file mode 100644 index 000000000..6f1a4c977 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_diesel_generator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/hv_energy_input_hatch.json new file mode 100644 index 000000000..5c80525b6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_energy_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_energy_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/hv_energy_output_hatch.json new file mode 100644 index 000000000..ab9152e75 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_energy_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_energy_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/items/hv_ev_transformer.json new file mode 100644 index 000000000..02e666d62 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_ev_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_ev_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/items/hv_mv_transformer.json new file mode 100644 index 000000000..abeaca71b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_mv_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_mv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/items/hv_steam_turbine.json new file mode 100644 index 000000000..e5b5167f6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_steam_turbine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/hv_storage_unit.json new file mode 100644 index 000000000..219fa04e9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hv_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:hv_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hydrochloric_acid_bucket.json b/src/generated/resources/assets/modern_industrialization/items/hydrochloric_acid_bucket.json new file mode 100644 index 000000000..057b4b25e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hydrochloric_acid_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/hydrochloric_acid_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/hydrogen_bucket.json b/src/generated/resources/assets/modern_industrialization/items/hydrogen_bucket.json new file mode 100644 index 000000000..905ffab02 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/hydrogen_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/hydrogen_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/implosion_compressor.json b/src/generated/resources/assets/modern_industrialization/items/implosion_compressor.json new file mode 100644 index 000000000..1a0215a1c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/implosion_compressor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:implosion_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/inductor.json b/src/generated/resources/assets/modern_industrialization/items/inductor.json new file mode 100644 index 000000000..fcf4ed703 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/inductor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/inductor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/industrial_tnt.json b/src/generated/resources/assets/modern_industrialization/items/industrial_tnt.json new file mode 100644 index 000000000..534e8b511 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/industrial_tnt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/industrial_tnt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_block.json b/src/generated/resources/assets/modern_industrialization/items/invar_block.json new file mode 100644 index 000000000..7e6d6e90a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/invar_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_bolt.json b/src/generated/resources/assets/modern_industrialization/items/invar_bolt.json new file mode 100644 index 000000000..2c601dd7d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/invar_double_ingot.json new file mode 100644 index 000000000..c5dcdbc1f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_dust.json b/src/generated/resources/assets/modern_industrialization/items/invar_dust.json new file mode 100644 index 000000000..685721d8c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_gear.json b/src/generated/resources/assets/modern_industrialization/items/invar_gear.json new file mode 100644 index 000000000..a064b6243 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_ingot.json b/src/generated/resources/assets/modern_industrialization/items/invar_ingot.json new file mode 100644 index 000000000..7471a6999 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/invar_large_plate.json new file mode 100644 index 000000000..dc055de04 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_nugget.json b/src/generated/resources/assets/modern_industrialization/items/invar_nugget.json new file mode 100644 index 000000000..d27e265a0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_plate.json b/src/generated/resources/assets/modern_industrialization/items/invar_plate.json new file mode 100644 index 000000000..3613ccd95 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_ring.json b/src/generated/resources/assets/modern_industrialization/items/invar_ring.json new file mode 100644 index 000000000..b14407c89 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_rod.json b/src/generated/resources/assets/modern_industrialization/items/invar_rod.json new file mode 100644 index 000000000..5ad9ac68f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_rotary_blade.json b/src/generated/resources/assets/modern_industrialization/items/invar_rotary_blade.json new file mode 100644 index 000000000..0f56b4158 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_rotary_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_rotary_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/invar_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/invar_tiny_dust.json new file mode 100644 index 000000000..ea9d91d06 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/invar_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/invar_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_block.json b/src/generated/resources/assets/modern_industrialization/items/iridium_block.json new file mode 100644 index 000000000..5f4e81638 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/iridium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/iridium_curved_plate.json new file mode 100644 index 000000000..5385dc00e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iridium_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_dust.json b/src/generated/resources/assets/modern_industrialization/items/iridium_dust.json new file mode 100644 index 000000000..3b59a8f1c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iridium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/iridium_ingot.json new file mode 100644 index 000000000..6a62f3081 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iridium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/items/iridium_machine_casing_pipe.json new file mode 100644 index 000000000..ea3869451 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_machine_casing_pipe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/iridium_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/iridium_nugget.json new file mode 100644 index 000000000..3bd1acb40 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iridium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_ore.json b/src/generated/resources/assets/modern_industrialization/items/iridium_ore.json new file mode 100644 index 000000000..fc20fa841 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/iridium_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_plate.json b/src/generated/resources/assets/modern_industrialization/items/iridium_plate.json new file mode 100644 index 000000000..84f69d66e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iridium_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iridium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/iridium_tiny_dust.json new file mode 100644 index 000000000..f35370d02 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iridium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iridium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_barrel.json b/src/generated/resources/assets/modern_industrialization/items/iron_barrel.json new file mode 100644 index 000000000..12a1c24a5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/iron_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/iron_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_bolt.json b/src/generated/resources/assets/modern_industrialization/items/iron_bolt.json new file mode 100644 index 000000000..e1d633e77 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/iron_double_ingot.json new file mode 100644 index 000000000..d55117d74 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_dust.json b/src/generated/resources/assets/modern_industrialization/items/iron_dust.json new file mode 100644 index 000000000..3277cc039 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_gear.json b/src/generated/resources/assets/modern_industrialization/items/iron_gear.json new file mode 100644 index 000000000..38f7c75b5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_hammer.json b/src/generated/resources/assets/modern_industrialization/items/iron_hammer.json new file mode 100644 index 000000000..01db443e3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/iron_large_plate.json new file mode 100644 index 000000000..216302b8d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_plate.json b/src/generated/resources/assets/modern_industrialization/items/iron_plate.json new file mode 100644 index 000000000..fb9be3738 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_ring.json b/src/generated/resources/assets/modern_industrialization/items/iron_ring.json new file mode 100644 index 000000000..34a7565a1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_rod.json b/src/generated/resources/assets/modern_industrialization/items/iron_rod.json new file mode 100644 index 000000000..07c09acd1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_tank.json b/src/generated/resources/assets/modern_industrialization/items/iron_tank.json new file mode 100644 index 000000000..f7f584478 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/iron_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/iron_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/iron_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/iron_tiny_dust.json new file mode 100644 index 000000000..c8e78cba6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/iron_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/iron_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_block.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_block.json new file mode 100644 index 000000000..47d7b3a50 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/kanthal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_cable.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_coil.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_coil.json new file mode 100644 index 000000000..c7c842994 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_coil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/kanthal_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_double_ingot.json new file mode 100644 index 000000000..fffd95b29 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_dust.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_dust.json new file mode 100644 index 000000000..28dd273fc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_hot_ingot.json new file mode 100644 index 000000000..f2c996d0b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_ingot.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_ingot.json new file mode 100644 index 000000000..e34f3c438 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_nugget.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_nugget.json new file mode 100644 index 000000000..923fc2773 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_plate.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_plate.json new file mode 100644 index 000000000..8ab5eac10 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_tiny_dust.json new file mode 100644 index 000000000..be749a581 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/kanthal_wire.json b/src/generated/resources/assets/modern_industrialization/items/kanthal_wire.json new file mode 100644 index 000000000..2fea7e438 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/kanthal_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/kanthal_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lapis_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/lapis_crushed_dust.json new file mode 100644 index 000000000..682b4ea6a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lapis_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lapis_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lapis_dust.json b/src/generated/resources/assets/modern_industrialization/items/lapis_dust.json new file mode 100644 index 000000000..3ee8e2283 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lapis_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lapis_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lapis_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/lapis_tiny_dust.json new file mode 100644 index 000000000..a01dd4121 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lapis_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lapis_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_advanced_motor.json b/src/generated/resources/assets/modern_industrialization/items/large_advanced_motor.json new file mode 100644 index 000000000..68f0160f1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_advanced_motor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/large_advanced_motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_advanced_pump.json b/src/generated/resources/assets/modern_industrialization/items/large_advanced_pump.json new file mode 100644 index 000000000..9cdaf40c4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_advanced_pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/large_advanced_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/items/large_diesel_generator.json new file mode 100644 index 000000000..ed394040c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_diesel_generator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:large_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_heat_exchanger.json b/src/generated/resources/assets/modern_industrialization/items/large_heat_exchanger.json new file mode 100644 index 000000000..0733fc38d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_heat_exchanger.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/large_heat_exchanger" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_motor.json b/src/generated/resources/assets/modern_industrialization/items/large_motor.json new file mode 100644 index 000000000..5de22ab13 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_motor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/large_motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_pump.json b/src/generated/resources/assets/modern_industrialization/items/large_pump.json new file mode 100644 index 000000000..8e1452ef5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/large_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/items/large_steam_boiler.json new file mode 100644 index 000000000..a6c586538 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_steam_boiler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/items/large_steam_turbine.json new file mode 100644 index 000000000..1d03f72eb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_steam_turbine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:large_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_tank.json b/src/generated/resources/assets/modern_industrialization/items/large_tank.json new file mode 100644 index 000000000..242258ba8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_tank.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:large_tank" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/large_tank_hatch.json b/src/generated/resources/assets/modern_industrialization/items/large_tank_hatch.json new file mode 100644 index 000000000..f1ffeef43 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/large_tank_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:large_tank_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_block.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_block.json new file mode 100644 index 000000000..705b238c7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/le_mox_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_dust.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_dust.json new file mode 100644 index 000000000..d0f191d54 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod.json new file mode 100644 index 000000000..0bfef9239 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_fuel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_depleted.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_depleted.json new file mode 100644 index 000000000..ad2cd32e7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_depleted.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_fuel_rod_depleted" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_double.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_double.json new file mode 100644 index 000000000..a8d3685f1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_double.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_fuel_rod_double" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_quad.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_quad.json new file mode 100644 index 000000000..5d4493f5c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_fuel_rod_quad.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_fuel_rod_quad" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_ingot.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_ingot.json new file mode 100644 index 000000000..7c4f40acf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_nugget.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_nugget.json new file mode 100644 index 000000000..4e618a713 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_rod.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_rod.json new file mode 100644 index 000000000..8a894de37 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_mox_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/le_mox_tiny_dust.json new file mode 100644 index 000000000..c38c724dd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_mox_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_mox_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_block.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_block.json new file mode 100644 index 000000000..c624feb8f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/le_uranium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_dust.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_dust.json new file mode 100644 index 000000000..77451229d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod.json new file mode 100644 index 000000000..a8cbb9131 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_fuel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_depleted.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_depleted.json new file mode 100644 index 000000000..1e380edb3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_depleted.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_fuel_rod_depleted" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_double.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_double.json new file mode 100644 index 000000000..19b55aa89 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_double.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_fuel_rod_double" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_quad.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_quad.json new file mode 100644 index 000000000..2123e1e4a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_fuel_rod_quad.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_fuel_rod_quad" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_ingot.json new file mode 100644 index 000000000..0e0c3004a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_nugget.json new file mode 100644 index 000000000..3ac62ecf2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_rod.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_rod.json new file mode 100644 index 000000000..d34c04fb5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/le_uranium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/le_uranium_tiny_dust.json new file mode 100644 index 000000000..557ba5b3c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/le_uranium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/le_uranium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_block.json b/src/generated/resources/assets/modern_industrialization/items/lead_block.json new file mode 100644 index 000000000..1d3f643a6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/lead_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/lead_double_ingot.json new file mode 100644 index 000000000..d98a4d9f6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lead_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_dust.json b/src/generated/resources/assets/modern_industrialization/items/lead_dust.json new file mode 100644 index 000000000..5676a5ce3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lead_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_ingot.json b/src/generated/resources/assets/modern_industrialization/items/lead_ingot.json new file mode 100644 index 000000000..2c5a8b487 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lead_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_nugget.json b/src/generated/resources/assets/modern_industrialization/items/lead_nugget.json new file mode 100644 index 000000000..ea2d2654f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lead_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_ore.json b/src/generated/resources/assets/modern_industrialization/items/lead_ore.json new file mode 100644 index 000000000..25a651eee --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/lead_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_plate.json b/src/generated/resources/assets/modern_industrialization/items/lead_plate.json new file mode 100644 index 000000000..7f2fdf03c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lead_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lead_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/lead_tiny_dust.json new file mode 100644 index 000000000..3560eebed --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lead_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lead_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/light_blue_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/light_blue_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/light_blue_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/light_blue_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/light_blue_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/light_blue_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/light_fuel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/light_fuel_bucket.json new file mode 100644 index 000000000..81fde49c4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/light_fuel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/light_fuel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/light_gray_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/light_gray_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/light_gray_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/light_gray_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/light_gray_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/light_gray_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lignite_coal.json b/src/generated/resources/assets/modern_industrialization/items/lignite_coal.json new file mode 100644 index 000000000..501c49cb2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lignite_coal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lignite_coal" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lignite_coal_block.json b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_block.json new file mode 100644 index 000000000..c12e040b7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/lignite_coal_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lignite_coal_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_crushed_dust.json new file mode 100644 index 000000000..0bad2196b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lignite_coal_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lignite_coal_dust.json b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_dust.json new file mode 100644 index 000000000..7a3102634 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lignite_coal_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lignite_coal_ore.json b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_ore.json new file mode 100644 index 000000000..f27a6fc61 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/lignite_coal_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lignite_coal_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_tiny_dust.json new file mode 100644 index 000000000..e5005874b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lignite_coal_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lignite_coal_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lime_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/lime_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lime_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lime_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/lime_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lime_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/liquid_air_bucket.json b/src/generated/resources/assets/modern_industrialization/items/liquid_air_bucket.json new file mode 100644 index 000000000..1abb04e2b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/liquid_air_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/liquid_air_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lubricant_bucket.json b/src/generated/resources/assets/modern_industrialization/items/lubricant_bucket.json new file mode 100644 index 000000000..9318161ec --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lubricant_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/lubricant_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/items/lv_diesel_generator.json new file mode 100644 index 000000000..2fe79caee --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lv_diesel_generator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:lv_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/lv_energy_input_hatch.json new file mode 100644 index 000000000..0669f2424 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lv_energy_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:lv_energy_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/lv_energy_output_hatch.json new file mode 100644 index 000000000..44a68d1b0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lv_energy_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:lv_energy_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/items/lv_mv_transformer.json new file mode 100644 index 000000000..7853cbd58 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lv_mv_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:lv_mv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/items/lv_steam_turbine.json new file mode 100644 index 000000000..71dd27a21 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lv_steam_turbine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:lv_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/lv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/lv_storage_unit.json new file mode 100644 index 000000000..d9d2005b3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/lv_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:lv_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/magenta_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/magenta_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/magenta_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/magenta_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/magenta_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/magenta_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/manganese_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/manganese_crushed_dust.json new file mode 100644 index 000000000..169bee365 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/manganese_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/manganese_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/manganese_dust.json b/src/generated/resources/assets/modern_industrialization/items/manganese_dust.json new file mode 100644 index 000000000..8a311b8bb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/manganese_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/manganese_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/manganese_sulfuric_solution_bucket.json b/src/generated/resources/assets/modern_industrialization/items/manganese_sulfuric_solution_bucket.json new file mode 100644 index 000000000..b1e5e4d8d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/manganese_sulfuric_solution_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/manganese_sulfuric_solution_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/manganese_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/manganese_tiny_dust.json new file mode 100644 index 000000000..1bbe4d73f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/manganese_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/manganese_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/memory_management_unit.json b/src/generated/resources/assets/modern_industrialization/items/memory_management_unit.json new file mode 100644 index 000000000..741fa143c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/memory_management_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/memory_management_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/methane_bucket.json b/src/generated/resources/assets/modern_industrialization/items/methane_bucket.json new file mode 100644 index 000000000..b40fd5647 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/methane_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/methane_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mixed_ingot_blastproof.json b/src/generated/resources/assets/modern_industrialization/items/mixed_ingot_blastproof.json new file mode 100644 index 000000000..7e3281d66 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mixed_ingot_blastproof.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/mixed_ingot_blastproof" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mixed_ingot_iridium.json b/src/generated/resources/assets/modern_industrialization/items/mixed_ingot_iridium.json new file mode 100644 index 000000000..e355edd86 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mixed_ingot_iridium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/mixed_ingot_iridium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mixed_plate_nuclear.json b/src/generated/resources/assets/modern_industrialization/items/mixed_plate_nuclear.json new file mode 100644 index 000000000..defcd0e1e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mixed_plate_nuclear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/mixed_plate_nuclear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/molten_redstone_bucket.json b/src/generated/resources/assets/modern_industrialization/items/molten_redstone_bucket.json new file mode 100644 index 000000000..16023c687 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/molten_redstone_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/molten_redstone_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/monazite_block.json b/src/generated/resources/assets/modern_industrialization/items/monazite_block.json new file mode 100644 index 000000000..4f19286b2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/monazite_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/monazite_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/monazite_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/monazite_crushed_dust.json new file mode 100644 index 000000000..46fe4c5cd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/monazite_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/monazite_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/monazite_dust.json b/src/generated/resources/assets/modern_industrialization/items/monazite_dust.json new file mode 100644 index 000000000..6e2c1e935 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/monazite_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/monazite_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/monazite_ore.json b/src/generated/resources/assets/modern_industrialization/items/monazite_ore.json new file mode 100644 index 000000000..0751d46ab --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/monazite_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/monazite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/monazite_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/monazite_tiny_dust.json new file mode 100644 index 000000000..662ea6344 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/monazite_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/monazite_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/monocrystalline_silicon.json b/src/generated/resources/assets/modern_industrialization/items/monocrystalline_silicon.json new file mode 100644 index 000000000..242e3d182 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/monocrystalline_silicon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/monocrystalline_silicon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/motor.json b/src/generated/resources/assets/modern_industrialization/items/motor.json new file mode 100644 index 000000000..9097cc863 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/motor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/items/mv_diesel_generator.json new file mode 100644 index 000000000..6201ef747 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_diesel_generator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/mv_energy_input_hatch.json new file mode 100644 index 000000000..2bc04a140 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_energy_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_energy_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/mv_energy_output_hatch.json new file mode 100644 index 000000000..92916baf3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_energy_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_energy_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/items/mv_hv_transformer.json new file mode 100644 index 000000000..97540c43b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_hv_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_hv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_lv_transformer.json b/src/generated/resources/assets/modern_industrialization/items/mv_lv_transformer.json new file mode 100644 index 000000000..981df81ef --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_lv_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_lv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/items/mv_steam_turbine.json new file mode 100644 index 000000000..a5eeb22c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_steam_turbine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/mv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/mv_storage_unit.json new file mode 100644 index 000000000..2b2eba44a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/mv_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:mv_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/naphtha_bucket.json b/src/generated/resources/assets/modern_industrialization/items/naphtha_bucket.json new file mode 100644 index 000000000..d886c0e0a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/naphtha_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/naphtha_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/neodymium_block.json b/src/generated/resources/assets/modern_industrialization/items/neodymium_block.json new file mode 100644 index 000000000..3bf32197c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/neodymium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/neodymium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/neodymium_dust.json b/src/generated/resources/assets/modern_industrialization/items/neodymium_dust.json new file mode 100644 index 000000000..14adc4bab --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/neodymium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/neodymium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/neodymium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/neodymium_tiny_dust.json new file mode 100644 index 000000000..a13209097 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/neodymium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/neodymium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/netherite_hammer.json b/src/generated/resources/assets/modern_industrialization/items/netherite_hammer.json new file mode 100644 index 000000000..45a4edbb0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/netherite_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/netherite_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_block.json b/src/generated/resources/assets/modern_industrialization/items/nickel_block.json new file mode 100644 index 000000000..07b5cde7b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/nickel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/nickel_double_ingot.json new file mode 100644 index 000000000..584e77c01 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nickel_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_dust.json b/src/generated/resources/assets/modern_industrialization/items/nickel_dust.json new file mode 100644 index 000000000..f5addef77 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nickel_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_ingot.json b/src/generated/resources/assets/modern_industrialization/items/nickel_ingot.json new file mode 100644 index 000000000..e7840cd6e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nickel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_nugget.json b/src/generated/resources/assets/modern_industrialization/items/nickel_nugget.json new file mode 100644 index 000000000..07a558130 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nickel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_ore.json b/src/generated/resources/assets/modern_industrialization/items/nickel_ore.json new file mode 100644 index 000000000..67e24a38e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/nickel_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_plate.json b/src/generated/resources/assets/modern_industrialization/items/nickel_plate.json new file mode 100644 index 000000000..e25e1a5a6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nickel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nickel_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/nickel_tiny_dust.json new file mode 100644 index 000000000..512c4ac26 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nickel_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nickel_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nitrogen_bucket.json b/src/generated/resources/assets/modern_industrialization/items/nitrogen_bucket.json new file mode 100644 index 000000000..d13dafa41 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nitrogen_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nitrogen_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/not_gate.json b/src/generated/resources/assets/modern_industrialization/items/not_gate.json new file mode 100644 index 000000000..539984201 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/not_gate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/not_gate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_large_plate.json new file mode 100644 index 000000000..0f2a85df8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nuclear_alloy_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_machine_casing_pipe.json new file mode 100644 index 000000000..20180ed5c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_machine_casing_pipe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/nuclear_alloy_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_plate.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_plate.json new file mode 100644 index 000000000..1c74560c6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_alloy_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nuclear_alloy_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_casing.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_casing.json new file mode 100644 index 000000000..d620d164f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/nuclear_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_fluid_hatch.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_fluid_hatch.json new file mode 100644 index 000000000..1ae8fa7b1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_fluid_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:nuclear_fluid_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_item_hatch.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_item_hatch.json new file mode 100644 index 000000000..10db2b189 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_item_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:nuclear_item_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuclear_reactor.json b/src/generated/resources/assets/modern_industrialization/items/nuclear_reactor.json new file mode 100644 index 000000000..18dae47a7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuclear_reactor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:nuclear_reactor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nuke.json b/src/generated/resources/assets/modern_industrialization/items/nuke.json new file mode 100644 index 000000000..ca081919d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nuke.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/nuke" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/nylon_bucket.json b/src/generated/resources/assets/modern_industrialization/items/nylon_bucket.json new file mode 100644 index 000000000..2527a4ca3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/nylon_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/nylon_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/oil_drilling_rig.json b/src/generated/resources/assets/modern_industrialization/items/oil_drilling_rig.json new file mode 100644 index 000000000..c150a3d07 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/oil_drilling_rig.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:oil_drilling_rig" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/op_amp.json b/src/generated/resources/assets/modern_industrialization/items/op_amp.json new file mode 100644 index 000000000..e09a63183 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/op_amp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/op_amp" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/or_gate.json b/src/generated/resources/assets/modern_industrialization/items/or_gate.json new file mode 100644 index 000000000..25fac5270 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/or_gate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/or_gate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/orange_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/orange_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/orange_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/orange_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/orange_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/orange_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/overdrive_module.json b/src/generated/resources/assets/modern_industrialization/items/overdrive_module.json new file mode 100644 index 000000000..135b161ff --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/overdrive_module.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/overdrive_module" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/oxygen_bucket.json b/src/generated/resources/assets/modern_industrialization/items/oxygen_bucket.json new file mode 100644 index 000000000..9063729f4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/oxygen_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/oxygen_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/packer_block_template.json b/src/generated/resources/assets/modern_industrialization/items/packer_block_template.json new file mode 100644 index 000000000..c00311dc0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/packer_block_template.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/packer_block_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/packer_double_ingot_template.json b/src/generated/resources/assets/modern_industrialization/items/packer_double_ingot_template.json new file mode 100644 index 000000000..ec438a952 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/packer_double_ingot_template.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/packer_double_ingot_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/pink_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/pink_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/pink_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/pink_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/pink_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/pink_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/piston.json b/src/generated/resources/assets/modern_industrialization/items/piston.json new file mode 100644 index 000000000..04861dd88 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/piston.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/piston" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plant_oil_bucket.json b/src/generated/resources/assets/modern_industrialization/items/plant_oil_bucket.json new file mode 100644 index 000000000..a0a9c1543 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plant_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/plant_oil_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plasma_handling_iridium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/plasma_handling_iridium_machine_casing.json new file mode 100644 index 000000000..4c628aff7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plasma_handling_iridium_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/plasma_handling_iridium_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plasma_turbine.json b/src/generated/resources/assets/modern_industrialization/items/plasma_turbine.json new file mode 100644 index 000000000..abae43197 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plasma_turbine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:plasma_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_block.json b/src/generated/resources/assets/modern_industrialization/items/platinum_block.json new file mode 100644 index 000000000..bc44d8d53 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/platinum_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_cable.json b/src/generated/resources/assets/modern_industrialization/items/platinum_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/platinum_double_ingot.json new file mode 100644 index 000000000..7fced80f2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_dust.json b/src/generated/resources/assets/modern_industrialization/items/platinum_dust.json new file mode 100644 index 000000000..0eee23761 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_fine_wire.json b/src/generated/resources/assets/modern_industrialization/items/platinum_fine_wire.json new file mode 100644 index 000000000..b3defab4b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_fine_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_fine_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/platinum_hot_ingot.json new file mode 100644 index 000000000..54ecbfedd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_ingot.json b/src/generated/resources/assets/modern_industrialization/items/platinum_ingot.json new file mode 100644 index 000000000..f5a3290d1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_nugget.json b/src/generated/resources/assets/modern_industrialization/items/platinum_nugget.json new file mode 100644 index 000000000..bbcddac63 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_ore.json b/src/generated/resources/assets/modern_industrialization/items/platinum_ore.json new file mode 100644 index 000000000..c14255292 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/platinum_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_plate.json b/src/generated/resources/assets/modern_industrialization/items/platinum_plate.json new file mode 100644 index 000000000..38ace9e58 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_sulfuric_solution_bucket.json b/src/generated/resources/assets/modern_industrialization/items/platinum_sulfuric_solution_bucket.json new file mode 100644 index 000000000..2d2745ba7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_sulfuric_solution_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_sulfuric_solution_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/platinum_tiny_dust.json new file mode 100644 index 000000000..93937d62a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/platinum_wire.json b/src/generated/resources/assets/modern_industrialization/items/platinum_wire.json new file mode 100644 index 000000000..a2d0b0f40 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/platinum_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/platinum_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plutonium_battery.json b/src/generated/resources/assets/modern_industrialization/items/plutonium_battery.json new file mode 100644 index 000000000..d8d1673f3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plutonium_battery.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/plutonium_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plutonium_block.json b/src/generated/resources/assets/modern_industrialization/items/plutonium_block.json new file mode 100644 index 000000000..1616eec1e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plutonium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/plutonium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plutonium_dust.json b/src/generated/resources/assets/modern_industrialization/items/plutonium_dust.json new file mode 100644 index 000000000..d07d83547 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plutonium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/plutonium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plutonium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/plutonium_ingot.json new file mode 100644 index 000000000..e1f8574a3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plutonium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/plutonium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plutonium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/plutonium_nugget.json new file mode 100644 index 000000000..8f655948d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plutonium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/plutonium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/plutonium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/plutonium_tiny_dust.json new file mode 100644 index 000000000..d9e411a4a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/plutonium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/plutonium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/polarizer.json b/src/generated/resources/assets/modern_industrialization/items/polarizer.json new file mode 100644 index 000000000..823ddeedb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/polarizer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:polarizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/polyethylene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/polyethylene_bucket.json new file mode 100644 index 000000000..f9844afda --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/polyethylene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/polyethylene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/polyvinyl_chloride_bucket.json b/src/generated/resources/assets/modern_industrialization/items/polyvinyl_chloride_bucket.json new file mode 100644 index 000000000..0e5b3ed67 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/polyvinyl_chloride_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/polyvinyl_chloride_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/portable_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/portable_storage_unit.json new file mode 100644 index 000000000..9b4afc0cc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/portable_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/portable_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/pressurizer.json b/src/generated/resources/assets/modern_industrialization/items/pressurizer.json new file mode 100644 index 000000000..94e2f1855 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/pressurizer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:pressurizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/processing_unit.json b/src/generated/resources/assets/modern_industrialization/items/processing_unit.json new file mode 100644 index 000000000..7986ed315 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/processing_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/processing_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/processing_unit_board.json b/src/generated/resources/assets/modern_industrialization/items/processing_unit_board.json new file mode 100644 index 000000000..470cf65af --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/processing_unit_board.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/processing_unit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/propene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/propene_bucket.json new file mode 100644 index 000000000..156eb985e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/propene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/propene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/pump.json b/src/generated/resources/assets/modern_industrialization/items/pump.json new file mode 100644 index 000000000..23794abce --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/purified_platinum_sulfuric_solution_bucket.json b/src/generated/resources/assets/modern_industrialization/items/purified_platinum_sulfuric_solution_bucket.json new file mode 100644 index 000000000..96b8e9e0e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/purified_platinum_sulfuric_solution_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/purified_platinum_sulfuric_solution_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/purple_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/purple_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/purple_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/purple_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/purple_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/purple_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_barrel.json b/src/generated/resources/assets/modern_industrialization/items/quantum_barrel.json new file mode 100644 index 000000000..15c5dbdb9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/quantum_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/quantum_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_boots.json b/src/generated/resources/assets/modern_industrialization/items/quantum_boots.json new file mode 100644 index 000000000..7aa0308b5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_chestplate.json b/src/generated/resources/assets/modern_industrialization/items/quantum_chestplate.json new file mode 100644 index 000000000..951e6a4dc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_chestplate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_circuit.json b/src/generated/resources/assets/modern_industrialization/items/quantum_circuit.json new file mode 100644 index 000000000..5481644df --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_circuit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_circuit_board.json b/src/generated/resources/assets/modern_industrialization/items/quantum_circuit_board.json new file mode 100644 index 000000000..be7ffe66b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_circuit_board.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_helmet.json b/src/generated/resources/assets/modern_industrialization/items/quantum_helmet.json new file mode 100644 index 000000000..7bbd25074 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_leggings.json b/src/generated/resources/assets/modern_industrialization/items/quantum_leggings.json new file mode 100644 index 000000000..75bc21284 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_leggings.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/quantum_machine_casing.json new file mode 100644 index 000000000..a954aaaa4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/quantum_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_machine_hull.json b/src/generated/resources/assets/modern_industrialization/items/quantum_machine_hull.json new file mode 100644 index 000000000..eb8606364 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_machine_hull.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/quantum_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_sword.json b/src/generated/resources/assets/modern_industrialization/items/quantum_sword.json new file mode 100644 index 000000000..4e30b6bb2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_sword" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_tank.json b/src/generated/resources/assets/modern_industrialization/items/quantum_tank.json new file mode 100644 index 000000000..b374b13bd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/quantum_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/quantum_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quantum_upgrade.json b/src/generated/resources/assets/modern_industrialization/items/quantum_upgrade.json new file mode 100644 index 000000000..5981beccc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quantum_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quantum_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quartz_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/quartz_crushed_dust.json new file mode 100644 index 000000000..dbcfb46f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quartz_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quartz_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quartz_dust.json b/src/generated/resources/assets/modern_industrialization/items/quartz_dust.json new file mode 100644 index 000000000..bedde82a1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quartz_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quartz_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quartz_ore.json b/src/generated/resources/assets/modern_industrialization/items/quartz_ore.json new file mode 100644 index 000000000..c30bb1681 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quartz_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/quartz_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/quartz_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/quartz_tiny_dust.json new file mode 100644 index 000000000..9236e97fe --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/quartz_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/quartz_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/qubit.json b/src/generated/resources/assets/modern_industrialization/items/qubit.json new file mode 100644 index 000000000..fb9fd2625 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/qubit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/qubit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/random_access_memory.json b/src/generated/resources/assets/modern_industrialization/items/random_access_memory.json new file mode 100644 index 000000000..512301310 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/random_access_memory.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/random_access_memory" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_antimony.json b/src/generated/resources/assets/modern_industrialization/items/raw_antimony.json new file mode 100644 index 000000000..9708672f3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_antimony.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_antimony" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_antimony_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_antimony_block.json new file mode 100644 index 000000000..692de4afa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_antimony_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_antimony_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_biodiesel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/raw_biodiesel_bucket.json new file mode 100644 index 000000000..d8f3e55f9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_biodiesel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_biodiesel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_iridium.json b/src/generated/resources/assets/modern_industrialization/items/raw_iridium.json new file mode 100644 index 000000000..1fe7716c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_iridium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_iridium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_iridium_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_iridium_block.json new file mode 100644 index 000000000..9f6c51d1b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_iridium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_iridium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_lead.json b/src/generated/resources/assets/modern_industrialization/items/raw_lead.json new file mode 100644 index 000000000..4b1dac712 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_lead.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_lead" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_lead_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_lead_block.json new file mode 100644 index 000000000..b52c1e509 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_lead_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_lead_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_nickel.json b/src/generated/resources/assets/modern_industrialization/items/raw_nickel.json new file mode 100644 index 000000000..123018620 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_nickel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_nickel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_nickel_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_nickel_block.json new file mode 100644 index 000000000..9c7e64761 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_nickel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_nickel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_platinum.json b/src/generated/resources/assets/modern_industrialization/items/raw_platinum.json new file mode 100644 index 000000000..28e1b4411 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_platinum.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_platinum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_platinum_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_platinum_block.json new file mode 100644 index 000000000..f0e08a5b2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_platinum_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_platinum_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_silver.json b/src/generated/resources/assets/modern_industrialization/items/raw_silver.json new file mode 100644 index 000000000..e2e5d6e76 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_silver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_silver" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_silver_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_silver_block.json new file mode 100644 index 000000000..661b4ba71 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_silver_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_silver_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_synthetic_oil_bucket.json b/src/generated/resources/assets/modern_industrialization/items/raw_synthetic_oil_bucket.json new file mode 100644 index 000000000..daf010b42 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_synthetic_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_synthetic_oil_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_tin.json b/src/generated/resources/assets/modern_industrialization/items/raw_tin.json new file mode 100644 index 000000000..748fa375c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_tin.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_tin" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_tin_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_tin_block.json new file mode 100644 index 000000000..8370182ee --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_tin_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_tin_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_titanium.json b/src/generated/resources/assets/modern_industrialization/items/raw_titanium.json new file mode 100644 index 000000000..3b25ca5b6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_titanium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_titanium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_titanium_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_titanium_block.json new file mode 100644 index 000000000..e6a3cf4e5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_titanium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_titanium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_tungsten.json b/src/generated/resources/assets/modern_industrialization/items/raw_tungsten.json new file mode 100644 index 000000000..196db699b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_tungsten.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_tungsten" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_tungsten_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_tungsten_block.json new file mode 100644 index 000000000..6661fd9c6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_tungsten_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_tungsten_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_uranium.json b/src/generated/resources/assets/modern_industrialization/items/raw_uranium.json new file mode 100644 index 000000000..5693aecc1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_uranium.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/raw_uranium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/raw_uranium_block.json b/src/generated/resources/assets/modern_industrialization/items/raw_uranium_block.json new file mode 100644 index 000000000..3dc923bcc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/raw_uranium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/raw_uranium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/red_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/red_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/red_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/red_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/red_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/red_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/redstone_battery.json b/src/generated/resources/assets/modern_industrialization/items/redstone_battery.json new file mode 100644 index 000000000..a3aba54b2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/redstone_battery.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/redstone_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/redstone_control_module.json b/src/generated/resources/assets/modern_industrialization/items/redstone_control_module.json new file mode 100644 index 000000000..3da8e2f07 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/redstone_control_module.json @@ -0,0 +1,23 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/redstone_control_module_high" + }, + "when": false + }, + { + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/redstone_control_module_low" + }, + "when": true + } + ], + "component": "modern_industrialization:low_signal", + "property": "minecraft:component" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/redstone_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/redstone_crushed_dust.json new file mode 100644 index 000000000..6e5ff7f6d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/redstone_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/redstone_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/redstone_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/redstone_tiny_dust.json new file mode 100644 index 000000000..86c3885db --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/redstone_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/redstone_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/replicator.json b/src/generated/resources/assets/modern_industrialization/items/replicator.json new file mode 100644 index 000000000..c10f9f8cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/replicator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:replicator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/resistor.json b/src/generated/resources/assets/modern_industrialization/items/resistor.json new file mode 100644 index 000000000..35c563250 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/resistor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/resistor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/robot_arm.json b/src/generated/resources/assets/modern_industrialization/items/robot_arm.json new file mode 100644 index 000000000..fe1213f51 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/robot_arm.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/robot_arm" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/rubber_boots.json b/src/generated/resources/assets/modern_industrialization/items/rubber_boots.json new file mode 100644 index 000000000..77256f5c7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/rubber_boots.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/rubber_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/rubber_helmet.json b/src/generated/resources/assets/modern_industrialization/items/rubber_helmet.json new file mode 100644 index 000000000..8fae490b8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/rubber_helmet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/rubber_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/rubber_sheet.json b/src/generated/resources/assets/modern_industrialization/items/rubber_sheet.json new file mode 100644 index 000000000..7edaf60fe --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/rubber_sheet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/rubber_sheet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ruby_dust.json b/src/generated/resources/assets/modern_industrialization/items/ruby_dust.json new file mode 100644 index 000000000..776789d58 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ruby_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/ruby_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ruby_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/ruby_tiny_dust.json new file mode 100644 index 000000000..1de165791 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ruby_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/ruby_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/salt_block.json b/src/generated/resources/assets/modern_industrialization/items/salt_block.json new file mode 100644 index 000000000..5fe4e785f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/salt_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/salt_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/salt_crushed_dust.json b/src/generated/resources/assets/modern_industrialization/items/salt_crushed_dust.json new file mode 100644 index 000000000..d2d92eb4f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/salt_crushed_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/salt_crushed_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/salt_dust.json b/src/generated/resources/assets/modern_industrialization/items/salt_dust.json new file mode 100644 index 000000000..9bf9f7141 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/salt_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/salt_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/salt_ore.json b/src/generated/resources/assets/modern_industrialization/items/salt_ore.json new file mode 100644 index 000000000..c37f338c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/salt_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/salt_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/salt_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/salt_tiny_dust.json new file mode 100644 index 000000000..db3451dab --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/salt_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/salt_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/shale_oil_bucket.json b/src/generated/resources/assets/modern_industrialization/items/shale_oil_bucket.json new file mode 100644 index 000000000..6f6bb467f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/shale_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/shale_oil_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_battery.json b/src/generated/resources/assets/modern_industrialization/items/silicon_battery.json new file mode 100644 index 000000000..d8c0fae35 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_battery.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_block.json b/src/generated/resources/assets/modern_industrialization/items/silicon_block.json new file mode 100644 index 000000000..60b35d6a8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/silicon_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/silicon_double_ingot.json new file mode 100644 index 000000000..b25d8ed96 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_dust.json b/src/generated/resources/assets/modern_industrialization/items/silicon_dust.json new file mode 100644 index 000000000..cb971e9a9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_ingot.json b/src/generated/resources/assets/modern_industrialization/items/silicon_ingot.json new file mode 100644 index 000000000..d0d84c7a6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_n_doped_plate.json b/src/generated/resources/assets/modern_industrialization/items/silicon_n_doped_plate.json new file mode 100644 index 000000000..b885e12ad --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_n_doped_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_n_doped_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_nugget.json b/src/generated/resources/assets/modern_industrialization/items/silicon_nugget.json new file mode 100644 index 000000000..9d2de4fe7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_p_doped_plate.json b/src/generated/resources/assets/modern_industrialization/items/silicon_p_doped_plate.json new file mode 100644 index 000000000..2a998f1fa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_p_doped_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_p_doped_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_plate.json b/src/generated/resources/assets/modern_industrialization/items/silicon_plate.json new file mode 100644 index 000000000..75bbe363c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/silicon_tiny_dust.json new file mode 100644 index 000000000..1a220c707 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silicon_wafer.json b/src/generated/resources/assets/modern_industrialization/items/silicon_wafer.json new file mode 100644 index 000000000..5ad4dc8b5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silicon_wafer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silicon_wafer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_block.json b/src/generated/resources/assets/modern_industrialization/items/silver_block.json new file mode 100644 index 000000000..6aafd9bce --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/silver_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_cable.json b/src/generated/resources/assets/modern_industrialization/items/silver_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/silver_double_ingot.json new file mode 100644 index 000000000..99a531bc2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_dust.json b/src/generated/resources/assets/modern_industrialization/items/silver_dust.json new file mode 100644 index 000000000..324c80770 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_ingot.json b/src/generated/resources/assets/modern_industrialization/items/silver_ingot.json new file mode 100644 index 000000000..6d854cf90 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_nugget.json b/src/generated/resources/assets/modern_industrialization/items/silver_nugget.json new file mode 100644 index 000000000..74ca94c68 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_plate.json b/src/generated/resources/assets/modern_industrialization/items/silver_plate.json new file mode 100644 index 000000000..7cb3ea28c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/silver_tiny_dust.json new file mode 100644 index 000000000..d794cee55 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/silver_wire.json b/src/generated/resources/assets/modern_industrialization/items/silver_wire.json new file mode 100644 index 000000000..59866c32b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/silver_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/silver_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/singularity.json b/src/generated/resources/assets/modern_industrialization/items/singularity.json new file mode 100644 index 000000000..1cacd6340 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/singularity.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/singularity" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/small_heat_exchanger.json b/src/generated/resources/assets/modern_industrialization/items/small_heat_exchanger.json new file mode 100644 index 000000000..35043fb56 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/small_heat_exchanger.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/small_heat_exchanger" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sodium_battery.json b/src/generated/resources/assets/modern_industrialization/items/sodium_battery.json new file mode 100644 index 000000000..23758dbe8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sodium_battery.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sodium_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sodium_block.json b/src/generated/resources/assets/modern_industrialization/items/sodium_block.json new file mode 100644 index 000000000..e20faff30 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sodium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/sodium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sodium_dust.json b/src/generated/resources/assets/modern_industrialization/items/sodium_dust.json new file mode 100644 index 000000000..d5467743b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sodium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sodium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sodium_hydroxide_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sodium_hydroxide_bucket.json new file mode 100644 index 000000000..543d3fe84 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sodium_hydroxide_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sodium_hydroxide_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sodium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/sodium_tiny_dust.json new file mode 100644 index 000000000..19a8b8549 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sodium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sodium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_block.json b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_block.json new file mode 100644 index 000000000..afc9c76fb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/soldering_alloy_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_bucket.json b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_bucket.json new file mode 100644 index 000000000..d97186e78 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/soldering_alloy_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_dust.json b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_dust.json new file mode 100644 index 000000000..fcb53afc6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/soldering_alloy_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_tiny_dust.json new file mode 100644 index 000000000..dc886159a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/soldering_alloy_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/soldering_alloy_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/solid_titanium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/solid_titanium_machine_casing.json new file mode 100644 index 000000000..2f4fb9c42 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/solid_titanium_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/solid_titanium_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_barrel.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_barrel.json new file mode 100644 index 000000000..cb88ca805 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/stainless_steel_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/stainless_steel_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_blade.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_blade.json new file mode 100644 index 000000000..607e4297d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_block.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_block.json new file mode 100644 index 000000000..e3b6e12f0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/stainless_steel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_bolt.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_bolt.json new file mode 100644 index 000000000..84769d0d1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_curved_plate.json new file mode 100644 index 000000000..f623dcd2b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_double_ingot.json new file mode 100644 index 000000000..df7a00b2b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_drill.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_drill.json new file mode 100644 index 000000000..a56952ff8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_drill_head.json new file mode 100644 index 000000000..3585fc82c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_dust.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_dust.json new file mode 100644 index 000000000..8cbbc2f90 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_gear.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_gear.json new file mode 100644 index 000000000..b8d0c2ba4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_hot_ingot.json new file mode 100644 index 000000000..e890bc84c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_ingot.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_ingot.json new file mode 100644 index 000000000..d690639aa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_large_plate.json new file mode 100644 index 000000000..ae59e8b73 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_machine_casing_pipe.json new file mode 100644 index 000000000..b6769fc48 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_machine_casing_pipe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/stainless_steel_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_nugget.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_nugget.json new file mode 100644 index 000000000..0bed58e48 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_plate.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_plate.json new file mode 100644 index 000000000..b2f66e8f9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_ring.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_ring.json new file mode 100644 index 000000000..bbb5c0881 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rod.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rod.json new file mode 100644 index 000000000..df5bc9ef6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rod_magnetic.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rod_magnetic.json new file mode 100644 index 000000000..a90b5374e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rod_magnetic.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_rod_magnetic" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rotor.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rotor.json new file mode 100644 index 000000000..47706a087 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_rotor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_rotor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_tank.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_tank.json new file mode 100644 index 000000000..f1608a178 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/stainless_steel_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/stainless_steel_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/stainless_steel_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_tiny_dust.json new file mode 100644 index 000000000..bb9d52612 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/stainless_steel_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/stainless_steel_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/items/steam_blast_furnace.json new file mode 100644 index 000000000..9086ab343 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_blast_furnace.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steam_blast_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_bucket.json b/src/generated/resources/assets/modern_industrialization/items/steam_bucket.json new file mode 100644 index 000000000..0a19455b8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steam_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_cracked_heavy_fuel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/steam_cracked_heavy_fuel_bucket.json new file mode 100644 index 000000000..21358ce10 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_cracked_heavy_fuel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steam_cracked_heavy_fuel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_cracked_light_fuel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/steam_cracked_light_fuel_bucket.json new file mode 100644 index 000000000..d9185c707 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_cracked_light_fuel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steam_cracked_light_fuel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_cracked_naphtha_bucket.json b/src/generated/resources/assets/modern_industrialization/items/steam_cracked_naphtha_bucket.json new file mode 100644 index 000000000..c053354ce --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_cracked_naphtha_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steam_cracked_naphtha_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_mining_drill.json b/src/generated/resources/assets/modern_industrialization/items/steam_mining_drill.json new file mode 100644 index 000000000..be2c208c7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_mining_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steam_mining_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steam_quarry.json b/src/generated/resources/assets/modern_industrialization/items/steam_quarry.json new file mode 100644 index 000000000..2482e8176 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steam_quarry.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steam_quarry" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_barrel.json b/src/generated/resources/assets/modern_industrialization/items/steel_barrel.json new file mode 100644 index 000000000..4e403e962 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/steel_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/steel_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_block.json b/src/generated/resources/assets/modern_industrialization/items/steel_block.json new file mode 100644 index 000000000..42115c6c5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/steel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_boiler.json b/src/generated/resources/assets/modern_industrialization/items/steel_boiler.json new file mode 100644 index 000000000..e385f2edf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_boiler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_bolt.json b/src/generated/resources/assets/modern_industrialization/items/steel_bolt.json new file mode 100644 index 000000000..91a75e0a0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_compressor.json b/src/generated/resources/assets/modern_industrialization/items/steel_compressor.json new file mode 100644 index 000000000..2af42d0d8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_compressor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/steel_curved_plate.json new file mode 100644 index 000000000..91aa81bb5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/items/steel_cutting_machine.json new file mode 100644 index 000000000..79f04154e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_cutting_machine.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_cutting_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/steel_double_ingot.json new file mode 100644 index 000000000..8faa0f88f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_drill.json b/src/generated/resources/assets/modern_industrialization/items/steel_drill.json new file mode 100644 index 000000000..9979458f1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/steel_drill_head.json new file mode 100644 index 000000000..8ff15aae2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_dust.json b/src/generated/resources/assets/modern_industrialization/items/steel_dust.json new file mode 100644 index 000000000..e2572d43c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/steel_fluid_input_hatch.json new file mode 100644 index 000000000..4c63264fa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_fluid_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_fluid_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/steel_fluid_output_hatch.json new file mode 100644 index 000000000..4470b122f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_fluid_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_fluid_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_furnace.json b/src/generated/resources/assets/modern_industrialization/items/steel_furnace.json new file mode 100644 index 000000000..a7c0da6d7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_furnace.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_gear.json b/src/generated/resources/assets/modern_industrialization/items/steel_gear.json new file mode 100644 index 000000000..1097b37fb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_hammer.json b/src/generated/resources/assets/modern_industrialization/items/steel_hammer.json new file mode 100644 index 000000000..23749a0a3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_ingot.json b/src/generated/resources/assets/modern_industrialization/items/steel_ingot.json new file mode 100644 index 000000000..5a46572b1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/steel_item_input_hatch.json new file mode 100644 index 000000000..e9d1ac3db --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_item_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_item_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/steel_item_output_hatch.json new file mode 100644 index 000000000..f1e590be1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_item_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_item_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/steel_large_plate.json new file mode 100644 index 000000000..b350047a0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_macerator.json b/src/generated/resources/assets/modern_industrialization/items/steel_macerator.json new file mode 100644 index 000000000..6d3ccf5b1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_macerator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_macerator" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/steel_machine_casing.json new file mode 100644 index 000000000..b17c65448 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/steel_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/items/steel_machine_casing_pipe.json new file mode 100644 index 000000000..4d7322258 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_machine_casing_pipe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/steel_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_mixer.json b/src/generated/resources/assets/modern_industrialization/items/steel_mixer.json new file mode 100644 index 000000000..be940c8f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_mixer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_mixer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_nugget.json b/src/generated/resources/assets/modern_industrialization/items/steel_nugget.json new file mode 100644 index 000000000..d0c69d48a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_packer.json b/src/generated/resources/assets/modern_industrialization/items/steel_packer.json new file mode 100644 index 000000000..3b559263a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_packer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_packer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_plate.json b/src/generated/resources/assets/modern_industrialization/items/steel_plate.json new file mode 100644 index 000000000..9759f85ef --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_ring.json b/src/generated/resources/assets/modern_industrialization/items/steel_ring.json new file mode 100644 index 000000000..151471362 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_rod.json b/src/generated/resources/assets/modern_industrialization/items/steel_rod.json new file mode 100644 index 000000000..d34b2848e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_rod_magnetic.json b/src/generated/resources/assets/modern_industrialization/items/steel_rod_magnetic.json new file mode 100644 index 000000000..1fd482192 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_rod_magnetic.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_rod_magnetic" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_tank.json b/src/generated/resources/assets/modern_industrialization/items/steel_tank.json new file mode 100644 index 000000000..8b5fdeee7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/steel_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/steel_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/steel_tiny_dust.json new file mode 100644 index 000000000..8e4d715c4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_unpacker.json b/src/generated/resources/assets/modern_industrialization/items/steel_unpacker.json new file mode 100644 index 000000000..c19a66305 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_unpacker.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_unpacker" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_upgrade.json b/src/generated/resources/assets/modern_industrialization/items/steel_upgrade.json new file mode 100644 index 000000000..9b3eb18ed --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/steel_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_water_pump.json b/src/generated/resources/assets/modern_industrialization/items/steel_water_pump.json new file mode 100644 index 000000000..e5b295628 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_water_pump.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_water_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/steel_wiremill.json b/src/generated/resources/assets/modern_industrialization/items/steel_wiremill.json new file mode 100644 index 000000000..e412e0ba0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/steel_wiremill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:steel_wiremill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/styrene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/styrene_bucket.json new file mode 100644 index 000000000..27279474a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/styrene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/styrene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/styrene_butadiene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/styrene_butadiene_bucket.json new file mode 100644 index 000000000..4e9c762e3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/styrene_butadiene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/styrene_butadiene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/styrene_butadiene_rubber_bucket.json b/src/generated/resources/assets/modern_industrialization/items/styrene_butadiene_rubber_bucket.json new file mode 100644 index 000000000..0b342e9b3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/styrene_butadiene_rubber_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/styrene_butadiene_rubber_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sugar_solution_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sugar_solution_bucket.json new file mode 100644 index 000000000..9cd5710fb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sugar_solution_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sugar_solution_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfur_block.json b/src/generated/resources/assets/modern_industrialization/items/sulfur_block.json new file mode 100644 index 000000000..b63dffe8b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfur_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/sulfur_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfur_dust.json b/src/generated/resources/assets/modern_industrialization/items/sulfur_dust.json new file mode 100644 index 000000000..451b4357b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfur_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfur_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfur_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/sulfur_tiny_dust.json new file mode 100644 index 000000000..ca57c111c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfur_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfur_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfuric_acid_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sulfuric_acid_bucket.json new file mode 100644 index 000000000..dfbd826a2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfuric_acid_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfuric_acid_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfuric_crude_oil_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sulfuric_crude_oil_bucket.json new file mode 100644 index 000000000..bd6d40021 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfuric_crude_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfuric_crude_oil_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfuric_heavy_fuel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sulfuric_heavy_fuel_bucket.json new file mode 100644 index 000000000..367f954eb --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfuric_heavy_fuel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfuric_heavy_fuel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfuric_light_fuel_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sulfuric_light_fuel_bucket.json new file mode 100644 index 000000000..6d40ac866 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfuric_light_fuel_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfuric_light_fuel_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/sulfuric_naphtha_bucket.json b/src/generated/resources/assets/modern_industrialization/items/sulfuric_naphtha_bucket.json new file mode 100644 index 000000000..a801453c0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/sulfuric_naphtha_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/sulfuric_naphtha_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_cable.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_coil.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_coil.json new file mode 100644 index 000000000..63bbaf461 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_coil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/superconductor_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_double_ingot.json new file mode 100644 index 000000000..103c39af6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_dust.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_dust.json new file mode 100644 index 000000000..fc2914744 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_energy_input_hatch.json new file mode 100644 index 000000000..5f8df1152 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_energy_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:superconductor_energy_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_energy_output_hatch.json new file mode 100644 index 000000000..5cf57b756 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_energy_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:superconductor_energy_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_ev_transformer.json new file mode 100644 index 000000000..c1abe2654 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_ev_transformer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:superconductor_ev_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_hot_ingot.json new file mode 100644 index 000000000..8f59ca7fa --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_ingot.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_ingot.json new file mode 100644 index 000000000..03751de61 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_nugget.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_nugget.json new file mode 100644 index 000000000..ebe03330b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_plate.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_plate.json new file mode 100644 index 000000000..07e6ed7a3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_storage_unit.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_storage_unit.json new file mode 100644 index 000000000..8efbe651b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_storage_unit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:superconductor_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_tiny_dust.json new file mode 100644 index 000000000..e8751ce56 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/superconductor_wire.json b/src/generated/resources/assets/modern_industrialization/items/superconductor_wire.json new file mode 100644 index 000000000..7e70900c3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/superconductor_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/superconductor_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/synthetic_oil_bucket.json b/src/generated/resources/assets/modern_industrialization/items/synthetic_oil_bucket.json new file mode 100644 index 000000000..c613b2a06 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/synthetic_oil_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/synthetic_oil_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/synthetic_rubber_bucket.json b/src/generated/resources/assets/modern_industrialization/items/synthetic_rubber_bucket.json new file mode 100644 index 000000000..b5f713485 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/synthetic_rubber_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/synthetic_rubber_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_blade.json b/src/generated/resources/assets/modern_industrialization/items/tin_blade.json new file mode 100644 index 000000000..5e93d26ea --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_block.json b/src/generated/resources/assets/modern_industrialization/items/tin_block.json new file mode 100644 index 000000000..1022ff5d7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/tin_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_bolt.json b/src/generated/resources/assets/modern_industrialization/items/tin_bolt.json new file mode 100644 index 000000000..c7e1c1847 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_cable.json b/src/generated/resources/assets/modern_industrialization/items/tin_cable.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_cable.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/tin_curved_plate.json new file mode 100644 index 000000000..c00220302 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/tin_double_ingot.json new file mode 100644 index 000000000..4312db3e2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_dust.json b/src/generated/resources/assets/modern_industrialization/items/tin_dust.json new file mode 100644 index 000000000..dade9dd60 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_gear.json b/src/generated/resources/assets/modern_industrialization/items/tin_gear.json new file mode 100644 index 000000000..9082d21b9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_ingot.json b/src/generated/resources/assets/modern_industrialization/items/tin_ingot.json new file mode 100644 index 000000000..64ff8f3db --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_nugget.json b/src/generated/resources/assets/modern_industrialization/items/tin_nugget.json new file mode 100644 index 000000000..b3b4cfeaf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_ore.json b/src/generated/resources/assets/modern_industrialization/items/tin_ore.json new file mode 100644 index 000000000..5c9f97a87 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/tin_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_plate.json b/src/generated/resources/assets/modern_industrialization/items/tin_plate.json new file mode 100644 index 000000000..733217950 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_ring.json b/src/generated/resources/assets/modern_industrialization/items/tin_ring.json new file mode 100644 index 000000000..7372b7ce6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_rod.json b/src/generated/resources/assets/modern_industrialization/items/tin_rod.json new file mode 100644 index 000000000..b739369f1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_rotor.json b/src/generated/resources/assets/modern_industrialization/items/tin_rotor.json new file mode 100644 index 000000000..5d9bad237 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_rotor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_rotor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/tin_tiny_dust.json new file mode 100644 index 000000000..87adac978 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tin_wire.json b/src/generated/resources/assets/modern_industrialization/items/tin_wire.json new file mode 100644 index 000000000..b1ac68482 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tin_wire.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tin_wire" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_barrel.json b/src/generated/resources/assets/modern_industrialization/items/titanium_barrel.json new file mode 100644 index 000000000..b151a654a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_barrel.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/titanium_barrel" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/titanium_barrel", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_blade.json b/src/generated/resources/assets/modern_industrialization/items/titanium_blade.json new file mode 100644 index 000000000..5664e89ef --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_blade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_block.json b/src/generated/resources/assets/modern_industrialization/items/titanium_block.json new file mode 100644 index 000000000..df6de2288 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/titanium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_bolt.json b/src/generated/resources/assets/modern_industrialization/items/titanium_bolt.json new file mode 100644 index 000000000..063734d6a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_bolt.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_bolt" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_curved_plate.json b/src/generated/resources/assets/modern_industrialization/items/titanium_curved_plate.json new file mode 100644 index 000000000..1c819df51 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_curved_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_curved_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/titanium_double_ingot.json new file mode 100644 index 000000000..63f0b9dbd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_drill.json b/src/generated/resources/assets/modern_industrialization/items/titanium_drill.json new file mode 100644 index 000000000..b517d9bcd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_drill.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_drill_head.json b/src/generated/resources/assets/modern_industrialization/items/titanium_drill_head.json new file mode 100644 index 000000000..1153e0270 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_drill_head.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_drill_head" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_dust.json b/src/generated/resources/assets/modern_industrialization/items/titanium_dust.json new file mode 100644 index 000000000..13c73cf28 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_gear.json b/src/generated/resources/assets/modern_industrialization/items/titanium_gear.json new file mode 100644 index 000000000..017a0f0ed --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_gear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_hot_ingot.json b/src/generated/resources/assets/modern_industrialization/items/titanium_hot_ingot.json new file mode 100644 index 000000000..d38420da8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_hot_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_hot_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/titanium_ingot.json new file mode 100644 index 000000000..cd06e5892 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/titanium_large_plate.json new file mode 100644 index 000000000..dad988897 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/items/titanium_machine_casing_pipe.json new file mode 100644 index 000000000..b08b512d1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_machine_casing_pipe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/titanium_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/titanium_nugget.json new file mode 100644 index 000000000..b3317ef16 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_ore.json b/src/generated/resources/assets/modern_industrialization/items/titanium_ore.json new file mode 100644 index 000000000..02b99993d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/titanium_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_plate.json b/src/generated/resources/assets/modern_industrialization/items/titanium_plate.json new file mode 100644 index 000000000..906be266a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_ring.json b/src/generated/resources/assets/modern_industrialization/items/titanium_ring.json new file mode 100644 index 000000000..46b87f103 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_ring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_ring" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_rod.json b/src/generated/resources/assets/modern_industrialization/items/titanium_rod.json new file mode 100644 index 000000000..b04759250 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_rotor.json b/src/generated/resources/assets/modern_industrialization/items/titanium_rotor.json new file mode 100644 index 000000000..4bb8f1d9b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_rotor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_rotor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_tank.json b/src/generated/resources/assets/modern_industrialization/items/titanium_tank.json new file mode 100644 index 000000000..424b6d621 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_tank.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "modern_industrialization:block/titanium_tank" + }, + { + "type": "minecraft:special", + "base": "modern_industrialization:block/titanium_tank", + "model": { + "type": "modern_industrialization:use_block_entity_renderer" + } + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/titanium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/titanium_tiny_dust.json new file mode 100644 index 000000000..95452fafe --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/titanium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/titanium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/toluene_bucket.json b/src/generated/resources/assets/modern_industrialization/items/toluene_bucket.json new file mode 100644 index 000000000..8c80ddc62 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/toluene_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/toluene_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/transistor.json b/src/generated/resources/assets/modern_industrialization/items/transistor.json new file mode 100644 index 000000000..c9c4e9535 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/transistor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/transistor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/trash_can.json b/src/generated/resources/assets/modern_industrialization/items/trash_can.json new file mode 100644 index 000000000..960e675bd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/trash_can.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/trash_can" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tritium_bucket.json b/src/generated/resources/assets/modern_industrialization/items/tritium_bucket.json new file mode 100644 index 000000000..b7dfa90ab --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tritium_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tritium_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_block.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_block.json new file mode 100644 index 000000000..fbee349f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/tungsten_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_double_ingot.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_double_ingot.json new file mode 100644 index 000000000..fc01f35b2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_double_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_double_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_dust.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_dust.json new file mode 100644 index 000000000..bbb6d8029 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_ingot.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_ingot.json new file mode 100644 index 000000000..a740f5a33 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_large_plate.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_large_plate.json new file mode 100644 index 000000000..5143b2786 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_large_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_large_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_nugget.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_nugget.json new file mode 100644 index 000000000..776905265 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_ore.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_ore.json new file mode 100644 index 000000000..4cf28ebc3 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/tungsten_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_plate.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_plate.json new file mode 100644 index 000000000..861cd12cc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_plate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/tungsten_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/tungsten_tiny_dust.json new file mode 100644 index 000000000..be0fe78f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/tungsten_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/tungsten_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/turbo_fluid_input_hatch.json new file mode 100644 index 000000000..f4cf21c64 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_fluid_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:turbo_fluid_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/turbo_fluid_output_hatch.json new file mode 100644 index 000000000..85c274b9c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_fluid_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:turbo_fluid_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/items/turbo_item_input_hatch.json new file mode 100644 index 000000000..6fb21811a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_item_input_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:turbo_item_input_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/items/turbo_item_output_hatch.json new file mode 100644 index 000000000..fe879a753 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_item_output_hatch.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:turbo_item_output_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_machine_casing.json b/src/generated/resources/assets/modern_industrialization/items/turbo_machine_casing.json new file mode 100644 index 000000000..fce176331 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_machine_casing.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/turbo_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_machine_hull.json b/src/generated/resources/assets/modern_industrialization/items/turbo_machine_hull.json new file mode 100644 index 000000000..c5a40b5e6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_machine_hull.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/turbo_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/turbo_upgrade.json b/src/generated/resources/assets/modern_industrialization/items/turbo_upgrade.json new file mode 100644 index 000000000..bb5afedd6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/turbo_upgrade.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/turbo_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/ultradense_metal_ball.json b/src/generated/resources/assets/modern_industrialization/items/ultradense_metal_ball.json new file mode 100644 index 000000000..2f2f74527 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/ultradense_metal_ball.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/ultradense_metal_ball" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uncooked_steel_dust.json b/src/generated/resources/assets/modern_industrialization/items/uncooked_steel_dust.json new file mode 100644 index 000000000..1fc349752 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uncooked_steel_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uncooked_steel_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_235_block.json b/src/generated/resources/assets/modern_industrialization/items/uranium_235_block.json new file mode 100644 index 000000000..04a131abd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_235_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/uranium_235_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_235_dust.json b/src/generated/resources/assets/modern_industrialization/items/uranium_235_dust.json new file mode 100644 index 000000000..a320c8509 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_235_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_235_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_235_ingot.json b/src/generated/resources/assets/modern_industrialization/items/uranium_235_ingot.json new file mode 100644 index 000000000..2cce47932 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_235_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_235_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_235_nugget.json b/src/generated/resources/assets/modern_industrialization/items/uranium_235_nugget.json new file mode 100644 index 000000000..9c4fdb0fc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_235_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_235_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_235_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/uranium_235_tiny_dust.json new file mode 100644 index 000000000..9ccb35d2c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_235_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_235_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_238_block.json b/src/generated/resources/assets/modern_industrialization/items/uranium_238_block.json new file mode 100644 index 000000000..f3367fb1d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_238_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/uranium_238_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_238_dust.json b/src/generated/resources/assets/modern_industrialization/items/uranium_238_dust.json new file mode 100644 index 000000000..f9b2b647a --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_238_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_238_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_238_ingot.json b/src/generated/resources/assets/modern_industrialization/items/uranium_238_ingot.json new file mode 100644 index 000000000..cf2edf193 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_238_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_238_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_238_nugget.json b/src/generated/resources/assets/modern_industrialization/items/uranium_238_nugget.json new file mode 100644 index 000000000..5fdf7f826 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_238_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_238_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_238_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/uranium_238_tiny_dust.json new file mode 100644 index 000000000..66c81b75e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_238_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_238_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_block.json b/src/generated/resources/assets/modern_industrialization/items/uranium_block.json new file mode 100644 index 000000000..d48b24fd1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/uranium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_dust.json b/src/generated/resources/assets/modern_industrialization/items/uranium_dust.json new file mode 100644 index 000000000..b6f59980e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod.json b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod.json new file mode 100644 index 000000000..625c5ab97 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_fuel_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_depleted.json b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_depleted.json new file mode 100644 index 000000000..2bbb8cbca --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_depleted.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_fuel_rod_depleted" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_double.json b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_double.json new file mode 100644 index 000000000..dfae206f7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_double.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_fuel_rod_double" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_quad.json b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_quad.json new file mode 100644 index 000000000..0653e19d6 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_fuel_rod_quad.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_fuel_rod_quad" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_ingot.json b/src/generated/resources/assets/modern_industrialization/items/uranium_ingot.json new file mode 100644 index 000000000..0c8d60c1b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_nugget.json b/src/generated/resources/assets/modern_industrialization/items/uranium_nugget.json new file mode 100644 index 000000000..3c7650c9d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_ore.json b/src/generated/resources/assets/modern_industrialization/items/uranium_ore.json new file mode 100644 index 000000000..884a7110d --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/uranium_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_rod.json b/src/generated/resources/assets/modern_industrialization/items/uranium_rod.json new file mode 100644 index 000000000..6fdd30677 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_rod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uranium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/uranium_tiny_dust.json new file mode 100644 index 000000000..aefa110f2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uranium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uranium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/uu_matter_bucket.json b/src/generated/resources/assets/modern_industrialization/items/uu_matter_bucket.json new file mode 100644 index 000000000..14f71f89c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/uu_matter_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/uu_matter_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/vacuum_freezer.json b/src/generated/resources/assets/modern_industrialization/items/vacuum_freezer.json new file mode 100644 index 000000000..9d88d6b7b --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/vacuum_freezer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "modern_industrialization:machine", + "machine": "modern_industrialization:vacuum_freezer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/vinyl_chloride_bucket.json b/src/generated/resources/assets/modern_industrialization/items/vinyl_chloride_bucket.json new file mode 100644 index 000000000..e378d8b65 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/vinyl_chloride_bucket.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/vinyl_chloride_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/wax.json b/src/generated/resources/assets/modern_industrialization/items/wax.json new file mode 100644 index 000000000..460ee36bc --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/wax.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/wax" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/white_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/white_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/white_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/white_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/white_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/white_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/wood_pulp.json b/src/generated/resources/assets/modern_industrialization/items/wood_pulp.json new file mode 100644 index 000000000..dfa494039 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/wood_pulp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/wood_pulp" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/wrench.json b/src/generated/resources/assets/modern_industrialization/items/wrench.json new file mode 100644 index 000000000..066bfc4fd --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/wrench.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/wrench" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/yellow_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/items/yellow_fluid_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/yellow_fluid_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/yellow_item_pipe.json b/src/generated/resources/assets/modern_industrialization/items/yellow_item_pipe.json new file mode 100644 index 000000000..41cd3a4c2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/yellow_item_pipe.json @@ -0,0 +1,5 @@ +{ + "model": { + "type": "modern_industrialization:pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/yttrium_block.json b/src/generated/resources/assets/modern_industrialization/items/yttrium_block.json new file mode 100644 index 000000000..aaa304d1c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/yttrium_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:block/yttrium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/yttrium_dust.json b/src/generated/resources/assets/modern_industrialization/items/yttrium_dust.json new file mode 100644 index 000000000..3c4c3f7e5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/yttrium_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/yttrium_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/items/yttrium_tiny_dust.json b/src/generated/resources/assets/modern_industrialization/items/yttrium_tiny_dust.json new file mode 100644 index 000000000..34d0c01e1 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/items/yttrium_tiny_dust.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "modern_industrialization:item/yttrium_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/lang/en_us.json b/src/generated/resources/assets/modern_industrialization/lang/en_us.json index 856c087c9..93737406b 100644 --- a/src/generated/resources/assets/modern_industrialization/lang/en_us.json +++ b/src/generated/resources/assets/modern_industrialization/lang/en_us.json @@ -460,7 +460,7 @@ "config.jade.plugin_modern_industrialization.pipe": "Pipe Information", "ebf_tier.modern_industrialization.cupronickel_coil": "Cupronickel", "ebf_tier.modern_industrialization.kanthal_coil": "Kanthal", - "entity.minecraft.villager.modern_industrialization.industrialist": "Industrialist", + "entity.modern_industrialization.villager.industrialist": "Industrialist", "item.modern_industrialization.acetylene_bucket": "Acetylene Bucket", "item.modern_industrialization.acrylic_acid_bucket": "Acrylic Acid Bucket", "item.modern_industrialization.acrylic_glue_bucket": "Acrylic Glue Bucket", @@ -525,14 +525,12 @@ "item.modern_industrialization.biodiesel_bucket": "Biodiesel Bucket", "item.modern_industrialization.black_fluid_pipe": "Black Fluid Pipe", "item.modern_industrialization.black_item_pipe": "Black Item Pipe", - "item.modern_industrialization.black_me_wire": "Black ME Wire", "item.modern_industrialization.blastproof_alloy_curved_plate": "Blastproof Alloy Curved Plate", "item.modern_industrialization.blastproof_alloy_ingot": "Blastproof Alloy Ingot", "item.modern_industrialization.blastproof_alloy_large_plate": "Blastproof Alloy Large Plate", "item.modern_industrialization.blastproof_alloy_plate": "Blastproof Alloy Plate", "item.modern_industrialization.blue_fluid_pipe": "Blue Fluid Pipe", "item.modern_industrialization.blue_item_pipe": "Blue Item Pipe", - "item.modern_industrialization.blue_me_wire": "Blue ME Wire", "item.modern_industrialization.boosted_diesel_bucket": "Boosted Diesel Bucket", "item.modern_industrialization.brick_dust": "Brick Dust", "item.modern_industrialization.brick_tiny_dust": "Brick Tiny Dust", @@ -553,7 +551,6 @@ "item.modern_industrialization.bronze_tiny_dust": "Bronze Tiny Dust", "item.modern_industrialization.brown_fluid_pipe": "Brown Fluid Pipe", "item.modern_industrialization.brown_item_pipe": "Brown Item Pipe", - "item.modern_industrialization.brown_me_wire": "Brown ME Wire", "item.modern_industrialization.butadiene_bucket": "Butadiene Bucket", "item.modern_industrialization.cadmium_battery": "Cadmium Battery", "item.modern_industrialization.cadmium_control_rod": "Cadmium Control Rod", @@ -618,7 +615,6 @@ "item.modern_industrialization.cupronickel_wire_magnetic": "Magnetic Cupronickel Wire", "item.modern_industrialization.cyan_fluid_pipe": "Cyan Fluid Pipe", "item.modern_industrialization.cyan_item_pipe": "Cyan Item Pipe", - "item.modern_industrialization.cyan_me_wire": "Cyan ME Wire", "item.modern_industrialization.deuterium_bucket": "Deuterium Bucket", "item.modern_industrialization.diamond_crushed_dust": "Diamond Crushed Dust", "item.modern_industrialization.diamond_dust": "Diamond Dust", @@ -649,7 +645,6 @@ "item.modern_industrialization.emerald_dust": "Emerald Dust", "item.modern_industrialization.emerald_plate": "Emerald Plate", "item.modern_industrialization.emerald_tiny_dust": "Emerald Tiny Dust", - "item.modern_industrialization.energy_p2p_tunnel": "EU P2P Tunnel", "item.modern_industrialization.ethanol_bucket": "Ethanol Bucket", "item.modern_industrialization.ethylbenzene_bucket": "Ethylbenzene Bucket", "item.modern_industrialization.ethylene_bucket": "Ethylene Bucket", @@ -670,10 +665,8 @@ "item.modern_industrialization.gravichestplate": "Gravichestplate", "item.modern_industrialization.gray_fluid_pipe": "Gray Fluid Pipe", "item.modern_industrialization.gray_item_pipe": "Gray Item Pipe", - "item.modern_industrialization.gray_me_wire": "Gray ME Wire", "item.modern_industrialization.green_fluid_pipe": "Green Fluid Pipe", "item.modern_industrialization.green_item_pipe": "Green Item Pipe", - "item.modern_industrialization.green_me_wire": "Green ME Wire", "item.modern_industrialization.guidebook": "MI Guidebook", "item.modern_industrialization.he_mox_dust": "HE Mox Dust", "item.modern_industrialization.he_mox_fuel_rod": "HE Mox Fuel Rod", @@ -779,28 +772,23 @@ "item.modern_industrialization.lead_tiny_dust": "Lead Tiny Dust", "item.modern_industrialization.light_blue_fluid_pipe": "Light Blue Fluid Pipe", "item.modern_industrialization.light_blue_item_pipe": "Light Blue Item Pipe", - "item.modern_industrialization.light_blue_me_wire": "Light Blue ME Wire", "item.modern_industrialization.light_fuel_bucket": "Light Fuel Bucket", "item.modern_industrialization.light_gray_fluid_pipe": "Light Gray Fluid Pipe", "item.modern_industrialization.light_gray_item_pipe": "Light Gray Item Pipe", - "item.modern_industrialization.light_gray_me_wire": "Light Gray ME Wire", "item.modern_industrialization.lignite_coal": "Lignite Coal", "item.modern_industrialization.lignite_coal_crushed_dust": "Lignite Coal Crushed Dust", "item.modern_industrialization.lignite_coal_dust": "Lignite Coal Dust", "item.modern_industrialization.lignite_coal_tiny_dust": "Lignite Coal Tiny Dust", "item.modern_industrialization.lime_fluid_pipe": "Lime Fluid Pipe", "item.modern_industrialization.lime_item_pipe": "Lime Item Pipe", - "item.modern_industrialization.lime_me_wire": "Lime ME Wire", "item.modern_industrialization.liquid_air_bucket": "Liquid Air Bucket", "item.modern_industrialization.lubricant_bucket": "Lubricant Bucket", "item.modern_industrialization.magenta_fluid_pipe": "Magenta Fluid Pipe", "item.modern_industrialization.magenta_item_pipe": "Magenta Item Pipe", - "item.modern_industrialization.magenta_me_wire": "Magenta ME Wire", "item.modern_industrialization.manganese_crushed_dust": "Manganese Crushed Dust", "item.modern_industrialization.manganese_dust": "Manganese Dust", "item.modern_industrialization.manganese_sulfuric_solution_bucket": "Manganese Sulfuric Solution Bucket", "item.modern_industrialization.manganese_tiny_dust": "Manganese Tiny Dust", - "item.modern_industrialization.me_wire": "ME Wire", "item.modern_industrialization.memory_management_unit": "Memory Management Unit", "item.modern_industrialization.methane_bucket": "Methane Bucket", "item.modern_industrialization.mixed_ingot_blastproof": "Mixed Blastproof Ingot", @@ -831,14 +819,12 @@ "item.modern_industrialization.or_gate": "OR Gate", "item.modern_industrialization.orange_fluid_pipe": "Orange Fluid Pipe", "item.modern_industrialization.orange_item_pipe": "Orange Item Pipe", - "item.modern_industrialization.orange_me_wire": "Orange ME Wire", "item.modern_industrialization.overdrive_module": "Overdrive Module", "item.modern_industrialization.oxygen_bucket": "Oxygen Bucket", "item.modern_industrialization.packer_block_template": "Packer Block Template", "item.modern_industrialization.packer_double_ingot_template": "Packer Double Ingot Template", "item.modern_industrialization.pink_fluid_pipe": "Pink Fluid Pipe", "item.modern_industrialization.pink_item_pipe": "Pink Item Pipe", - "item.modern_industrialization.pink_me_wire": "Pink ME Wire", "item.modern_industrialization.piston": "Piston", "item.modern_industrialization.plant_oil_bucket": "Plant Oil Bucket", "item.modern_industrialization.platinum_cable": "Platinum Cable", @@ -867,7 +853,6 @@ "item.modern_industrialization.purified_platinum_sulfuric_solution_bucket": "Purified Platinum Sulfuric Solution Bucket", "item.modern_industrialization.purple_fluid_pipe": "Purple Fluid Pipe", "item.modern_industrialization.purple_item_pipe": "Purple Item Pipe", - "item.modern_industrialization.purple_me_wire": "Purple ME Wire", "item.modern_industrialization.quantum_boots": "Quantum Boots", "item.modern_industrialization.quantum_chestplate": "Quantum Chestplate", "item.modern_industrialization.quantum_circuit": "Quantum Circuit", @@ -895,7 +880,6 @@ "item.modern_industrialization.raw_uranium": "Raw Uranium", "item.modern_industrialization.red_fluid_pipe": "Red Fluid Pipe", "item.modern_industrialization.red_item_pipe": "Red Item Pipe", - "item.modern_industrialization.red_me_wire": "Red ME Wire", "item.modern_industrialization.redstone_battery": "Redstone Battery", "item.modern_industrialization.redstone_control_module": "Redstone Control Module", "item.modern_industrialization.redstone_crushed_dust": "Redstone Crushed Dust", @@ -1067,12 +1051,10 @@ "item.modern_industrialization.wax": "Wax", "item.modern_industrialization.white_fluid_pipe": "White Fluid Pipe", "item.modern_industrialization.white_item_pipe": "White Item Pipe", - "item.modern_industrialization.white_me_wire": "White ME Wire", "item.modern_industrialization.wood_pulp": "Wood Pulp", "item.modern_industrialization.wrench": "Wrench", "item.modern_industrialization.yellow_fluid_pipe": "Yellow Fluid Pipe", "item.modern_industrialization.yellow_item_pipe": "Yellow Item Pipe", - "item.modern_industrialization.yellow_me_wire": "Yellow ME Wire", "item.modern_industrialization.yttrium_dust": "Yttrium Dust", "item.modern_industrialization.yttrium_tiny_dust": "Yttrium Tiny Dust", "item_tooltip.modern_industrialization.cable.line_0": " ", @@ -1116,8 +1098,6 @@ "modern_industrialization.configuration.datagenOnStartup.tooltip": "Run MI runtime datagen on startup.", "modern_industrialization.configuration.debugCommands": "Debug commands", "modern_industrialization.configuration.debugCommands.tooltip": "Enable UNSUPPORTED and DANGEROUS debug commands.", - "modern_industrialization.configuration.defaultIndustrialistTrades": "Default Industrialist trades", - "modern_industrialization.configuration.defaultIndustrialistTrades.tooltip": "Enable the default trades from the Industrialist villager provided by MI. Disable this to provide your own set of trades.", "modern_industrialization.configuration.defaultOreGenTooltips": "Ore generation tooltips", "modern_industrialization.configuration.defaultOreGenTooltips.tooltip": "Enable the default ore generation tooltips. These tooltips show how each MI ore generates, based on the default ore generation settings in MI. Set this to false if you change the ore features in a datapack.", "modern_industrialization.configuration.forgeEnergyPerEu": "FE per EU", @@ -1190,329 +1170,328 @@ "rei_categories.modern_industrialization.steel_unpacker": "Unpacker", "rei_categories.modern_industrialization.steel_wiremill": "Wiremill", "rei_categories.modern_industrialization.vacuum_freezer": "Vacuum Freezer", - "tag.c.dusts": "Dusts", - "tag.c.dusts.aluminum": "Aluminum Dusts", - "tag.c.dusts.annealed_copper": "Annealed Copper Dusts", - "tag.c.dusts.antimony": "Antimony Dusts", - "tag.c.dusts.battery_alloy": "Battery Alloy Dusts", - "tag.c.dusts.bauxite": "Bauxite Dusts", - "tag.c.dusts.beryllium": "Beryllium Dusts", - "tag.c.dusts.brick": "Brick Dusts", - "tag.c.dusts.bronze": "Bronze Dusts", - "tag.c.dusts.cadmium": "Cadmium Dusts", - "tag.c.dusts.carbon": "Carbon Dusts", - "tag.c.dusts.chromium": "Chromium Dusts", - "tag.c.dusts.coal": "Coal Dusts", - "tag.c.dusts.coke": "Coke Dusts", - "tag.c.dusts.copper": "Copper Dusts", - "tag.c.dusts.cupronickel": "Cupronickel Dusts", - "tag.c.dusts.diamond": "Diamond Dusts", - "tag.c.dusts.electrum": "Electrum Dusts", - "tag.c.dusts.emerald": "Emerald Dusts", - "tag.c.dusts.fire_clay": "Fire Clay Dusts", - "tag.c.dusts.gold": "Gold Dusts", - "tag.c.dusts.he_mox": "HE Mox Dusts", - "tag.c.dusts.he_uranium": "HE Uranium Dusts", - "tag.c.dusts.invar": "Invar Dusts", - "tag.c.dusts.iridium": "Iridium Dusts", - "tag.c.dusts.iron": "Iron Dusts", - "tag.c.dusts.kanthal": "Kanthal Dusts", - "tag.c.dusts.lapis": "Lapis Lazuli Dusts", - "tag.c.dusts.le_mox": "LE Mox Dusts", - "tag.c.dusts.le_uranium": "LE Uranium Dusts", - "tag.c.dusts.lead": "Lead Dusts", - "tag.c.dusts.lignite_coal": "Lignite Coal Dusts", - "tag.c.dusts.manganese": "Manganese Dusts", - "tag.c.dusts.monazite": "Monazite Dusts", - "tag.c.dusts.neodymium": "Neodymium Dusts", - "tag.c.dusts.nickel": "Nickel Dusts", - "tag.c.dusts.platinum": "Platinum Dusts", - "tag.c.dusts.plutonium": "Plutonium Dusts", - "tag.c.dusts.quartz": "Quartz Dusts", - "tag.c.dusts.ruby": "Ruby Dusts", - "tag.c.dusts.salt": "Salt Dusts", - "tag.c.dusts.silicon": "Silicon Dusts", - "tag.c.dusts.silver": "Silver Dusts", - "tag.c.dusts.sodium": "Sodium Dusts", - "tag.c.dusts.soldering_alloy": "Soldering Alloy Dusts", - "tag.c.dusts.stainless_steel": "Stainless Steel Dusts", - "tag.c.dusts.steel": "Steel Dusts", - "tag.c.dusts.sulfur": "Sulfur Dusts", - "tag.c.dusts.superconductor": "Superconductor Dusts", - "tag.c.dusts.tin": "Tin Dusts", - "tag.c.dusts.titanium": "Titanium Dusts", - "tag.c.dusts.tungsten": "Tungsten Dusts", - "tag.c.dusts.uranium": "Uranium Dusts", - "tag.c.dusts.uranium_235": "Uranium 235 Dusts", - "tag.c.dusts.uranium_238": "Uranium 238 Dusts", - "tag.c.dusts.yttrium": "Yttrium Dusts", - "tag.c.gears": "Gears", - "tag.c.gears.aluminum": "Aluminum Gears", - "tag.c.gears.bronze": "Bronze Gears", - "tag.c.gears.copper": "Copper Gears", - "tag.c.gears.gold": "Gold Gears", - "tag.c.gears.invar": "Invar Gears", - "tag.c.gears.iron": "Iron Gears", - "tag.c.gears.stainless_steel": "Stainless Steel Gears", - "tag.c.gears.steel": "Steel Gears", - "tag.c.gears.tin": "Tin Gears", - "tag.c.gears.titanium": "Titanium Gears", - "tag.c.gems.lignite_coal": "Lignite Coals", - "tag.c.ingots": "Ingots", - "tag.c.ingots.aluminum": "Aluminum Ingots", - "tag.c.ingots.annealed_copper": "Annealed Copper Ingots", - "tag.c.ingots.antimony": "Antimony Ingots", - "tag.c.ingots.battery_alloy": "Battery Alloy Ingots", - "tag.c.ingots.beryllium": "Beryllium Ingots", - "tag.c.ingots.blastproof_alloy": "Blastproof Alloy Ingots", - "tag.c.ingots.bronze": "Bronze Ingots", - "tag.c.ingots.cadmium": "Cadmium Ingots", - "tag.c.ingots.chromium": "Chromium Ingots", - "tag.c.ingots.cupronickel": "Cupronickel Ingots", - "tag.c.ingots.electrum": "Electrum Ingots", - "tag.c.ingots.he_mox": "HE Mox Ingots", - "tag.c.ingots.he_uranium": "HE Uranium Ingots", - "tag.c.ingots.invar": "Invar Ingots", - "tag.c.ingots.iridium": "Iridium Ingots", - "tag.c.ingots.kanthal": "Kanthal Ingots", - "tag.c.ingots.le_mox": "LE Mox Ingots", - "tag.c.ingots.le_uranium": "LE Uranium Ingots", - "tag.c.ingots.lead": "Lead Ingots", - "tag.c.ingots.nickel": "Nickel Ingots", - "tag.c.ingots.platinum": "Platinum Ingots", - "tag.c.ingots.plutonium": "Plutonium Ingots", - "tag.c.ingots.silicon": "Silicon Ingots", - "tag.c.ingots.silver": "Silver Ingots", - "tag.c.ingots.stainless_steel": "Stainless Steel Ingots", - "tag.c.ingots.steel": "Steel Ingots", - "tag.c.ingots.superconductor": "Superconductor Ingots", - "tag.c.ingots.tin": "Tin Ingots", - "tag.c.ingots.titanium": "Titanium Ingots", - "tag.c.ingots.tungsten": "Tungsten Ingots", - "tag.c.ingots.uranium": "Uranium Ingots", - "tag.c.ingots.uranium_235": "Uranium 235 Ingots", - "tag.c.ingots.uranium_238": "Uranium 238 Ingots", - "tag.c.nuggets": "Nuggets", - "tag.c.nuggets.aluminum": "Aluminum Nuggets", - "tag.c.nuggets.annealed_copper": "Annealed Copper Nuggets", - "tag.c.nuggets.antimony": "Antimony Nuggets", - "tag.c.nuggets.battery_alloy": "Battery Alloy Nuggets", - "tag.c.nuggets.beryllium": "Beryllium Nuggets", - "tag.c.nuggets.bronze": "Bronze Nuggets", - "tag.c.nuggets.chromium": "Chromium Nuggets", - "tag.c.nuggets.copper": "Copper Nuggets", - "tag.c.nuggets.cupronickel": "Cupronickel Nuggets", - "tag.c.nuggets.electrum": "Electrum Nuggets", - "tag.c.nuggets.he_mox": "HE Mox Nuggets", - "tag.c.nuggets.he_uranium": "HE Uranium Nuggets", - "tag.c.nuggets.invar": "Invar Nuggets", - "tag.c.nuggets.iridium": "Iridium Nuggets", - "tag.c.nuggets.kanthal": "Kanthal Nuggets", - "tag.c.nuggets.le_mox": "LE Mox Nuggets", - "tag.c.nuggets.le_uranium": "LE Uranium Nuggets", - "tag.c.nuggets.lead": "Lead Nuggets", - "tag.c.nuggets.nickel": "Nickel Nuggets", - "tag.c.nuggets.platinum": "Platinum Nuggets", - "tag.c.nuggets.plutonium": "Plutonium Nuggets", - "tag.c.nuggets.silicon": "Silicon Nuggets", - "tag.c.nuggets.silver": "Silver Nuggets", - "tag.c.nuggets.stainless_steel": "Stainless Steel Nuggets", - "tag.c.nuggets.steel": "Steel Nuggets", - "tag.c.nuggets.superconductor": "Superconductor Nuggets", - "tag.c.nuggets.tin": "Tin Nuggets", - "tag.c.nuggets.titanium": "Titanium Nuggets", - "tag.c.nuggets.tungsten": "Tungsten Nuggets", - "tag.c.nuggets.uranium": "Uranium Nuggets", - "tag.c.nuggets.uranium_235": "Uranium 235 Nuggets", - "tag.c.nuggets.uranium_238": "Uranium 238 Nuggets", - "tag.c.ores": "Ores", - "tag.c.ores.antimony": "Antimony Ores", - "tag.c.ores.bauxite": "Bauxite Ores", - "tag.c.ores.iridium": "Iridium Ores", - "tag.c.ores.lead": "Lead Ores", - "tag.c.ores.lignite_coal": "Lignite Coal Ores", - "tag.c.ores.monazite": "Monazite Ores", - "tag.c.ores.nickel": "Nickel Ores", - "tag.c.ores.platinum": "Platinum Ores", - "tag.c.ores.quartz": "Quartz Ores", - "tag.c.ores.salt": "Salt Ores", - "tag.c.ores.tin": "Tin Ores", - "tag.c.ores.titanium": "Titanium Ores", - "tag.c.ores.tungsten": "Tungsten Ores", - "tag.c.ores.uranium": "Uranium Ores", - "tag.c.plates": "Plates", - "tag.c.plates.aluminum": "Aluminum Plates", - "tag.c.plates.annealed_copper": "Annealed Copper Plates", - "tag.c.plates.battery_alloy": "Battery Alloy Plates", - "tag.c.plates.beryllium": "Beryllium Plates", - "tag.c.plates.blastproof_alloy": "Blastproof Alloy Plates", - "tag.c.plates.bronze": "Bronze Plates", - "tag.c.plates.cadmium": "Cadmium Plates", - "tag.c.plates.carbon": "Carbon Plates", - "tag.c.plates.chromium": "Chromium Plates", - "tag.c.plates.copper": "Copper Plates", - "tag.c.plates.cupronickel": "Cupronickel Plates", - "tag.c.plates.diamond": "Diamond Plates", - "tag.c.plates.electrum": "Electrum Plates", - "tag.c.plates.emerald": "Emerald Plates", - "tag.c.plates.gold": "Gold Plates", - "tag.c.plates.invar": "Invar Plates", - "tag.c.plates.iridium": "Iridium Plates", - "tag.c.plates.iron": "Iron Plates", - "tag.c.plates.kanthal": "Kanthal Plates", - "tag.c.plates.lead": "Lead Plates", - "tag.c.plates.nickel": "Nickel Plates", - "tag.c.plates.nuclear_alloy": "Nuclear Alloy Plates", - "tag.c.plates.platinum": "Platinum Plates", - "tag.c.plates.silicon": "Silicon Plates", - "tag.c.plates.silver": "Silver Plates", - "tag.c.plates.stainless_steel": "Stainless Steel Plates", - "tag.c.plates.steel": "Steel Plates", - "tag.c.plates.superconductor": "Superconductor Plates", - "tag.c.plates.tin": "Tin Plates", - "tag.c.plates.titanium": "Titanium Plates", - "tag.c.plates.tungsten": "Tungsten Plates", - "tag.c.raw_materials": "Raw Ores", - "tag.c.raw_materials.antimony": "Antimony Raw Materials", - "tag.c.raw_materials.iridium": "Iridium Raw Materials", - "tag.c.raw_materials.lead": "Lead Raw Materials", - "tag.c.raw_materials.nickel": "Nickel Raw Materials", - "tag.c.raw_materials.platinum": "Platinum Raw Materials", - "tag.c.raw_materials.silver": "Silver Raw Materials", - "tag.c.raw_materials.tin": "Tin Raw Materials", - "tag.c.raw_materials.titanium": "Titanium Raw Materials", - "tag.c.raw_materials.tungsten": "Tungsten Raw Materials", - "tag.c.raw_materials.uranium": "Uranium Raw Materials", - "tag.c.rods": "Rods", - "tag.c.rods.aluminum": "Aluminum Rods", - "tag.c.rods.bronze": "Bronze Rods", - "tag.c.rods.cadmium": "Cadmium Rods", - "tag.c.rods.copper": "Copper Rods", - "tag.c.rods.gold": "Gold Rods", - "tag.c.rods.he_mox": "HE Mox Rods", - "tag.c.rods.he_uranium": "HE Uranium Rods", - "tag.c.rods.invar": "Invar Rods", - "tag.c.rods.iron": "Iron Rods", - "tag.c.rods.le_mox": "LE Mox Rods", - "tag.c.rods.le_uranium": "LE Uranium Rods", - "tag.c.rods.stainless_steel": "Stainless Steel Rods", - "tag.c.rods.steel": "Steel Rods", - "tag.c.rods.tin": "Tin Rods", - "tag.c.rods.titanium": "Titanium Rods", - "tag.c.rods.uranium": "Uranium Rods", - "tag.c.storage_blocks": "Storage Blocks", - "tag.c.storage_blocks.aluminum": "Aluminum Storage Blocks", - "tag.c.storage_blocks.annealed_copper": "Annealed Copper Storage Blocks", - "tag.c.storage_blocks.antimony": "Antimony Storage Blocks", - "tag.c.storage_blocks.battery_alloy": "Battery Alloy Storage Blocks", - "tag.c.storage_blocks.bauxite": "Bauxite Storage Blocks", - "tag.c.storage_blocks.beryllium": "Beryllium Storage Blocks", - "tag.c.storage_blocks.bronze": "Bronze Storage Blocks", - "tag.c.storage_blocks.chromium": "Chromium Storage Blocks", - "tag.c.storage_blocks.coke": "Coke Storage Blocks", - "tag.c.storage_blocks.cupronickel": "Cupronickel Storage Blocks", - "tag.c.storage_blocks.electrum": "Electrum Storage Blocks", - "tag.c.storage_blocks.he_mox": "HE Mox Storage Blocks", - "tag.c.storage_blocks.he_uranium": "HE Uranium Storage Blocks", - "tag.c.storage_blocks.invar": "Invar Storage Blocks", - "tag.c.storage_blocks.iridium": "Iridium Storage Blocks", - "tag.c.storage_blocks.kanthal": "Kanthal Storage Blocks", - "tag.c.storage_blocks.le_mox": "LE Mox Storage Blocks", - "tag.c.storage_blocks.le_uranium": "LE Uranium Storage Blocks", - "tag.c.storage_blocks.lead": "Lead Storage Blocks", - "tag.c.storage_blocks.lignite_coal": "Lignite Coal Storage Blocks", - "tag.c.storage_blocks.monazite": "Monazite Storage Blocks", - "tag.c.storage_blocks.neodymium": "Neodymium Storage Blocks", - "tag.c.storage_blocks.nickel": "Nickel Storage Blocks", - "tag.c.storage_blocks.platinum": "Platinum Storage Blocks", - "tag.c.storage_blocks.plutonium": "Plutonium Storage Blocks", - "tag.c.storage_blocks.raw_antimony": "Raw Antimony Ores", - "tag.c.storage_blocks.raw_iridium": "Raw Iridium Ores", - "tag.c.storage_blocks.raw_lead": "Raw Lead Ores", - "tag.c.storage_blocks.raw_nickel": "Raw Nickel Ores", - "tag.c.storage_blocks.raw_platinum": "Raw Platinum Ores", - "tag.c.storage_blocks.raw_silver": "Raw Silver Ores", - "tag.c.storage_blocks.raw_tin": "Raw Tin Ores", - "tag.c.storage_blocks.raw_titanium": "Raw Titanium Ores", - "tag.c.storage_blocks.raw_tungsten": "Raw Tungsten Ores", - "tag.c.storage_blocks.raw_uranium": "Raw Uranium Ores", - "tag.c.storage_blocks.salt": "Salt Storage Blocks", - "tag.c.storage_blocks.silicon": "Silicon Storage Blocks", - "tag.c.storage_blocks.silver": "Silver Storage Blocks", - "tag.c.storage_blocks.sodium": "Sodium Storage Blocks", - "tag.c.storage_blocks.soldering_alloy": "Soldering Alloy Storage Blocks", - "tag.c.storage_blocks.stainless_steel": "Stainless Steel Storage Blocks", - "tag.c.storage_blocks.steel": "Steel Storage Blocks", - "tag.c.storage_blocks.sulfur": "Sulfur Storage Blocks", - "tag.c.storage_blocks.tin": "Tin Storage Blocks", - "tag.c.storage_blocks.titanium": "Titanium Storage Blocks", - "tag.c.storage_blocks.tungsten": "Tungsten Storage Blocks", - "tag.c.storage_blocks.uranium": "Uranium Storage Blocks", - "tag.c.storage_blocks.uranium_235": "Uranium 235 Storage Blocks", - "tag.c.storage_blocks.uranium_238": "Uranium 238 Storage Blocks", - "tag.c.storage_blocks.yttrium": "Yttrium Storage Blocks", - "tag.c.tiny_dusts": "Tiny Dusts", - "tag.c.tiny_dusts.aluminum": "Aluminum Tiny Dusts", - "tag.c.tiny_dusts.annealed_copper": "Annealed Copper Tiny Dusts", - "tag.c.tiny_dusts.antimony": "Antimony Tiny Dusts", - "tag.c.tiny_dusts.battery_alloy": "Battery Alloy Tiny Dusts", - "tag.c.tiny_dusts.bauxite": "Bauxite Tiny Dusts", - "tag.c.tiny_dusts.beryllium": "Beryllium Tiny Dusts", - "tag.c.tiny_dusts.brick": "Brick Tiny Dusts", - "tag.c.tiny_dusts.bronze": "Bronze Tiny Dusts", - "tag.c.tiny_dusts.cadmium": "Cadmium Tiny Dusts", - "tag.c.tiny_dusts.carbon": "Carbon Tiny Dusts", - "tag.c.tiny_dusts.chromium": "Chromium Tiny Dusts", - "tag.c.tiny_dusts.coal": "Coal Tiny Dusts", - "tag.c.tiny_dusts.copper": "Copper Tiny Dusts", - "tag.c.tiny_dusts.cupronickel": "Cupronickel Tiny Dusts", - "tag.c.tiny_dusts.diamond": "Diamond Tiny Dusts", - "tag.c.tiny_dusts.electrum": "Electrum Tiny Dusts", - "tag.c.tiny_dusts.emerald": "Emerald Tiny Dusts", - "tag.c.tiny_dusts.gold": "Gold Tiny Dusts", - "tag.c.tiny_dusts.he_mox": "HE Mox Tiny Dusts", - "tag.c.tiny_dusts.he_uranium": "HE Uranium Tiny Dusts", - "tag.c.tiny_dusts.invar": "Invar Tiny Dusts", - "tag.c.tiny_dusts.iridium": "Iridium Tiny Dusts", - "tag.c.tiny_dusts.iron": "Iron Tiny Dusts", - "tag.c.tiny_dusts.kanthal": "Kanthal Tiny Dusts", - "tag.c.tiny_dusts.lapis": "Lapis Lazuli Tiny Dusts", - "tag.c.tiny_dusts.le_mox": "LE Mox Tiny Dusts", - "tag.c.tiny_dusts.le_uranium": "LE Uranium Tiny Dusts", - "tag.c.tiny_dusts.lead": "Lead Tiny Dusts", - "tag.c.tiny_dusts.lignite_coal": "Lignite Coal Tiny Dusts", - "tag.c.tiny_dusts.manganese": "Manganese Tiny Dusts", - "tag.c.tiny_dusts.monazite": "Monazite Tiny Dusts", - "tag.c.tiny_dusts.neodymium": "Neodymium Tiny Dusts", - "tag.c.tiny_dusts.nickel": "Nickel Tiny Dusts", - "tag.c.tiny_dusts.platinum": "Platinum Tiny Dusts", - "tag.c.tiny_dusts.plutonium": "Plutonium Tiny Dusts", - "tag.c.tiny_dusts.quartz": "Quartz Tiny Dusts", - "tag.c.tiny_dusts.redstone": "Redstone Tiny Dusts", - "tag.c.tiny_dusts.ruby": "Ruby Tiny Dusts", - "tag.c.tiny_dusts.salt": "Salt Tiny Dusts", - "tag.c.tiny_dusts.silicon": "Silicon Tiny Dusts", - "tag.c.tiny_dusts.silver": "Silver Tiny Dusts", - "tag.c.tiny_dusts.sodium": "Sodium Tiny Dusts", - "tag.c.tiny_dusts.soldering_alloy": "Soldering Alloy Tiny Dusts", - "tag.c.tiny_dusts.stainless_steel": "Stainless Steel Tiny Dusts", - "tag.c.tiny_dusts.steel": "Steel Tiny Dusts", - "tag.c.tiny_dusts.sulfur": "Sulfur Tiny Dusts", - "tag.c.tiny_dusts.superconductor": "Superconductor Tiny Dusts", - "tag.c.tiny_dusts.tin": "Tin Tiny Dusts", - "tag.c.tiny_dusts.titanium": "Titanium Tiny Dusts", - "tag.c.tiny_dusts.tungsten": "Tungsten Tiny Dusts", - "tag.c.tiny_dusts.uranium": "Uranium Tiny Dusts", - "tag.c.tiny_dusts.uranium_235": "Uranium 235 Tiny Dusts", - "tag.c.tiny_dusts.uranium_238": "Uranium 238 Tiny Dusts", - "tag.c.tiny_dusts.yttrium": "Yttrium Tiny Dusts", - "tag.modern_industrialization.barrels": "Barrels", - "tag.modern_industrialization.fluid_pipes": "Fluid Pipes", - "tag.modern_industrialization.forge_hammer_tools": "Forge Hammer Tools", - "tag.modern_industrialization.item_pipes": "Item Pipes", - "tag.modern_industrialization.me_wires": "ME Wires", - "tag.modern_industrialization.replicator_blacklist": "Replicator Blacklist", - "tag.modern_industrialization.tanks": "Tanks", + "tag.item.c.dusts": "Dusts", + "tag.item.c.dusts.aluminum": "Aluminum Dusts", + "tag.item.c.dusts.annealed_copper": "Annealed Copper Dusts", + "tag.item.c.dusts.antimony": "Antimony Dusts", + "tag.item.c.dusts.battery_alloy": "Battery Alloy Dusts", + "tag.item.c.dusts.bauxite": "Bauxite Dusts", + "tag.item.c.dusts.beryllium": "Beryllium Dusts", + "tag.item.c.dusts.brick": "Brick Dusts", + "tag.item.c.dusts.bronze": "Bronze Dusts", + "tag.item.c.dusts.cadmium": "Cadmium Dusts", + "tag.item.c.dusts.carbon": "Carbon Dusts", + "tag.item.c.dusts.chromium": "Chromium Dusts", + "tag.item.c.dusts.coal": "Coal Dusts", + "tag.item.c.dusts.coke": "Coke Dusts", + "tag.item.c.dusts.copper": "Copper Dusts", + "tag.item.c.dusts.cupronickel": "Cupronickel Dusts", + "tag.item.c.dusts.diamond": "Diamond Dusts", + "tag.item.c.dusts.electrum": "Electrum Dusts", + "tag.item.c.dusts.emerald": "Emerald Dusts", + "tag.item.c.dusts.fire_clay": "Fire Clay Dusts", + "tag.item.c.dusts.gold": "Gold Dusts", + "tag.item.c.dusts.he_mox": "HE Mox Dusts", + "tag.item.c.dusts.he_uranium": "HE Uranium Dusts", + "tag.item.c.dusts.invar": "Invar Dusts", + "tag.item.c.dusts.iridium": "Iridium Dusts", + "tag.item.c.dusts.iron": "Iron Dusts", + "tag.item.c.dusts.kanthal": "Kanthal Dusts", + "tag.item.c.dusts.lapis": "Lapis Lazuli Dusts", + "tag.item.c.dusts.le_mox": "LE Mox Dusts", + "tag.item.c.dusts.le_uranium": "LE Uranium Dusts", + "tag.item.c.dusts.lead": "Lead Dusts", + "tag.item.c.dusts.lignite_coal": "Lignite Coal Dusts", + "tag.item.c.dusts.manganese": "Manganese Dusts", + "tag.item.c.dusts.monazite": "Monazite Dusts", + "tag.item.c.dusts.neodymium": "Neodymium Dusts", + "tag.item.c.dusts.nickel": "Nickel Dusts", + "tag.item.c.dusts.platinum": "Platinum Dusts", + "tag.item.c.dusts.plutonium": "Plutonium Dusts", + "tag.item.c.dusts.quartz": "Quartz Dusts", + "tag.item.c.dusts.ruby": "Ruby Dusts", + "tag.item.c.dusts.salt": "Salt Dusts", + "tag.item.c.dusts.silicon": "Silicon Dusts", + "tag.item.c.dusts.silver": "Silver Dusts", + "tag.item.c.dusts.sodium": "Sodium Dusts", + "tag.item.c.dusts.soldering_alloy": "Soldering Alloy Dusts", + "tag.item.c.dusts.stainless_steel": "Stainless Steel Dusts", + "tag.item.c.dusts.steel": "Steel Dusts", + "tag.item.c.dusts.sulfur": "Sulfur Dusts", + "tag.item.c.dusts.superconductor": "Superconductor Dusts", + "tag.item.c.dusts.tin": "Tin Dusts", + "tag.item.c.dusts.titanium": "Titanium Dusts", + "tag.item.c.dusts.tungsten": "Tungsten Dusts", + "tag.item.c.dusts.uranium": "Uranium Dusts", + "tag.item.c.dusts.uranium_235": "Uranium 235 Dusts", + "tag.item.c.dusts.uranium_238": "Uranium 238 Dusts", + "tag.item.c.dusts.yttrium": "Yttrium Dusts", + "tag.item.c.gears": "Gears", + "tag.item.c.gears.aluminum": "Aluminum Gears", + "tag.item.c.gears.bronze": "Bronze Gears", + "tag.item.c.gears.copper": "Copper Gears", + "tag.item.c.gears.gold": "Gold Gears", + "tag.item.c.gears.invar": "Invar Gears", + "tag.item.c.gears.iron": "Iron Gears", + "tag.item.c.gears.stainless_steel": "Stainless Steel Gears", + "tag.item.c.gears.steel": "Steel Gears", + "tag.item.c.gears.tin": "Tin Gears", + "tag.item.c.gears.titanium": "Titanium Gears", + "tag.item.c.ingots": "Ingots", + "tag.item.c.ingots.aluminum": "Aluminum Ingots", + "tag.item.c.ingots.annealed_copper": "Annealed Copper Ingots", + "tag.item.c.ingots.antimony": "Antimony Ingots", + "tag.item.c.ingots.battery_alloy": "Battery Alloy Ingots", + "tag.item.c.ingots.beryllium": "Beryllium Ingots", + "tag.item.c.ingots.blastproof_alloy": "Blastproof Alloy Ingots", + "tag.item.c.ingots.bronze": "Bronze Ingots", + "tag.item.c.ingots.cadmium": "Cadmium Ingots", + "tag.item.c.ingots.chromium": "Chromium Ingots", + "tag.item.c.ingots.cupronickel": "Cupronickel Ingots", + "tag.item.c.ingots.electrum": "Electrum Ingots", + "tag.item.c.ingots.he_mox": "HE Mox Ingots", + "tag.item.c.ingots.he_uranium": "HE Uranium Ingots", + "tag.item.c.ingots.invar": "Invar Ingots", + "tag.item.c.ingots.iridium": "Iridium Ingots", + "tag.item.c.ingots.kanthal": "Kanthal Ingots", + "tag.item.c.ingots.le_mox": "LE Mox Ingots", + "tag.item.c.ingots.le_uranium": "LE Uranium Ingots", + "tag.item.c.ingots.lead": "Lead Ingots", + "tag.item.c.ingots.nickel": "Nickel Ingots", + "tag.item.c.ingots.platinum": "Platinum Ingots", + "tag.item.c.ingots.plutonium": "Plutonium Ingots", + "tag.item.c.ingots.silicon": "Silicon Ingots", + "tag.item.c.ingots.silver": "Silver Ingots", + "tag.item.c.ingots.stainless_steel": "Stainless Steel Ingots", + "tag.item.c.ingots.steel": "Steel Ingots", + "tag.item.c.ingots.superconductor": "Superconductor Ingots", + "tag.item.c.ingots.tin": "Tin Ingots", + "tag.item.c.ingots.titanium": "Titanium Ingots", + "tag.item.c.ingots.tungsten": "Tungsten Ingots", + "tag.item.c.ingots.uranium": "Uranium Ingots", + "tag.item.c.ingots.uranium_235": "Uranium 235 Ingots", + "tag.item.c.ingots.uranium_238": "Uranium 238 Ingots", + "tag.item.c.lignite_coal": "Lignite Coals", + "tag.item.c.nuggets": "Nuggets", + "tag.item.c.nuggets.aluminum": "Aluminum Nuggets", + "tag.item.c.nuggets.annealed_copper": "Annealed Copper Nuggets", + "tag.item.c.nuggets.antimony": "Antimony Nuggets", + "tag.item.c.nuggets.battery_alloy": "Battery Alloy Nuggets", + "tag.item.c.nuggets.beryllium": "Beryllium Nuggets", + "tag.item.c.nuggets.bronze": "Bronze Nuggets", + "tag.item.c.nuggets.chromium": "Chromium Nuggets", + "tag.item.c.nuggets.copper": "Copper Nuggets", + "tag.item.c.nuggets.cupronickel": "Cupronickel Nuggets", + "tag.item.c.nuggets.electrum": "Electrum Nuggets", + "tag.item.c.nuggets.he_mox": "HE Mox Nuggets", + "tag.item.c.nuggets.he_uranium": "HE Uranium Nuggets", + "tag.item.c.nuggets.invar": "Invar Nuggets", + "tag.item.c.nuggets.iridium": "Iridium Nuggets", + "tag.item.c.nuggets.kanthal": "Kanthal Nuggets", + "tag.item.c.nuggets.le_mox": "LE Mox Nuggets", + "tag.item.c.nuggets.le_uranium": "LE Uranium Nuggets", + "tag.item.c.nuggets.lead": "Lead Nuggets", + "tag.item.c.nuggets.nickel": "Nickel Nuggets", + "tag.item.c.nuggets.platinum": "Platinum Nuggets", + "tag.item.c.nuggets.plutonium": "Plutonium Nuggets", + "tag.item.c.nuggets.silicon": "Silicon Nuggets", + "tag.item.c.nuggets.silver": "Silver Nuggets", + "tag.item.c.nuggets.stainless_steel": "Stainless Steel Nuggets", + "tag.item.c.nuggets.steel": "Steel Nuggets", + "tag.item.c.nuggets.superconductor": "Superconductor Nuggets", + "tag.item.c.nuggets.tin": "Tin Nuggets", + "tag.item.c.nuggets.titanium": "Titanium Nuggets", + "tag.item.c.nuggets.tungsten": "Tungsten Nuggets", + "tag.item.c.nuggets.uranium": "Uranium Nuggets", + "tag.item.c.nuggets.uranium_235": "Uranium 235 Nuggets", + "tag.item.c.nuggets.uranium_238": "Uranium 238 Nuggets", + "tag.item.c.ores": "Ores", + "tag.item.c.ores.antimony": "Antimony Ores", + "tag.item.c.ores.bauxite": "Bauxite Ores", + "tag.item.c.ores.iridium": "Iridium Ores", + "tag.item.c.ores.lead": "Lead Ores", + "tag.item.c.ores.lignite_coal": "Lignite Coal Ores", + "tag.item.c.ores.monazite": "Monazite Ores", + "tag.item.c.ores.nickel": "Nickel Ores", + "tag.item.c.ores.platinum": "Platinum Ores", + "tag.item.c.ores.quartz": "Quartz Ores", + "tag.item.c.ores.salt": "Salt Ores", + "tag.item.c.ores.tin": "Tin Ores", + "tag.item.c.ores.titanium": "Titanium Ores", + "tag.item.c.ores.tungsten": "Tungsten Ores", + "tag.item.c.ores.uranium": "Uranium Ores", + "tag.item.c.plates": "Plates", + "tag.item.c.plates.aluminum": "Aluminum Plates", + "tag.item.c.plates.annealed_copper": "Annealed Copper Plates", + "tag.item.c.plates.battery_alloy": "Battery Alloy Plates", + "tag.item.c.plates.beryllium": "Beryllium Plates", + "tag.item.c.plates.blastproof_alloy": "Blastproof Alloy Plates", + "tag.item.c.plates.bronze": "Bronze Plates", + "tag.item.c.plates.cadmium": "Cadmium Plates", + "tag.item.c.plates.carbon": "Carbon Plates", + "tag.item.c.plates.chromium": "Chromium Plates", + "tag.item.c.plates.copper": "Copper Plates", + "tag.item.c.plates.cupronickel": "Cupronickel Plates", + "tag.item.c.plates.diamond": "Diamond Plates", + "tag.item.c.plates.electrum": "Electrum Plates", + "tag.item.c.plates.emerald": "Emerald Plates", + "tag.item.c.plates.gold": "Gold Plates", + "tag.item.c.plates.invar": "Invar Plates", + "tag.item.c.plates.iridium": "Iridium Plates", + "tag.item.c.plates.iron": "Iron Plates", + "tag.item.c.plates.kanthal": "Kanthal Plates", + "tag.item.c.plates.lead": "Lead Plates", + "tag.item.c.plates.nickel": "Nickel Plates", + "tag.item.c.plates.nuclear_alloy": "Nuclear Alloy Plates", + "tag.item.c.plates.platinum": "Platinum Plates", + "tag.item.c.plates.silicon": "Silicon Plates", + "tag.item.c.plates.silver": "Silver Plates", + "tag.item.c.plates.stainless_steel": "Stainless Steel Plates", + "tag.item.c.plates.steel": "Steel Plates", + "tag.item.c.plates.superconductor": "Superconductor Plates", + "tag.item.c.plates.tin": "Tin Plates", + "tag.item.c.plates.titanium": "Titanium Plates", + "tag.item.c.plates.tungsten": "Tungsten Plates", + "tag.item.c.raw_materials": "Raw Ores", + "tag.item.c.raw_materials.antimony": "Antimony Raw Materials", + "tag.item.c.raw_materials.iridium": "Iridium Raw Materials", + "tag.item.c.raw_materials.lead": "Lead Raw Materials", + "tag.item.c.raw_materials.nickel": "Nickel Raw Materials", + "tag.item.c.raw_materials.platinum": "Platinum Raw Materials", + "tag.item.c.raw_materials.silver": "Silver Raw Materials", + "tag.item.c.raw_materials.tin": "Tin Raw Materials", + "tag.item.c.raw_materials.titanium": "Titanium Raw Materials", + "tag.item.c.raw_materials.tungsten": "Tungsten Raw Materials", + "tag.item.c.raw_materials.uranium": "Uranium Raw Materials", + "tag.item.c.rods": "Rods", + "tag.item.c.rods.aluminum": "Aluminum Rods", + "tag.item.c.rods.bronze": "Bronze Rods", + "tag.item.c.rods.cadmium": "Cadmium Rods", + "tag.item.c.rods.copper": "Copper Rods", + "tag.item.c.rods.gold": "Gold Rods", + "tag.item.c.rods.he_mox": "HE Mox Rods", + "tag.item.c.rods.he_uranium": "HE Uranium Rods", + "tag.item.c.rods.invar": "Invar Rods", + "tag.item.c.rods.iron": "Iron Rods", + "tag.item.c.rods.le_mox": "LE Mox Rods", + "tag.item.c.rods.le_uranium": "LE Uranium Rods", + "tag.item.c.rods.stainless_steel": "Stainless Steel Rods", + "tag.item.c.rods.steel": "Steel Rods", + "tag.item.c.rods.tin": "Tin Rods", + "tag.item.c.rods.titanium": "Titanium Rods", + "tag.item.c.rods.uranium": "Uranium Rods", + "tag.item.c.storage_blocks": "Storage Blocks", + "tag.item.c.storage_blocks.aluminum": "Aluminum Storage Blocks", + "tag.item.c.storage_blocks.annealed_copper": "Annealed Copper Storage Blocks", + "tag.item.c.storage_blocks.antimony": "Antimony Storage Blocks", + "tag.item.c.storage_blocks.battery_alloy": "Battery Alloy Storage Blocks", + "tag.item.c.storage_blocks.bauxite": "Bauxite Storage Blocks", + "tag.item.c.storage_blocks.beryllium": "Beryllium Storage Blocks", + "tag.item.c.storage_blocks.bronze": "Bronze Storage Blocks", + "tag.item.c.storage_blocks.chromium": "Chromium Storage Blocks", + "tag.item.c.storage_blocks.coke": "Coke Storage Blocks", + "tag.item.c.storage_blocks.cupronickel": "Cupronickel Storage Blocks", + "tag.item.c.storage_blocks.electrum": "Electrum Storage Blocks", + "tag.item.c.storage_blocks.he_mox": "HE Mox Storage Blocks", + "tag.item.c.storage_blocks.he_uranium": "HE Uranium Storage Blocks", + "tag.item.c.storage_blocks.invar": "Invar Storage Blocks", + "tag.item.c.storage_blocks.iridium": "Iridium Storage Blocks", + "tag.item.c.storage_blocks.kanthal": "Kanthal Storage Blocks", + "tag.item.c.storage_blocks.le_mox": "LE Mox Storage Blocks", + "tag.item.c.storage_blocks.le_uranium": "LE Uranium Storage Blocks", + "tag.item.c.storage_blocks.lead": "Lead Storage Blocks", + "tag.item.c.storage_blocks.lignite_coal": "Lignite Coal Storage Blocks", + "tag.item.c.storage_blocks.monazite": "Monazite Storage Blocks", + "tag.item.c.storage_blocks.neodymium": "Neodymium Storage Blocks", + "tag.item.c.storage_blocks.nickel": "Nickel Storage Blocks", + "tag.item.c.storage_blocks.platinum": "Platinum Storage Blocks", + "tag.item.c.storage_blocks.plutonium": "Plutonium Storage Blocks", + "tag.item.c.storage_blocks.raw_antimony": "Raw Antimony Ores", + "tag.item.c.storage_blocks.raw_iridium": "Raw Iridium Ores", + "tag.item.c.storage_blocks.raw_lead": "Raw Lead Ores", + "tag.item.c.storage_blocks.raw_nickel": "Raw Nickel Ores", + "tag.item.c.storage_blocks.raw_platinum": "Raw Platinum Ores", + "tag.item.c.storage_blocks.raw_silver": "Raw Silver Ores", + "tag.item.c.storage_blocks.raw_tin": "Raw Tin Ores", + "tag.item.c.storage_blocks.raw_titanium": "Raw Titanium Ores", + "tag.item.c.storage_blocks.raw_tungsten": "Raw Tungsten Ores", + "tag.item.c.storage_blocks.raw_uranium": "Raw Uranium Ores", + "tag.item.c.storage_blocks.salt": "Salt Storage Blocks", + "tag.item.c.storage_blocks.silicon": "Silicon Storage Blocks", + "tag.item.c.storage_blocks.silver": "Silver Storage Blocks", + "tag.item.c.storage_blocks.sodium": "Sodium Storage Blocks", + "tag.item.c.storage_blocks.soldering_alloy": "Soldering Alloy Storage Blocks", + "tag.item.c.storage_blocks.stainless_steel": "Stainless Steel Storage Blocks", + "tag.item.c.storage_blocks.steel": "Steel Storage Blocks", + "tag.item.c.storage_blocks.sulfur": "Sulfur Storage Blocks", + "tag.item.c.storage_blocks.tin": "Tin Storage Blocks", + "tag.item.c.storage_blocks.titanium": "Titanium Storage Blocks", + "tag.item.c.storage_blocks.tungsten": "Tungsten Storage Blocks", + "tag.item.c.storage_blocks.uranium": "Uranium Storage Blocks", + "tag.item.c.storage_blocks.uranium_235": "Uranium 235 Storage Blocks", + "tag.item.c.storage_blocks.uranium_238": "Uranium 238 Storage Blocks", + "tag.item.c.storage_blocks.yttrium": "Yttrium Storage Blocks", + "tag.item.c.tiny_dusts": "Tiny Dusts", + "tag.item.c.tiny_dusts.aluminum": "Aluminum Tiny Dusts", + "tag.item.c.tiny_dusts.annealed_copper": "Annealed Copper Tiny Dusts", + "tag.item.c.tiny_dusts.antimony": "Antimony Tiny Dusts", + "tag.item.c.tiny_dusts.battery_alloy": "Battery Alloy Tiny Dusts", + "tag.item.c.tiny_dusts.bauxite": "Bauxite Tiny Dusts", + "tag.item.c.tiny_dusts.beryllium": "Beryllium Tiny Dusts", + "tag.item.c.tiny_dusts.brick": "Brick Tiny Dusts", + "tag.item.c.tiny_dusts.bronze": "Bronze Tiny Dusts", + "tag.item.c.tiny_dusts.cadmium": "Cadmium Tiny Dusts", + "tag.item.c.tiny_dusts.carbon": "Carbon Tiny Dusts", + "tag.item.c.tiny_dusts.chromium": "Chromium Tiny Dusts", + "tag.item.c.tiny_dusts.coal": "Coal Tiny Dusts", + "tag.item.c.tiny_dusts.copper": "Copper Tiny Dusts", + "tag.item.c.tiny_dusts.cupronickel": "Cupronickel Tiny Dusts", + "tag.item.c.tiny_dusts.diamond": "Diamond Tiny Dusts", + "tag.item.c.tiny_dusts.electrum": "Electrum Tiny Dusts", + "tag.item.c.tiny_dusts.emerald": "Emerald Tiny Dusts", + "tag.item.c.tiny_dusts.gold": "Gold Tiny Dusts", + "tag.item.c.tiny_dusts.he_mox": "HE Mox Tiny Dusts", + "tag.item.c.tiny_dusts.he_uranium": "HE Uranium Tiny Dusts", + "tag.item.c.tiny_dusts.invar": "Invar Tiny Dusts", + "tag.item.c.tiny_dusts.iridium": "Iridium Tiny Dusts", + "tag.item.c.tiny_dusts.iron": "Iron Tiny Dusts", + "tag.item.c.tiny_dusts.kanthal": "Kanthal Tiny Dusts", + "tag.item.c.tiny_dusts.lapis": "Lapis Lazuli Tiny Dusts", + "tag.item.c.tiny_dusts.le_mox": "LE Mox Tiny Dusts", + "tag.item.c.tiny_dusts.le_uranium": "LE Uranium Tiny Dusts", + "tag.item.c.tiny_dusts.lead": "Lead Tiny Dusts", + "tag.item.c.tiny_dusts.lignite_coal": "Lignite Coal Tiny Dusts", + "tag.item.c.tiny_dusts.manganese": "Manganese Tiny Dusts", + "tag.item.c.tiny_dusts.monazite": "Monazite Tiny Dusts", + "tag.item.c.tiny_dusts.neodymium": "Neodymium Tiny Dusts", + "tag.item.c.tiny_dusts.nickel": "Nickel Tiny Dusts", + "tag.item.c.tiny_dusts.platinum": "Platinum Tiny Dusts", + "tag.item.c.tiny_dusts.plutonium": "Plutonium Tiny Dusts", + "tag.item.c.tiny_dusts.quartz": "Quartz Tiny Dusts", + "tag.item.c.tiny_dusts.redstone": "Redstone Tiny Dusts", + "tag.item.c.tiny_dusts.ruby": "Ruby Tiny Dusts", + "tag.item.c.tiny_dusts.salt": "Salt Tiny Dusts", + "tag.item.c.tiny_dusts.silicon": "Silicon Tiny Dusts", + "tag.item.c.tiny_dusts.silver": "Silver Tiny Dusts", + "tag.item.c.tiny_dusts.sodium": "Sodium Tiny Dusts", + "tag.item.c.tiny_dusts.soldering_alloy": "Soldering Alloy Tiny Dusts", + "tag.item.c.tiny_dusts.stainless_steel": "Stainless Steel Tiny Dusts", + "tag.item.c.tiny_dusts.steel": "Steel Tiny Dusts", + "tag.item.c.tiny_dusts.sulfur": "Sulfur Tiny Dusts", + "tag.item.c.tiny_dusts.superconductor": "Superconductor Tiny Dusts", + "tag.item.c.tiny_dusts.tin": "Tin Tiny Dusts", + "tag.item.c.tiny_dusts.titanium": "Titanium Tiny Dusts", + "tag.item.c.tiny_dusts.tungsten": "Tungsten Tiny Dusts", + "tag.item.c.tiny_dusts.uranium": "Uranium Tiny Dusts", + "tag.item.c.tiny_dusts.uranium_235": "Uranium 235 Tiny Dusts", + "tag.item.c.tiny_dusts.uranium_238": "Uranium 238 Tiny Dusts", + "tag.item.c.tiny_dusts.yttrium": "Yttrium Tiny Dusts", + "tag.item.modern_industrialization.barrels": "Barrels", + "tag.item.modern_industrialization.fluid_pipes": "Fluid Pipes", + "tag.item.modern_industrialization.forge_hammer_tools": "Forge Hammer Tools", + "tag.item.modern_industrialization.item_pipes": "Item Pipes", + "tag.item.modern_industrialization.replicator_blacklist": "Replicator Blacklist", + "tag.item.modern_industrialization.tanks": "Tanks", "text.autoconfig.modern_industrialization.title": "Modern Industrialization Menu", "text.modern_industrialization.AbsorptionProbability": "Absorption Probability", "text.modern_industrialization.AcceptAnyFluidFuels": "Consumes any Fluid Fuel (Check REI for EU/mb production)", diff --git a/src/generated/resources/assets/modern_industrialization/models/block/advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/advanced_fluid_input_hatch.json deleted file mode 100644 index afed9a6d8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/advanced_fluid_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/advanced_fluid_output_hatch.json deleted file mode 100644 index afed9a6d8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/advanced_fluid_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/advanced_item_input_hatch.json deleted file mode 100644 index 00ee69820..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/advanced_item_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/advanced_item_output_hatch.json deleted file mode 100644 index 00ee69820..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/advanced_item_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/block/advanced_large_steam_boiler.json deleted file mode 100644 index fc0b3e28c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/advanced_large_steam_boiler.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bronze_plated_bricks", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/large_boiler/overlay_front", - "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/assembler.json b/src/generated/resources/assets/modern_industrialization/models/block/assembler.json deleted file mode 100644 index e2dc67f95..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/assembler.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/assembler/overlay_front", - "front_active": "modern_industrialization:block/machines/assembler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/assembler/overlay_top", - "top_active": "modern_industrialization:block/machines/assembler/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_boiler.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_boiler.json deleted file mode 100644 index fc6bd335a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_boiler.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bricked_bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/boiler/overlay_front", - "front_active": "modern_industrialization:block/machines/boiler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_compressor.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_compressor.json deleted file mode 100644 index 3504ca91f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_compressor.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/compressor/overlay_front", - "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/compressor/overlay_side", - "side_active": "modern_industrialization:block/machines/compressor/overlay_side_active", - "top": "modern_industrialization:block/machines/compressor/overlay_top", - "top_active": "modern_industrialization:block/machines/compressor/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_cutting_machine.json deleted file mode 100644 index bd09b9893..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_cutting_machine.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/cutting_machine/overlay_front", - "front_active": "modern_industrialization:block/machines/cutting_machine/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_fluid_input_hatch.json deleted file mode 100644 index 02ab5257f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_fluid_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_fluid_output_hatch.json deleted file mode 100644 index 02ab5257f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_fluid_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_furnace.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_furnace.json deleted file mode 100644 index 93166e60a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_furnace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/furnace/overlay_front", - "front_active": "modern_industrialization:block/machines/furnace/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_item_input_hatch.json deleted file mode 100644 index cdb72947e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_item_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_item_output_hatch.json deleted file mode 100644 index cdb72947e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_item_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_macerator.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_macerator.json deleted file mode 100644 index 9eda59770..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_macerator.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/macerator/overlay_front", - "front_active": "modern_industrialization:block/machines/macerator/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/macerator/overlay_top", - "top_active": "modern_industrialization:block/machines/macerator/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_mixer.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_mixer.json deleted file mode 100644 index c4b801bbe..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_mixer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/mixer/overlay_front", - "front_active": "modern_industrialization:block/machines/mixer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/mixer/overlay_side", - "side_active": "modern_industrialization:block/machines/mixer/overlay_side_active", - "top": "modern_industrialization:block/machines/mixer/overlay_top", - "top_active": "modern_industrialization:block/machines/mixer/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/bronze_water_pump.json b/src/generated/resources/assets/modern_industrialization/models/block/bronze_water_pump.json deleted file mode 100644 index 7ba90131e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/bronze_water_pump.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "bronze", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/water_pump/overlay_front", - "front_active": "modern_industrialization:block/machines/water_pump/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/water_pump/overlay_side", - "side_active": "modern_industrialization:block/machines/water_pump/overlay_side_active", - "top": "modern_industrialization:block/machines/water_pump/overlay_top", - "top_active": "modern_industrialization:block/machines/water_pump/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/centrifuge.json b/src/generated/resources/assets/modern_industrialization/models/block/centrifuge.json deleted file mode 100644 index 26fca61a2..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/centrifuge.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/centrifuge/overlay_front", - "front_active": "modern_industrialization:block/machines/centrifuge/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/centrifuge/overlay_side", - "side_active": "modern_industrialization:block/machines/centrifuge/overlay_side_active", - "top": "modern_industrialization:block/machines/centrifuge/overlay_top", - "top_active": "modern_industrialization:block/machines/centrifuge/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/chemical_reactor.json b/src/generated/resources/assets/modern_industrialization/models/block/chemical_reactor.json deleted file mode 100644 index dca39461c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/chemical_reactor.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/chemical_reactor/overlay_front", - "front_active": "modern_industrialization:block/machines/chemical_reactor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/coke_oven.json b/src/generated/resources/assets/modern_industrialization/models/block/coke_oven.json deleted file mode 100644 index af359f84d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/coke_oven.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bricks", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/coke_oven/overlay_front", - "front_active": "modern_industrialization:block/machines/coke_oven/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/configurable_chest.json b/src/generated/resources/assets/modern_industrialization/models/block/configurable_chest.json deleted file mode 100644 index e2902a0f2..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/configurable_chest.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "steel_crate", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/configurable_tank.json b/src/generated/resources/assets/modern_industrialization/models/block/configurable_tank.json deleted file mode 100644 index 72e29bf0d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/configurable_tank.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "configurable_tank", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/distillation_tower.json b/src/generated/resources/assets/modern_industrialization/models/block/distillation_tower.json deleted file mode 100644 index d03f3594a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/distillation_tower.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "clean_stainless_steel_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/distillation_tower/overlay_front", - "front_active": "modern_industrialization:block/machines/distillation_tower/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/distillery.json b/src/generated/resources/assets/modern_industrialization/models/block/distillery.json deleted file mode 100644 index df60cf39f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/distillery.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/distillery/overlay_front", - "front_active": "modern_industrialization:block/machines/distillery/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_blast_furnace.json deleted file mode 100644 index 4b82c61aa..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_blast_furnace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "heatproof_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/electric_blast_furnace/overlay_front", - "front_active": "modern_industrialization:block/machines/electric_blast_furnace/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_compressor.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_compressor.json deleted file mode 100644 index 30f3486f4..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_compressor.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/compressor/overlay_front", - "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/compressor/overlay_side", - "side_active": "modern_industrialization:block/machines/compressor/overlay_side_active", - "top": "modern_industrialization:block/machines/compressor/overlay_top", - "top_active": "modern_industrialization:block/machines/compressor/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_cutting_machine.json deleted file mode 100644 index f5429f4e7..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_cutting_machine.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/cutting_machine/overlay_front", - "front_active": "modern_industrialization:block/machines/cutting_machine/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_furnace.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_furnace.json deleted file mode 100644 index 4f37958a6..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_furnace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/furnace/overlay_front", - "front_active": "modern_industrialization:block/machines/furnace/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_macerator.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_macerator.json deleted file mode 100644 index 638724420..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_macerator.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/macerator/overlay_front", - "front_active": "modern_industrialization:block/machines/macerator/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/macerator/overlay_top", - "top_active": "modern_industrialization:block/machines/macerator/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_mixer.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_mixer.json deleted file mode 100644 index 366952a8d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_mixer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/mixer/overlay_front", - "front_active": "modern_industrialization:block/machines/mixer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/mixer/overlay_side", - "side_active": "modern_industrialization:block/machines/mixer/overlay_side_active", - "top": "modern_industrialization:block/machines/mixer/overlay_top", - "top_active": "modern_industrialization:block/machines/mixer/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_packer.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_packer.json deleted file mode 100644 index e10ab2643..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_packer.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/packer/overlay_front", - "front_active": "modern_industrialization:block/machines/packer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_quarry.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_quarry.json deleted file mode 100644 index 5a1bbced8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_quarry.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/electric_quarry/overlay_front", - "front_active": "modern_industrialization:block/machines/electric_quarry/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_unpacker.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_unpacker.json deleted file mode 100644 index fd33fe9da..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_unpacker.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/unpacker/overlay_front", - "front_active": "modern_industrialization:block/machines/unpacker/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_water_pump.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_water_pump.json deleted file mode 100644 index 8f23a8436..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_water_pump.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/water_pump/overlay_front", - "front_active": "modern_industrialization:block/machines/water_pump/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/water_pump/overlay_side", - "side_active": "modern_industrialization:block/machines/water_pump/overlay_side_active", - "top": "modern_industrialization:block/machines/water_pump/overlay_top", - "top_active": "modern_industrialization:block/machines/water_pump/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electric_wiremill.json b/src/generated/resources/assets/modern_industrialization/models/block/electric_wiremill.json deleted file mode 100644 index 25832f519..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electric_wiremill.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/wiremill/overlay_front", - "front_active": "modern_industrialization:block/machines/wiremill/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/wiremill/overlay_top", - "top_active": "modern_industrialization:block/machines/wiremill/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/electrolyzer.json b/src/generated/resources/assets/modern_industrialization/models/block/electrolyzer.json deleted file mode 100644 index d47ab2bb3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/electrolyzer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/electrolyzer/overlay_front", - "front_active": "modern_industrialization:block/machines/electrolyzer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/electrolyzer/overlay_side", - "side_active": "modern_industrialization:block/machines/electrolyzer/overlay_side_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/ev_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/ev_energy_input_hatch.json deleted file mode 100644 index 173a438af..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/ev_energy_input_hatch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/ev_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/ev_energy_output_hatch.json deleted file mode 100644 index 0bc00b15e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/ev_energy_output_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/ev_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/ev_hv_transformer.json deleted file mode 100644 index 8d81d18fe..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/ev_hv_transformer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "output": "modern_industrialization:block/machines/transformer/overlay_side", - "side": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine", - "no_overlay_on_output_side": true -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/ev_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/block/ev_storage_unit.json deleted file mode 100644 index 5ba089e8b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/ev_storage_unit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/electric_storage/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/ev_superconductor_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/ev_superconductor_transformer.json deleted file mode 100644 index f17e0448c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/ev_superconductor_transformer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "superconductor", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/transformer/overlay_side", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/fusion_reactor.json b/src/generated/resources/assets/modern_industrialization/models/block/fusion_reactor.json deleted file mode 100644 index 9a0dec919..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/fusion_reactor.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/fusion_reactor/overlay_front", - "front_active": "modern_industrialization:block/machines/fusion_reactor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/heat_exchanger.json b/src/generated/resources/assets/modern_industrialization/models/block/heat_exchanger.json deleted file mode 100644 index 96b336555..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/heat_exchanger.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "stainless_steel_machine_casing_pipe", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/heat_exchanger/overlay_front", - "front_active": "modern_industrialization:block/machines/heat_exchanger/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/block/high_pressure_advanced_large_steam_boiler.json deleted file mode 100644 index 974a3d2bc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/high_pressure_advanced_large_steam_boiler.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "clean_stainless_steel_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/large_boiler/overlay_front", - "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/high_pressure_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/block/high_pressure_large_steam_boiler.json deleted file mode 100644 index 974a3d2bc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/high_pressure_large_steam_boiler.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "clean_stainless_steel_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/large_boiler/overlay_front", - "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_fluid_input_hatch.json deleted file mode 100644 index 3d3c5454c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_fluid_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_fluid_output_hatch.json deleted file mode 100644 index 3d3c5454c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_fluid_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_item_input_hatch.json deleted file mode 100644 index f2a84402f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_item_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_item_output_hatch.json deleted file mode 100644 index f2a84402f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/highly_advanced_item_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_diesel_generator.json deleted file mode 100644 index dd29eba8c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_diesel_generator.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", - "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", - "output": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", - "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_energy_input_hatch.json deleted file mode 100644 index f78e747a7..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_energy_input_hatch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_energy_output_hatch.json deleted file mode 100644 index 9560466d0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_energy_output_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_ev_transformer.json deleted file mode 100644 index 5800b8d85..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_ev_transformer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "ev", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/transformer/overlay_side", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_mv_transformer.json deleted file mode 100644 index fdcfd6f04..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_mv_transformer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "output": "modern_industrialization:block/machines/transformer/overlay_side", - "side": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine", - "no_overlay_on_output_side": true -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_steam_turbine.json deleted file mode 100644 index 59aa6cc25..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_steam_turbine.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", - "output": "modern_industrialization:block/overlays/output_energy" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/hv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/block/hv_storage_unit.json deleted file mode 100644 index 102147fb3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/hv_storage_unit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/electric_storage/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/implosion_compressor.json b/src/generated/resources/assets/modern_industrialization/models/block/implosion_compressor.json deleted file mode 100644 index bfcec3517..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/implosion_compressor.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "solid_titanium_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/compressor/overlay_front", - "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/industrial_tnt.json b/src/generated/resources/assets/modern_industrialization/models/block/industrial_tnt.json new file mode 100644 index 000000000..5b85220d9 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/models/block/industrial_tnt.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:block/tnt_bottom", + "side": "modern_industrialization:block/industrial_tnt", + "top": "minecraft:block/tnt_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/large_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/block/large_diesel_generator.json deleted file mode 100644 index 01741459e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/large_diesel_generator.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "solid_titanium_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", - "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/block/large_steam_boiler.json deleted file mode 100644 index fc0b3e28c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/large_steam_boiler.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bronze_plated_bricks", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/large_boiler/overlay_front", - "front_active": "modern_industrialization:block/machines/large_boiler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/large_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/block/large_steam_turbine.json deleted file mode 100644 index ac5925321..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/large_steam_turbine.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "clean_stainless_steel_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/large_tank.json b/src/generated/resources/assets/modern_industrialization/models/block/large_tank.json deleted file mode 100644 index 96fc46ed0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/large_tank.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/large_tank/overlay_front", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/large_tank_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/large_tank_hatch.json deleted file mode 100644 index 2af4a9d5d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/large_tank_hatch.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/lv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/block/lv_diesel_generator.json deleted file mode 100644 index 7cea25b33..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/lv_diesel_generator.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", - "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", - "output": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", - "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/lv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/lv_energy_input_hatch.json deleted file mode 100644 index 3068143d7..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/lv_energy_input_hatch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/lv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/lv_energy_output_hatch.json deleted file mode 100644 index 01c3e2875..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/lv_energy_output_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/lv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/lv_mv_transformer.json deleted file mode 100644 index a55de5f69..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/lv_mv_transformer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/transformer/overlay_side", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/lv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/block/lv_steam_turbine.json deleted file mode 100644 index f2aa842d5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/lv_steam_turbine.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", - "output": "modern_industrialization:block/overlays/output_energy" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/lv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/block/lv_storage_unit.json deleted file mode 100644 index 64d8e234b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/lv_storage_unit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/electric_storage/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_diesel_generator.json deleted file mode 100644 index 3933dc358..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_diesel_generator.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", - "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", - "output": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", - "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_energy_input_hatch.json deleted file mode 100644 index d73cf078b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_energy_input_hatch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_energy_output_hatch.json deleted file mode 100644 index 87d4cca06..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_energy_output_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_hv_transformer.json deleted file mode 100644 index ada7de7b3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_hv_transformer.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/transformer/overlay_side", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_lv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_lv_transformer.json deleted file mode 100644 index a11a8703c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_lv_transformer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "output": "modern_industrialization:block/machines/transformer/overlay_side", - "side": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine", - "no_overlay_on_output_side": true -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_steam_turbine.json deleted file mode 100644 index 7cfe2749b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_steam_turbine.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", - "output": "modern_industrialization:block/overlays/output_energy" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/mv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/block/mv_storage_unit.json deleted file mode 100644 index 21d747ff3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/mv_storage_unit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "mv", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/electric_storage/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/nuclear_fluid_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/nuclear_fluid_hatch.json deleted file mode 100644 index 4d527ce6f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/nuclear_fluid_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "nuclear_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "top": "modern_industrialization:block/overlays/output_fluid" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/nuclear_item_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/nuclear_item_hatch.json deleted file mode 100644 index df0bc4b74..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/nuclear_item_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "nuclear_casing", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "top": "modern_industrialization:block/overlays/output_item" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/nuclear_reactor.json b/src/generated/resources/assets/modern_industrialization/models/block/nuclear_reactor.json deleted file mode 100644 index b2166b4db..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/nuclear_reactor.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "nuclear_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/nuclear_reactor/overlay_front", - "front_active": "modern_industrialization:block/machines/nuclear_reactor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/nuke.json b/src/generated/resources/assets/modern_industrialization/models/block/nuke.json new file mode 100644 index 000000000..9b59e85f8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/models/block/nuke.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:block/tnt_bottom", + "side": "modern_industrialization:block/nuke", + "top": "minecraft:block/tnt_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/oil_drilling_rig.json b/src/generated/resources/assets/modern_industrialization/models/block/oil_drilling_rig.json deleted file mode 100644 index 2ca16f63e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/oil_drilling_rig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/oil_drilling_rig/overlay_front", - "front_active": "modern_industrialization:block/machines/oil_drilling_rig/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/pipe.json b/src/generated/resources/assets/modern_industrialization/models/block/pipe.json deleted file mode 100644 index 7bb683b54..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "modern_industrialization:pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/plasma_turbine.json b/src/generated/resources/assets/modern_industrialization/models/block/plasma_turbine.json deleted file mode 100644 index e6039a1dc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/plasma_turbine.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "plasma_handling_iridium_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/steam_turbine/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_turbine/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/polarizer.json b/src/generated/resources/assets/modern_industrialization/models/block/polarizer.json deleted file mode 100644 index 5320692fe..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/polarizer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "lv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/polarizer/overlay_front", - "front_active": "modern_industrialization:block/machines/polarizer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/polarizer/overlay_top", - "top_active": "modern_industrialization:block/machines/polarizer/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/pressurizer.json b/src/generated/resources/assets/modern_industrialization/models/block/pressurizer.json deleted file mode 100644 index 318cfc04d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/pressurizer.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "titanium_machine_casing_pipe", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/pressurizer/overlay_front", - "front_active": "modern_industrialization:block/machines/pressurizer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/replicator.json b/src/generated/resources/assets/modern_industrialization/models/block/replicator.json deleted file mode 100644 index 1d86961ff..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/replicator.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "superconductor", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/replicator/overlay_front", - "front_active": "modern_industrialization:block/machines/replicator/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/replicator/overlay_side", - "side_active": "modern_industrialization:block/machines/replicator/overlay_side_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steam_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/models/block/steam_blast_furnace.json deleted file mode 100644 index 817538daf..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steam_blast_furnace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "firebricks", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/steam_blast_furnace/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_blast_furnace/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steam_quarry.json b/src/generated/resources/assets/modern_industrialization/models/block/steam_quarry.json deleted file mode 100644 index bdce5db94..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steam_quarry.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/steam_quarry/overlay_front", - "front_active": "modern_industrialization:block/machines/steam_quarry/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_boiler.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_boiler.json deleted file mode 100644 index 3dd5d5cb0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_boiler.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "bricked_steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/boiler/overlay_front", - "front_active": "modern_industrialization:block/machines/boiler/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_compressor.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_compressor.json deleted file mode 100644 index 414a18cff..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_compressor.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/compressor/overlay_front", - "front_active": "modern_industrialization:block/machines/compressor/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/compressor/overlay_side", - "side_active": "modern_industrialization:block/machines/compressor/overlay_side_active", - "top": "modern_industrialization:block/machines/compressor/overlay_top", - "top_active": "modern_industrialization:block/machines/compressor/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_cutting_machine.json deleted file mode 100644 index 3739aec92..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_cutting_machine.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/cutting_machine/overlay_front", - "front_active": "modern_industrialization:block/machines/cutting_machine/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_fluid_input_hatch.json deleted file mode 100644 index 333be2c1a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_fluid_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_fluid_output_hatch.json deleted file mode 100644 index 333be2c1a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_fluid_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_furnace.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_furnace.json deleted file mode 100644 index bb236e167..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_furnace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/furnace/overlay_front", - "front_active": "modern_industrialization:block/machines/furnace/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_item_input_hatch.json deleted file mode 100644 index 04a527ba4..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_item_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_item_output_hatch.json deleted file mode 100644 index 04a527ba4..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_item_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_macerator.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_macerator.json deleted file mode 100644 index 122876dbc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_macerator.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/macerator/overlay_front", - "front_active": "modern_industrialization:block/machines/macerator/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/macerator/overlay_top", - "top_active": "modern_industrialization:block/machines/macerator/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_mixer.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_mixer.json deleted file mode 100644 index befa56a34..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_mixer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/mixer/overlay_front", - "front_active": "modern_industrialization:block/machines/mixer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/mixer/overlay_side", - "side_active": "modern_industrialization:block/machines/mixer/overlay_side_active", - "top": "modern_industrialization:block/machines/mixer/overlay_top", - "top_active": "modern_industrialization:block/machines/mixer/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_packer.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_packer.json deleted file mode 100644 index 4711f615e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_packer.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/packer/overlay_front", - "front_active": "modern_industrialization:block/machines/packer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_unpacker.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_unpacker.json deleted file mode 100644 index 361de83f0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_unpacker.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/unpacker/overlay_front", - "front_active": "modern_industrialization:block/machines/unpacker/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_water_pump.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_water_pump.json deleted file mode 100644 index 6e40e1854..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_water_pump.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/water_pump/overlay_front", - "front_active": "modern_industrialization:block/machines/water_pump/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "side": "modern_industrialization:block/machines/water_pump/overlay_side", - "side_active": "modern_industrialization:block/machines/water_pump/overlay_side_active", - "top": "modern_industrialization:block/machines/water_pump/overlay_top", - "top_active": "modern_industrialization:block/machines/water_pump/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/steel_wiremill.json b/src/generated/resources/assets/modern_industrialization/models/block/steel_wiremill.json deleted file mode 100644 index 733cceea9..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/steel_wiremill.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "casing": "steel", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/wiremill/overlay_front", - "front_active": "modern_industrialization:block/machines/wiremill/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output", - "top": "modern_industrialization:block/machines/wiremill/overlay_top", - "top_active": "modern_industrialization:block/machines/wiremill/overlay_top_active" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/superconductor_energy_input_hatch.json deleted file mode 100644 index 7e2ff46c4..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_energy_input_hatch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "casing": "superconductor", - "default_overlays": { - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/superconductor_energy_output_hatch.json deleted file mode 100644 index 37a17ccc8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_energy_output_hatch.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "superconductor", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/hatch_energy/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/models/block/superconductor_ev_transformer.json deleted file mode 100644 index 1cb32e820..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_ev_transformer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "casing": "superconductor", - "default_overlays": { - "output": "modern_industrialization:block/machines/transformer/overlay_side", - "side": "modern_industrialization:block/overlays/output_energy", - "top": "modern_industrialization:block/machines/transformer/overlay_top" - }, - "loader": "modern_industrialization:machine", - "no_overlay_on_output_side": true -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/block/superconductor_storage_unit.json deleted file mode 100644 index 173c66b4d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/superconductor_storage_unit.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "casing": "superconductor", - "default_overlays": { - "output": "modern_industrialization:block/overlays/output_energy", - "side": "modern_industrialization:block/machines/electric_storage/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/turbo_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/turbo_fluid_input_hatch.json deleted file mode 100644 index 86b974560..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/turbo_fluid_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/turbo_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/turbo_fluid_output_hatch.json deleted file mode 100644 index 86b974560..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/turbo_fluid_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "output": "modern_industrialization:block/overlays/output_fluid", - "side": "modern_industrialization:block/machines/hatch_fluid/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/turbo_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/turbo_item_input_hatch.json deleted file mode 100644 index 455d32755..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/turbo_item_input_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/turbo_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/block/turbo_item_output_hatch.json deleted file mode 100644 index 455d32755..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/turbo_item_output_hatch.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "casing": "hv", - "default_overlays": { - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output_item", - "side": "modern_industrialization:block/machines/hatch_item/overlay_side" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/block/vacuum_freezer.json b/src/generated/resources/assets/modern_industrialization/models/block/vacuum_freezer.json deleted file mode 100644 index b62e4675d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/vacuum_freezer.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "casing": "frostproof_machine_casing", - "default_overlays": { - "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", - "front": "modern_industrialization:block/machines/vacuum_freezer/overlay_front", - "front_active": "modern_industrialization:block/machines/vacuum_freezer/overlay_front_active", - "item_auto": "modern_industrialization:block/overlays/item_auto", - "output": "modern_industrialization:block/overlays/output" - }, - "loader": "modern_industrialization:machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_fluid_input_hatch.json deleted file mode 100644 index 4e3efd638..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_fluid_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_fluid_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_fluid_output_hatch.json deleted file mode 100644 index 421ded3f7..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_fluid_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_fluid_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_item_input_hatch.json deleted file mode 100644 index 4886879b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_item_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_item_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_item_output_hatch.json deleted file mode 100644 index 9ff24e968..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_item_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_item_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_large_steam_boiler.json deleted file mode 100644 index 9d712e04c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_large_steam_boiler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_large_steam_boiler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_machine_casing.json deleted file mode 100644 index 7bdd66c5b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/advanced_machine_hull.json b/src/generated/resources/assets/modern_industrialization/models/item/advanced_machine_hull.json deleted file mode 100644 index d6b6187c3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/advanced_machine_hull.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/advanced_machine_hull" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/aluminum_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_block.json b/src/generated/resources/assets/modern_industrialization/models/item/aluminum_block.json deleted file mode 100644 index d1028d576..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/aluminum_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/aluminum_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/aluminum_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/aluminum_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/annealed_copper_block.json b/src/generated/resources/assets/modern_industrialization/models/item/annealed_copper_block.json deleted file mode 100644 index 40b814fe8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/annealed_copper_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/annealed_copper_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/annealed_copper_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/annealed_copper_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/annealed_copper_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/antimony_block.json b/src/generated/resources/assets/modern_industrialization/models/item/antimony_block.json deleted file mode 100644 index 9e230acb1..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/antimony_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/antimony_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/antimony_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/antimony_ore.json deleted file mode 100644 index 156cc8663..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/antimony_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/antimony_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/assembler.json b/src/generated/resources/assets/modern_industrialization/models/item/assembler.json deleted file mode 100644 index ca40c580b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/assembler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/assembler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/basic_machine_hull.json b/src/generated/resources/assets/modern_industrialization/models/item/basic_machine_hull.json deleted file mode 100644 index 7e7c12086..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/basic_machine_hull.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/basic_machine_hull" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/battery_alloy_block.json b/src/generated/resources/assets/modern_industrialization/models/item/battery_alloy_block.json deleted file mode 100644 index 9d5c229fc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/battery_alloy_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/battery_alloy_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bauxite_block.json b/src/generated/resources/assets/modern_industrialization/models/item/bauxite_block.json deleted file mode 100644 index da7c95b1d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bauxite_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bauxite_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bauxite_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/bauxite_ore.json deleted file mode 100644 index c7b61ca9a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bauxite_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bauxite_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/beryllium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/beryllium_block.json deleted file mode 100644 index 6ff5e2103..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/beryllium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/beryllium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/black_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/black_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/black_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/black_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/black_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/black_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/black_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/black_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/black_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/blastproof_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/blastproof_casing.json deleted file mode 100644 index c07c55a36..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/blastproof_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/blastproof_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/blue_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/blue_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/blue_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/blue_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/blue_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/blue_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/blue_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/blue_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/blue_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_block.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_block.json deleted file mode 100644 index ebe3bd870..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_boiler.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_boiler.json deleted file mode 100644 index 73733f564..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_boiler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_boiler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_compressor.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_compressor.json deleted file mode 100644 index 1156568f5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_compressor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_compressor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_cutting_machine.json deleted file mode 100644 index b248e3bb8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_cutting_machine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_cutting_machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_fluid_input_hatch.json deleted file mode 100644 index 5507bdd29..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_fluid_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_fluid_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_fluid_output_hatch.json deleted file mode 100644 index 2649958d0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_fluid_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_fluid_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_furnace.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_furnace.json deleted file mode 100644 index cb9f441df..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_furnace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_furnace" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_item_input_hatch.json deleted file mode 100644 index 1babe72f6..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_item_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_item_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_item_output_hatch.json deleted file mode 100644 index 103bf3202..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_item_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_item_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_macerator.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_macerator.json deleted file mode 100644 index 12b9e8367..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_macerator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_macerator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_machine_casing.json deleted file mode 100644 index 03b418b3d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_machine_casing_pipe.json deleted file mode 100644 index 8cc5eacbf..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_machine_casing_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_machine_casing_pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_mixer.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_mixer.json deleted file mode 100644 index e9772f62c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_mixer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_mixer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_plated_bricks.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_plated_bricks.json deleted file mode 100644 index ac572d7f0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_plated_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_plated_bricks" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/bronze_water_pump.json b/src/generated/resources/assets/modern_industrialization/models/item/bronze_water_pump.json deleted file mode 100644 index d11f044fe..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/bronze_water_pump.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/bronze_water_pump" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/brown_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/brown_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/brown_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/brown_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/brown_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/brown_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/brown_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/brown_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/brown_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/centrifuge.json b/src/generated/resources/assets/modern_industrialization/models/item/centrifuge.json deleted file mode 100644 index 9f6b0fafa..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/centrifuge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/centrifuge" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/chemical_reactor.json b/src/generated/resources/assets/modern_industrialization/models/item/chemical_reactor.json deleted file mode 100644 index 2a0f602ea..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/chemical_reactor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/chemical_reactor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/chromium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/chromium_block.json deleted file mode 100644 index 5aedb8146..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/chromium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/chromium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/clean_stainless_steel_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/clean_stainless_steel_machine_casing.json deleted file mode 100644 index 9f4a8ec7d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/clean_stainless_steel_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/clean_stainless_steel_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/coke_block.json b/src/generated/resources/assets/modern_industrialization/models/item/coke_block.json deleted file mode 100644 index 70c7b0376..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/coke_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/coke_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/coke_oven.json b/src/generated/resources/assets/modern_industrialization/models/item/coke_oven.json deleted file mode 100644 index ef6fd6896..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/coke_oven.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/coke_oven" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/configurable_chest.json b/src/generated/resources/assets/modern_industrialization/models/item/configurable_chest.json deleted file mode 100644 index f4ff3f39f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/configurable_chest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/configurable_chest" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/configurable_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/configurable_tank.json deleted file mode 100644 index fda9299eb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/configurable_tank.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/configurable_tank" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/copper_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/copper_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/copper_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/creative_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/creative_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/creative_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/creative_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/item/creative_storage_unit.json deleted file mode 100644 index 71fcc724b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/creative_storage_unit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/creative_storage_unit" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/creative_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/creative_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/creative_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_block.json b/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_block.json deleted file mode 100644 index 0b3cdae41..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/cupronickel_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_coil.json b/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_coil.json deleted file mode 100644 index 8e07d1b15..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/cupronickel_coil.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/cupronickel_coil" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/cyan_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/cyan_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/cyan_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/cyan_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/cyan_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/cyan_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/cyan_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/cyan_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/cyan_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_antimony_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_antimony_ore.json deleted file mode 100644 index 9135d8092..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_antimony_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_antimony_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_bauxite_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_bauxite_ore.json deleted file mode 100644 index 96412fac1..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_bauxite_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_bauxite_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_lead_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_lead_ore.json deleted file mode 100644 index 21dfd8244..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_lead_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_lead_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_lignite_coal_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_lignite_coal_ore.json deleted file mode 100644 index ab005bdd4..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_lignite_coal_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_lignite_coal_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_monazite_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_monazite_ore.json deleted file mode 100644 index 0362b955d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_monazite_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_monazite_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_nickel_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_nickel_ore.json deleted file mode 100644 index 98ba5b32e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_nickel_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_nickel_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_salt_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_salt_ore.json deleted file mode 100644 index cd7600817..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_salt_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_salt_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_tin_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_tin_ore.json deleted file mode 100644 index 495193e54..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_tin_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_tin_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_tungsten_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_tungsten_ore.json deleted file mode 100644 index 24b383cf3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_tungsten_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_tungsten_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_uranium_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_uranium_ore.json deleted file mode 100644 index cad729636..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_uranium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_uranium_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/distillation_tower.json b/src/generated/resources/assets/modern_industrialization/models/item/distillation_tower.json deleted file mode 100644 index 3b02a2d57..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/distillation_tower.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/distillation_tower" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/distillery.json b/src/generated/resources/assets/modern_industrialization/models/item/distillery.json deleted file mode 100644 index 95664b18f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/distillery.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/distillery" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_blast_furnace.json deleted file mode 100644 index e890369ce..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_blast_furnace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_blast_furnace" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_compressor.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_compressor.json deleted file mode 100644 index d99fe7510..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_compressor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_compressor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_cutting_machine.json deleted file mode 100644 index bd3ea3029..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_cutting_machine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_cutting_machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_furnace.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_furnace.json deleted file mode 100644 index ef672a4f1..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_furnace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_furnace" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_macerator.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_macerator.json deleted file mode 100644 index d9dcb918c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_macerator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_macerator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_mixer.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_mixer.json deleted file mode 100644 index badf9e7fc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_mixer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_mixer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_packer.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_packer.json deleted file mode 100644 index 29d6f0267..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_packer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_packer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_quarry.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_quarry.json deleted file mode 100644 index 52ab3b761..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_quarry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_quarry" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_unpacker.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_unpacker.json deleted file mode 100644 index bc2d49316..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_unpacker.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_unpacker" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_water_pump.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_water_pump.json deleted file mode 100644 index 2d64eedbc..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_water_pump.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_water_pump" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electric_wiremill.json b/src/generated/resources/assets/modern_industrialization/models/item/electric_wiremill.json deleted file mode 100644 index ed9da556e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electric_wiremill.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electric_wiremill" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electrolyzer.json b/src/generated/resources/assets/modern_industrialization/models/item/electrolyzer.json deleted file mode 100644 index c812664ee..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electrolyzer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electrolyzer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electrum_block.json b/src/generated/resources/assets/modern_industrialization/models/item/electrum_block.json deleted file mode 100644 index d244d5afe..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electrum_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/electrum_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/electrum_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/electrum_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/electrum_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/ev_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/ev_energy_input_hatch.json deleted file mode 100644 index df86ba183..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/ev_energy_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/ev_energy_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/ev_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/ev_energy_output_hatch.json deleted file mode 100644 index b9c134612..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/ev_energy_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/ev_energy_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/ev_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/ev_hv_transformer.json deleted file mode 100644 index d0e900cb8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/ev_hv_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/ev_hv_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/ev_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/item/ev_storage_unit.json deleted file mode 100644 index 50a281604..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/ev_storage_unit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/ev_storage_unit" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/ev_superconductor_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/ev_superconductor_transformer.json deleted file mode 100644 index 0476ab257..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/ev_superconductor_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/ev_superconductor_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/fire_clay_bricks.json b/src/generated/resources/assets/modern_industrialization/models/item/fire_clay_bricks.json deleted file mode 100644 index 54026a9d3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/fire_clay_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/fire_clay_bricks" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/forge_hammer.json b/src/generated/resources/assets/modern_industrialization/models/item/forge_hammer.json deleted file mode 100644 index ecc4f9466..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/forge_hammer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/forge_hammer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/frostproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/frostproof_machine_casing.json deleted file mode 100644 index aee9ad162..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/frostproof_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/frostproof_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/fusion_chamber.json b/src/generated/resources/assets/modern_industrialization/models/item/fusion_chamber.json deleted file mode 100644 index 39ed4c3cb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/fusion_chamber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/fusion_chamber" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/fusion_reactor.json b/src/generated/resources/assets/modern_industrialization/models/item/fusion_reactor.json deleted file mode 100644 index c75fc0702..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/fusion_reactor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/fusion_reactor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/gray_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/gray_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/gray_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/gray_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/gray_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/gray_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/gray_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/gray_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/gray_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/green_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/green_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/green_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/green_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/green_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/green_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/green_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/green_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/green_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/he_mox_block.json b/src/generated/resources/assets/modern_industrialization/models/item/he_mox_block.json deleted file mode 100644 index 73460674b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/he_mox_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/he_mox_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/he_uranium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/he_uranium_block.json deleted file mode 100644 index 4a6a928ce..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/he_uranium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/he_uranium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/heat_exchanger.json b/src/generated/resources/assets/modern_industrialization/models/item/heat_exchanger.json deleted file mode 100644 index 5143d02c9..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/heat_exchanger.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/heat_exchanger" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/heatproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/heatproof_machine_casing.json deleted file mode 100644 index 536919448..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/heatproof_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/heatproof_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/item/high_pressure_advanced_large_steam_boiler.json deleted file mode 100644 index d2e46e967..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/high_pressure_advanced_large_steam_boiler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/high_pressure_advanced_large_steam_boiler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/high_pressure_large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/item/high_pressure_large_steam_boiler.json deleted file mode 100644 index 3edc0f00b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/high_pressure_large_steam_boiler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/high_pressure_large_steam_boiler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_fluid_input_hatch.json deleted file mode 100644 index 5ee6563eb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_fluid_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/highly_advanced_fluid_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_fluid_output_hatch.json deleted file mode 100644 index ea6bfa78e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_fluid_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/highly_advanced_fluid_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_item_input_hatch.json deleted file mode 100644 index d41da277a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_item_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/highly_advanced_item_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_item_output_hatch.json deleted file mode 100644 index 103a2de63..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_item_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/highly_advanced_item_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_machine_casing.json deleted file mode 100644 index 2066c9425..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/highly_advanced_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_machine_hull.json b/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_machine_hull.json deleted file mode 100644 index 802aa564f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/highly_advanced_machine_hull.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/highly_advanced_machine_hull" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_diesel_generator.json deleted file mode 100644 index 720ebe0d9..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_diesel_generator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_diesel_generator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_energy_input_hatch.json deleted file mode 100644 index 6423a255e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_energy_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_energy_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_energy_output_hatch.json deleted file mode 100644 index c150b282c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_energy_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_energy_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_ev_transformer.json deleted file mode 100644 index 4c90d20b5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_ev_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_ev_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_mv_transformer.json deleted file mode 100644 index a50f86d1a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_mv_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_mv_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_steam_turbine.json deleted file mode 100644 index 3bc2e1bda..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_steam_turbine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_steam_turbine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/hv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/item/hv_storage_unit.json deleted file mode 100644 index 894254747..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/hv_storage_unit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/hv_storage_unit" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/implosion_compressor.json b/src/generated/resources/assets/modern_industrialization/models/item/implosion_compressor.json deleted file mode 100644 index 8b283f8e2..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/implosion_compressor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/implosion_compressor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/industrial_tnt.json b/src/generated/resources/assets/modern_industrialization/models/item/industrial_tnt.json deleted file mode 100644 index 4216c33e0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/industrial_tnt.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/industrial_tnt" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/invar_block.json b/src/generated/resources/assets/modern_industrialization/models/item/invar_block.json deleted file mode 100644 index 19094ba24..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/invar_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/invar_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/iridium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/iridium_block.json deleted file mode 100644 index 6877d7450..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/iridium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/iridium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/iridium_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/iridium_machine_casing_pipe.json deleted file mode 100644 index 60eb1f76b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/iridium_machine_casing_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/iridium_machine_casing_pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/iridium_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/iridium_ore.json deleted file mode 100644 index 417311c07..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/iridium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/iridium_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/iron_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/iron_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/iron_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/iron_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/iron_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/iron_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/kanthal_block.json b/src/generated/resources/assets/modern_industrialization/models/item/kanthal_block.json deleted file mode 100644 index 2351e1bd7..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/kanthal_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/kanthal_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/kanthal_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/kanthal_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/kanthal_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/kanthal_coil.json b/src/generated/resources/assets/modern_industrialization/models/item/kanthal_coil.json deleted file mode 100644 index ecff8bc02..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/kanthal_coil.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/kanthal_coil" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/large_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/item/large_diesel_generator.json deleted file mode 100644 index b8e34a419..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/large_diesel_generator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/large_diesel_generator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/large_steam_boiler.json b/src/generated/resources/assets/modern_industrialization/models/item/large_steam_boiler.json deleted file mode 100644 index a965468fd..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/large_steam_boiler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/large_steam_boiler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/large_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/item/large_steam_turbine.json deleted file mode 100644 index aa04a7c9f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/large_steam_turbine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/large_steam_turbine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/large_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/large_tank.json deleted file mode 100644 index ed055adaa..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/large_tank.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/large_tank" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/large_tank_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/large_tank_hatch.json deleted file mode 100644 index 1fd23c48c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/large_tank_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/large_tank_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/le_mox_block.json b/src/generated/resources/assets/modern_industrialization/models/item/le_mox_block.json deleted file mode 100644 index 3d591279b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/le_mox_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/le_mox_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/le_uranium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/le_uranium_block.json deleted file mode 100644 index dd880ac02..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/le_uranium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/le_uranium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lead_block.json b/src/generated/resources/assets/modern_industrialization/models/item/lead_block.json deleted file mode 100644 index 2d933e885..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lead_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lead_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lead_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/lead_ore.json deleted file mode 100644 index a88d08a09..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lead_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lead_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/light_blue_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/light_blue_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/light_blue_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/light_blue_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/light_blue_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/light_blue_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/light_blue_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/light_blue_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/light_blue_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/light_gray_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/light_gray_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/light_gray_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/light_gray_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/light_gray_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/light_gray_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/light_gray_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/light_gray_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/light_gray_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lignite_coal_block.json b/src/generated/resources/assets/modern_industrialization/models/item/lignite_coal_block.json deleted file mode 100644 index bfa57a459..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lignite_coal_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lignite_coal_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lignite_coal_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/lignite_coal_ore.json deleted file mode 100644 index faf360340..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lignite_coal_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lignite_coal_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lime_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/lime_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lime_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lime_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/lime_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lime_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lime_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/lime_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lime_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/item/lv_diesel_generator.json deleted file mode 100644 index 37b311482..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lv_diesel_generator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lv_diesel_generator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/lv_energy_input_hatch.json deleted file mode 100644 index 9e31e293e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lv_energy_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lv_energy_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/lv_energy_output_hatch.json deleted file mode 100644 index d28a8b7da..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lv_energy_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lv_energy_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lv_mv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/lv_mv_transformer.json deleted file mode 100644 index d6cb46052..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lv_mv_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lv_mv_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/item/lv_steam_turbine.json deleted file mode 100644 index 861338d20..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lv_steam_turbine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lv_steam_turbine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/lv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/item/lv_storage_unit.json deleted file mode 100644 index bf5e2f8a1..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/lv_storage_unit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/lv_storage_unit" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/magenta_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/magenta_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/magenta_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/magenta_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/magenta_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/magenta_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/magenta_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/magenta_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/magenta_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/monazite_block.json b/src/generated/resources/assets/modern_industrialization/models/item/monazite_block.json deleted file mode 100644 index 4984979cd..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/monazite_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/monazite_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/monazite_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/monazite_ore.json deleted file mode 100644 index 070ce3c14..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/monazite_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/monazite_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_diesel_generator.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_diesel_generator.json deleted file mode 100644 index 9039e03d3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_diesel_generator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_diesel_generator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_energy_input_hatch.json deleted file mode 100644 index 0f71dd2d9..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_energy_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_energy_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_energy_output_hatch.json deleted file mode 100644 index 5e16fe6b4..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_energy_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_energy_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_hv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_hv_transformer.json deleted file mode 100644 index 89a7c5fed..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_hv_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_hv_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_lv_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_lv_transformer.json deleted file mode 100644 index ce19acece..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_lv_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_lv_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_steam_turbine.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_steam_turbine.json deleted file mode 100644 index 2835c80d0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_steam_turbine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_steam_turbine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/mv_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/item/mv_storage_unit.json deleted file mode 100644 index 86f80d79a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/mv_storage_unit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/mv_storage_unit" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/neodymium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/neodymium_block.json deleted file mode 100644 index 4c45e5336..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/neodymium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/neodymium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nickel_block.json b/src/generated/resources/assets/modern_industrialization/models/item/nickel_block.json deleted file mode 100644 index d9a9e3c7d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nickel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nickel_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nickel_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/nickel_ore.json deleted file mode 100644 index 04fde8a4a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nickel_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nickel_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_alloy_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/nuclear_alloy_machine_casing_pipe.json deleted file mode 100644 index 4e1d23a79..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_alloy_machine_casing_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nuclear_alloy_machine_casing_pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/nuclear_casing.json deleted file mode 100644 index ae43dbe6d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nuclear_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_fluid_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/nuclear_fluid_hatch.json deleted file mode 100644 index 6e22686f8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_fluid_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nuclear_fluid_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_item_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/nuclear_item_hatch.json deleted file mode 100644 index df0a050e9..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_item_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nuclear_item_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_reactor.json b/src/generated/resources/assets/modern_industrialization/models/item/nuclear_reactor.json deleted file mode 100644 index bc953a2bd..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nuclear_reactor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nuclear_reactor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/nuke.json b/src/generated/resources/assets/modern_industrialization/models/item/nuke.json deleted file mode 100644 index 70404f9d7..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/nuke.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/nuke" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/oil_drilling_rig.json b/src/generated/resources/assets/modern_industrialization/models/item/oil_drilling_rig.json deleted file mode 100644 index 6c03473a3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/oil_drilling_rig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/oil_drilling_rig" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/orange_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/orange_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/orange_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/orange_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/orange_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/orange_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/orange_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/orange_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/orange_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/pink_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/pink_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/pink_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/pink_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/pink_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/pink_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/pink_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/pink_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/pink_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/plasma_handling_iridium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/plasma_handling_iridium_machine_casing.json deleted file mode 100644 index fdeb62332..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/plasma_handling_iridium_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/plasma_handling_iridium_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/plasma_turbine.json b/src/generated/resources/assets/modern_industrialization/models/item/plasma_turbine.json deleted file mode 100644 index 0c29b991b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/plasma_turbine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/plasma_turbine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/platinum_block.json b/src/generated/resources/assets/modern_industrialization/models/item/platinum_block.json deleted file mode 100644 index a7a45cbef..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/platinum_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/platinum_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/platinum_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/platinum_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/platinum_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/platinum_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/platinum_ore.json deleted file mode 100644 index 92c5d6fb3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/platinum_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/platinum_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/plutonium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/plutonium_block.json deleted file mode 100644 index 0c0c88dd8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/plutonium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/plutonium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/polarizer.json b/src/generated/resources/assets/modern_industrialization/models/item/polarizer.json deleted file mode 100644 index 48c372c6d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/polarizer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/polarizer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/pressurizer.json b/src/generated/resources/assets/modern_industrialization/models/item/pressurizer.json deleted file mode 100644 index 7b80fef76..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/pressurizer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/pressurizer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/purple_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/purple_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/purple_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/purple_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/purple_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/purple_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/purple_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/purple_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/purple_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/quantum_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/quantum_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/quantum_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/quantum_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/quantum_machine_casing.json deleted file mode 100644 index 6d3204601..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/quantum_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/quantum_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/quantum_machine_hull.json b/src/generated/resources/assets/modern_industrialization/models/item/quantum_machine_hull.json deleted file mode 100644 index eced360ab..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/quantum_machine_hull.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/quantum_machine_hull" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/quantum_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/quantum_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/quantum_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/quartz_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/quartz_ore.json deleted file mode 100644 index 880f07a44..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/quartz_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/quartz_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_antimony_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_antimony_block.json deleted file mode 100644 index 1717d889e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_antimony_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_antimony_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_iridium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_iridium_block.json deleted file mode 100644 index c5b7033de..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_iridium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_iridium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_lead_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_lead_block.json deleted file mode 100644 index 5011cb552..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_lead_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_lead_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_nickel_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_nickel_block.json deleted file mode 100644 index 7bd0f4863..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_nickel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_nickel_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_platinum_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_platinum_block.json deleted file mode 100644 index 09f5e8e33..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_platinum_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_platinum_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_silver_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_silver_block.json deleted file mode 100644 index 1f78a6da3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_silver_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_silver_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_tin_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_tin_block.json deleted file mode 100644 index 7259a4c32..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_tin_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_tin_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_titanium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_titanium_block.json deleted file mode 100644 index 4eccb2e3b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_titanium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_titanium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_tungsten_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_tungsten_block.json deleted file mode 100644 index 5c3a1154d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_tungsten_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_tungsten_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/raw_uranium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/raw_uranium_block.json deleted file mode 100644 index dabbed1c3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/raw_uranium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/raw_uranium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/red_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/red_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/red_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/red_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/red_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/red_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/red_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/red_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/red_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/redstone_control_module_high.json b/src/generated/resources/assets/modern_industrialization/models/item/redstone_control_module_high.json new file mode 100644 index 000000000..72f71745f --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/models/item/redstone_control_module_high.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modern_industrialization:item/redstone_control_module_high" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/redstone_control_module_low.json b/src/generated/resources/assets/modern_industrialization/models/item/redstone_control_module_low.json new file mode 100644 index 000000000..d562cfd3e --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/models/item/redstone_control_module_low.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modern_industrialization:item/redstone_control_module_low" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/replicator.json b/src/generated/resources/assets/modern_industrialization/models/item/replicator.json deleted file mode 100644 index 1302b0f8b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/replicator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/replicator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/salt_block.json b/src/generated/resources/assets/modern_industrialization/models/item/salt_block.json deleted file mode 100644 index 749d0ada9..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/salt_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/salt_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/salt_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/salt_ore.json deleted file mode 100644 index 42ee3dfcf..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/salt_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/salt_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/silicon_block.json b/src/generated/resources/assets/modern_industrialization/models/item/silicon_block.json deleted file mode 100644 index 79f0f1c2e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/silicon_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/silicon_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/silver_block.json b/src/generated/resources/assets/modern_industrialization/models/item/silver_block.json deleted file mode 100644 index 18994ea65..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/silver_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/silver_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/silver_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/silver_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/silver_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/sodium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/sodium_block.json deleted file mode 100644 index ad7557474..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/sodium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/sodium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/soldering_alloy_block.json b/src/generated/resources/assets/modern_industrialization/models/item/soldering_alloy_block.json deleted file mode 100644 index 0ecf73324..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/soldering_alloy_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/soldering_alloy_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/solid_titanium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/solid_titanium_machine_casing.json deleted file mode 100644 index ef4dd0610..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/solid_titanium_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/solid_titanium_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_block.json b/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_block.json deleted file mode 100644 index 80439b9e8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/stainless_steel_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_machine_casing_pipe.json deleted file mode 100644 index 2eaec9542..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_machine_casing_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/stainless_steel_machine_casing_pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/stainless_steel_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steam_blast_furnace.json b/src/generated/resources/assets/modern_industrialization/models/item/steam_blast_furnace.json deleted file mode 100644 index dd1c130c3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steam_blast_furnace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steam_blast_furnace" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steam_quarry.json b/src/generated/resources/assets/modern_industrialization/models/item/steam_quarry.json deleted file mode 100644 index bfe83ae75..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steam_quarry.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steam_quarry" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_block.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_block.json deleted file mode 100644 index a2491bf74..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_boiler.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_boiler.json deleted file mode 100644 index daaaeab3f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_boiler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_boiler" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_compressor.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_compressor.json deleted file mode 100644 index 5afe367fb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_compressor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_compressor" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_cutting_machine.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_cutting_machine.json deleted file mode 100644 index 457ae4a3e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_cutting_machine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_cutting_machine" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_fluid_input_hatch.json deleted file mode 100644 index 6e8ec30ed..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_fluid_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_fluid_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_fluid_output_hatch.json deleted file mode 100644 index 09c1a9c78..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_fluid_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_fluid_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_furnace.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_furnace.json deleted file mode 100644 index 89aa1cd23..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_furnace.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_furnace" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_item_input_hatch.json deleted file mode 100644 index 396d7fc93..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_item_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_item_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_item_output_hatch.json deleted file mode 100644 index 543239825..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_item_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_item_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_macerator.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_macerator.json deleted file mode 100644 index 3aeec114b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_macerator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_macerator" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_machine_casing.json deleted file mode 100644 index fd6acc013..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_machine_casing_pipe.json deleted file mode 100644 index b8bc60b71..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_machine_casing_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_machine_casing_pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_mixer.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_mixer.json deleted file mode 100644 index 45e7fd7d8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_mixer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_mixer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_packer.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_packer.json deleted file mode 100644 index fddc6689f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_packer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_packer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_unpacker.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_unpacker.json deleted file mode 100644 index 037febc4b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_unpacker.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_unpacker" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_water_pump.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_water_pump.json deleted file mode 100644 index 2400dfe31..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_water_pump.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_water_pump" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/steel_wiremill.json b/src/generated/resources/assets/modern_industrialization/models/item/steel_wiremill.json deleted file mode 100644 index 4384e8e1d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/steel_wiremill.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/steel_wiremill" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/sulfur_block.json b/src/generated/resources/assets/modern_industrialization/models/item/sulfur_block.json deleted file mode 100644 index e4336689f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/sulfur_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/sulfur_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/superconductor_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_coil.json b/src/generated/resources/assets/modern_industrialization/models/item/superconductor_coil.json deleted file mode 100644 index 2ca3ccee1..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_coil.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/superconductor_coil" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_energy_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/superconductor_energy_input_hatch.json deleted file mode 100644 index 54c4102eb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_energy_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/superconductor_energy_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_energy_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/superconductor_energy_output_hatch.json deleted file mode 100644 index f0c792c3b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_energy_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/superconductor_energy_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_ev_transformer.json b/src/generated/resources/assets/modern_industrialization/models/item/superconductor_ev_transformer.json deleted file mode 100644 index 2cce7dcfb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_ev_transformer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/superconductor_ev_transformer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_storage_unit.json b/src/generated/resources/assets/modern_industrialization/models/item/superconductor_storage_unit.json deleted file mode 100644 index 655a888be..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/superconductor_storage_unit.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/superconductor_storage_unit" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/tin_block.json b/src/generated/resources/assets/modern_industrialization/models/item/tin_block.json deleted file mode 100644 index a27f9ed7b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/tin_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/tin_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/tin_cable.json b/src/generated/resources/assets/modern_industrialization/models/item/tin_cable.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/tin_cable.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/tin_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/tin_ore.json deleted file mode 100644 index 6dee88959..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/tin_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/tin_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/titanium_barrel.json b/src/generated/resources/assets/modern_industrialization/models/item/titanium_barrel.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/titanium_barrel.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/titanium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/titanium_block.json deleted file mode 100644 index 6add1abe6..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/titanium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/titanium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/titanium_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/titanium_machine_casing_pipe.json deleted file mode 100644 index 153cb5dcd..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/titanium_machine_casing_pipe.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/titanium_machine_casing_pipe" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/titanium_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/titanium_ore.json deleted file mode 100644 index 7ddd93df3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/titanium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/titanium_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/titanium_tank.json b/src/generated/resources/assets/modern_industrialization/models/item/titanium_tank.json deleted file mode 100644 index ac12aa4b8..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/titanium_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "parent": "minecraft:builtin/entity", - "display": { - "firstperson_lefthand": { - "rotation": [ - 0, - 225, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "firstperson_righthand": { - "rotation": [ - 0, - 45, - 0 - ], - "scale": [ - 0.4, - 0.4, - 0.4 - ] - }, - "fixed": { - "scale": [ - 0.5, - 0.5, - 0.5 - ] - }, - "ground": { - "scale": [ - 0.25, - 0.25, - 0.25 - ], - "translation": [ - 0, - 3, - 0 - ] - }, - "gui": { - "rotation": [ - 30, - 225, - 0 - ], - "scale": [ - 0.625, - 0.625, - 0.625 - ] - }, - "thirdperson_righthand": { - "rotation": [ - 75, - 45, - 0 - ], - "scale": [ - 0.375, - 0.375, - 0.375 - ], - "translation": [ - 0, - 2.5, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/trash_can.json b/src/generated/resources/assets/modern_industrialization/models/item/trash_can.json deleted file mode 100644 index a7c9dbeec..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/trash_can.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/trash_can" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/tungsten_block.json b/src/generated/resources/assets/modern_industrialization/models/item/tungsten_block.json deleted file mode 100644 index 113315345..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/tungsten_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/tungsten_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/tungsten_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/tungsten_ore.json deleted file mode 100644 index db9c9448d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/tungsten_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/tungsten_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/turbo_fluid_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/turbo_fluid_input_hatch.json deleted file mode 100644 index 613f2c469..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/turbo_fluid_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/turbo_fluid_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/turbo_fluid_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/turbo_fluid_output_hatch.json deleted file mode 100644 index 392ac0c2f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/turbo_fluid_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/turbo_fluid_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/turbo_item_input_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/turbo_item_input_hatch.json deleted file mode 100644 index 410bcf03f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/turbo_item_input_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/turbo_item_input_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/turbo_item_output_hatch.json b/src/generated/resources/assets/modern_industrialization/models/item/turbo_item_output_hatch.json deleted file mode 100644 index a47ee688a..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/turbo_item_output_hatch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/turbo_item_output_hatch" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/turbo_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/item/turbo_machine_casing.json deleted file mode 100644 index 89c6916d0..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/turbo_machine_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/turbo_machine_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/turbo_machine_hull.json b/src/generated/resources/assets/modern_industrialization/models/item/turbo_machine_hull.json deleted file mode 100644 index 9d27c1402..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/turbo_machine_hull.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/turbo_machine_hull" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/uranium_235_block.json b/src/generated/resources/assets/modern_industrialization/models/item/uranium_235_block.json deleted file mode 100644 index d5e95cf19..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/uranium_235_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/uranium_235_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/uranium_238_block.json b/src/generated/resources/assets/modern_industrialization/models/item/uranium_238_block.json deleted file mode 100644 index e4b0d6af6..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/uranium_238_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/uranium_238_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/uranium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/uranium_block.json deleted file mode 100644 index ffcd9dad5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/uranium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/uranium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/uranium_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/uranium_ore.json deleted file mode 100644 index 5781251cf..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/uranium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/uranium_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/vacuum_freezer.json b/src/generated/resources/assets/modern_industrialization/models/item/vacuum_freezer.json deleted file mode 100644 index d3c958296..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/vacuum_freezer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/vacuum_freezer" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/white_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/white_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/white_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/white_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/white_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/white_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/white_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/white_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/white_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/yellow_fluid_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/yellow_fluid_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/yellow_fluid_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/yellow_item_pipe.json b/src/generated/resources/assets/modern_industrialization/models/item/yellow_item_pipe.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/yellow_item_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/yellow_me_wire.json b/src/generated/resources/assets/modern_industrialization/models/item/yellow_me_wire.json deleted file mode 100644 index 77d9689e5..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/yellow_me_wire.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "delegate": "modern_industrialization:block/pipe", - "loader": "modern_industrialization:delegate" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/yttrium_block.json b/src/generated/resources/assets/modern_industrialization/models/item/yttrium_block.json deleted file mode 100644 index 5cd01f7ea..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/yttrium_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/yttrium_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/bricks.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/bricks.json deleted file mode 100644 index 176265489..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/bricks.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "minecraft:bricks", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze.json deleted file mode 100644 index 70eb14f80..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:bronze_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze_plated_bricks.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze_plated_bricks.json deleted file mode 100644 index 22c45513d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/bronze_plated_bricks.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:bronze_plated_bricks", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/clean_stainless_steel_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/clean_stainless_steel_machine_casing.json deleted file mode 100644 index ad8381cab..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/clean_stainless_steel_machine_casing.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:clean_stainless_steel_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/ev.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/ev.json deleted file mode 100644 index 41e01901c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/ev.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:highly_advanced_machine_hull", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/firebricks.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/firebricks.json deleted file mode 100644 index 56b0e77f1..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/firebricks.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:fire_clay_bricks", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/frostproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/frostproof_machine_casing.json deleted file mode 100644 index 72ed73d4e..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/frostproof_machine_casing.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:frostproof_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/heatproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/heatproof_machine_casing.json deleted file mode 100644 index 57a8e0b6d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/heatproof_machine_casing.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:heatproof_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/hv.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/hv.json deleted file mode 100644 index fed03318d..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/hv.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:turbo_machine_hull", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/lv.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/lv.json deleted file mode 100644 index 223b21413..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/lv.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:basic_machine_hull", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/mv.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/mv.json deleted file mode 100644 index d01eed591..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/mv.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:advanced_machine_hull", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/nuclear_casing.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/nuclear_casing.json deleted file mode 100644 index 3c627143f..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/nuclear_casing.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:nuclear_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/plasma_handling_iridium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/plasma_handling_iridium_machine_casing.json deleted file mode 100644 index 46537afe2..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/plasma_handling_iridium_machine_casing.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:plasma_handling_iridium_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/solid_titanium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/solid_titanium_machine_casing.json deleted file mode 100644 index f3e91e0e3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/solid_titanium_machine_casing.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:solid_titanium_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/stainless_steel_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/stainless_steel_machine_casing_pipe.json deleted file mode 100644 index 72ec47d16..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/stainless_steel_machine_casing_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:stainless_steel_machine_casing_pipe", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/steel.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/steel.json deleted file mode 100644 index eea40c47c..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/steel.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:steel_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/superconductor.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/superconductor.json deleted file mode 100644 index 6f4f5bc1b..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/superconductor.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:quantum_machine_hull", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/titanium.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/titanium.json deleted file mode 100644 index 4d3588bf3..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/titanium.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:highly_advanced_machine_casing", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/machine_casing/titanium_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/models/machine_casing/titanium_machine_casing_pipe.json deleted file mode 100644 index 11f71a3cb..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/machine_casing/titanium_machine_casing_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "block": "modern_industrialization:titanium_machine_casing_pipe", - "loader": "modern_industrialization:use_block_model" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricked_bronze.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricked_bronze.json new file mode 100644 index 000000000..5f2aa4977 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricked_bronze.json @@ -0,0 +1,3 @@ +{ + "model": "modern_industrialization:machine_casing/bricked_bronze" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricked_steel.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricked_steel.json new file mode 100644 index 000000000..0bd8def23 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricked_steel.json @@ -0,0 +1,3 @@ +{ + "model": "modern_industrialization:machine_casing/bricked_steel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricks.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricks.json new file mode 100644 index 000000000..c0851623c --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bricks.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "minecraft:bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bronze.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bronze.json new file mode 100644 index 000000000..a50eead45 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bronze.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:bronze_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bronze_plated_bricks.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bronze_plated_bricks.json new file mode 100644 index 000000000..aef0ab6cf --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/bronze_plated_bricks.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:bronze_plated_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/clean_stainless_steel_machine_casing.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/clean_stainless_steel_machine_casing.json new file mode 100644 index 000000000..d12ef73e2 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/clean_stainless_steel_machine_casing.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:clean_stainless_steel_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/configurable_tank.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/configurable_tank.json new file mode 100644 index 000000000..de9ce3ca0 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/configurable_tank.json @@ -0,0 +1,3 @@ +{ + "model": "modern_industrialization:machine_casing/configurable_tank" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/ev.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/ev.json new file mode 100644 index 000000000..af94704d7 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/ev.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:highly_advanced_machine_hull" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/firebricks.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/firebricks.json new file mode 100644 index 000000000..e7132f8ba --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/firebricks.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:fire_clay_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/frostproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/frostproof_machine_casing.json new file mode 100644 index 000000000..cc2e8e486 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/frostproof_machine_casing.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:frostproof_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/heatproof_machine_casing.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/heatproof_machine_casing.json new file mode 100644 index 000000000..7541cd981 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/heatproof_machine_casing.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:heatproof_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/hv.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/hv.json new file mode 100644 index 000000000..e13da23c4 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/hv.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:turbo_machine_hull" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/lv.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/lv.json new file mode 100644 index 000000000..f959c6bc5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/lv.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:basic_machine_hull" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/mv.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/mv.json new file mode 100644 index 000000000..3c42bf3a8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/mv.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:advanced_machine_hull" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/nuclear_casing.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/nuclear_casing.json new file mode 100644 index 000000000..2f7233d71 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/nuclear_casing.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:nuclear_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/plasma_handling_iridium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/plasma_handling_iridium_machine_casing.json new file mode 100644 index 000000000..23482feee --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/plasma_handling_iridium_machine_casing.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:plasma_handling_iridium_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/solid_titanium_machine_casing.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/solid_titanium_machine_casing.json new file mode 100644 index 000000000..c4a6782b5 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/solid_titanium_machine_casing.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:solid_titanium_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/stainless_steel_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/stainless_steel_machine_casing_pipe.json new file mode 100644 index 000000000..c9ea74a89 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/stainless_steel_machine_casing_pipe.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:stainless_steel_machine_casing_pipe" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/steel.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/steel.json new file mode 100644 index 000000000..d12fc10d8 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/steel.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:steel_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/steel_crate.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/steel_crate.json new file mode 100644 index 000000000..7d86a9505 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/steel_crate.json @@ -0,0 +1,3 @@ +{ + "model": "modern_industrialization:machine_casing/steel_crate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/superconductor.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/superconductor.json new file mode 100644 index 000000000..11d5afc41 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/superconductor.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:quantum_machine_hull" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/titanium.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/titanium.json new file mode 100644 index 000000000..df7e2bc86 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/titanium.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:highly_advanced_machine_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/titanium_machine_casing_pipe.json b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/titanium_machine_casing_pipe.json new file mode 100644 index 000000000..e2cab3129 --- /dev/null +++ b/src/generated/resources/assets/modern_industrialization/modern_industrialization/machine_casings/titanium_machine_casing_pipe.json @@ -0,0 +1,4 @@ +{ + "type": "modern_industrialization:use_block_model", + "block": "modern_industrialization:titanium_machine_casing_pipe" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/advanced_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/advanced_machine_casing.png index 2698134e4..ce3db5655 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/advanced_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/advanced_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/blastproof_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/blastproof_casing.png index 77f1b9b85..6b7e368d2 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/blastproof_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/blastproof_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing.png index 5503ce3ec..196884fac 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing_pipe.png b/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing_pipe.png index 9144d555e..830d1ec9e 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing_pipe.png and b/src/generated/resources/assets/modern_industrialization/textures/block/bronze_machine_casing_pipe.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/bronze_plated_bricks.png b/src/generated/resources/assets/modern_industrialization/textures/block/bronze_plated_bricks.png index 35620f111..8077b937f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/bronze_plated_bricks.png and b/src/generated/resources/assets/modern_industrialization/textures/block/bronze_plated_bricks.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/casings/bricked_bronze.png b/src/generated/resources/assets/modern_industrialization/textures/block/casings/bricked_bronze.png index e13ba44b7..720c96df5 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/casings/bricked_bronze.png and b/src/generated/resources/assets/modern_industrialization/textures/block/casings/bricked_bronze.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/clean_stainless_steel_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/clean_stainless_steel_machine_casing.png index cfa0889de..2814c84b4 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/clean_stainless_steel_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/clean_stainless_steel_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/cupronickel_coil_top.png b/src/generated/resources/assets/modern_industrialization/textures/block/cupronickel_coil_top.png index fce748be1..35cb05916 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/cupronickel_coil_top.png and b/src/generated/resources/assets/modern_industrialization/textures/block/cupronickel_coil_top.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_lignite_coal_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_lignite_coal_ore.png index 9518bd76a..f8e79f756 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_lignite_coal_ore.png and b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_lignite_coal_ore.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_monazite_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_monazite_ore.png index 25345ed3a..16785e70c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_monazite_ore.png and b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_monazite_ore.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_salt_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_salt_ore.png index e16243e7e..2b7012c32 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_salt_ore.png and b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_salt_ore.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/frostproof_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/frostproof_machine_casing.png index 5204ecbd0..b3faa5689 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/frostproof_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/frostproof_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/heatproof_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/heatproof_machine_casing.png index 17d1c6dfc..c2de76de8 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/heatproof_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/heatproof_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/highly_advanced_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/highly_advanced_machine_casing.png index b94875de0..4194d49cb 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/highly_advanced_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/highly_advanced_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/iridium_machine_casing_pipe.png b/src/generated/resources/assets/modern_industrialization/textures/block/iridium_machine_casing_pipe.png index 96954481f..922f77acf 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/iridium_machine_casing_pipe.png and b/src/generated/resources/assets/modern_industrialization/textures/block/iridium_machine_casing_pipe.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/kanthal_coil_top.png b/src/generated/resources/assets/modern_industrialization/textures/block/kanthal_coil_top.png index 87d20171e..9ba04a327 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/kanthal_coil_top.png and b/src/generated/resources/assets/modern_industrialization/textures/block/kanthal_coil_top.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/lignite_coal_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/lignite_coal_ore.png index 7ec289a8f..de15aab9f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/lignite_coal_ore.png and b/src/generated/resources/assets/modern_industrialization/textures/block/lignite_coal_ore.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/monazite_block.png b/src/generated/resources/assets/modern_industrialization/textures/block/monazite_block.png index 87f421c1a..13928e74f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/monazite_block.png and b/src/generated/resources/assets/modern_industrialization/textures/block/monazite_block.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/monazite_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/monazite_ore.png index 9d95b3297..f8a414d33 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/monazite_ore.png and b/src/generated/resources/assets/modern_industrialization/textures/block/monazite_ore.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_alloy_machine_casing_pipe.png b/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_alloy_machine_casing_pipe.png index 10c332e6b..2220f52c7 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_alloy_machine_casing_pipe.png and b/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_alloy_machine_casing_pipe.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_casing.png index d5732e0f2..9b6d46024 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/nuclear_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/plasma_handling_iridium_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/plasma_handling_iridium_machine_casing.png index d9d2fb47e..094916949 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/plasma_handling_iridium_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/plasma_handling_iridium_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/quantum_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/quantum_machine_casing.png index 137b2100a..5d1e7a304 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/quantum_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/quantum_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/salt_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/salt_ore.png index d3eccb396..53698faf3 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/salt_ore.png and b/src/generated/resources/assets/modern_industrialization/textures/block/salt_ore.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/solid_titanium_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/solid_titanium_machine_casing.png index dff4ad191..633efb4fe 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/solid_titanium_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/solid_titanium_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/stainless_steel_machine_casing_pipe.png b/src/generated/resources/assets/modern_industrialization/textures/block/stainless_steel_machine_casing_pipe.png index 5491b5135..a140e0e45 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/stainless_steel_machine_casing_pipe.png and b/src/generated/resources/assets/modern_industrialization/textures/block/stainless_steel_machine_casing_pipe.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing.png index 6aa337f3d..15d77145c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing_pipe.png b/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing_pipe.png index 451063699..ddec72d7d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing_pipe.png and b/src/generated/resources/assets/modern_industrialization/textures/block/steel_machine_casing_pipe.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/superconductor_coil_top.png b/src/generated/resources/assets/modern_industrialization/textures/block/superconductor_coil_top.png index 898de0044..92a76e33a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/superconductor_coil_top.png and b/src/generated/resources/assets/modern_industrialization/textures/block/superconductor_coil_top.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/titanium_machine_casing_pipe.png b/src/generated/resources/assets/modern_industrialization/textures/block/titanium_machine_casing_pipe.png index 3a96dac9c..bf394b70d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/titanium_machine_casing_pipe.png and b/src/generated/resources/assets/modern_industrialization/textures/block/titanium_machine_casing_pipe.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/turbo_machine_casing.png b/src/generated/resources/assets/modern_industrialization/textures/block/turbo_machine_casing.png index 2f933908c..e5308751b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/block/turbo_machine_casing.png and b/src/generated/resources/assets/modern_industrialization/textures/block/turbo_machine_casing.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/acetylene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/acetylene_still.png index 2a8f3ed48..bb4bec6cb 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/acetylene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/acetylene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_acid_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_acid_still.png index e73430eea..7ac6af6a4 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_acid_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_acid_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_glue_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_glue_still.png index 2e93eedbc..653659446 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_glue_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/acrylic_glue_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/argon_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/argon_still.png index fe63da993..c42d2f9ec 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/argon_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/argon_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/benzene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/benzene_still.png index 55f18c126..9d3116e72 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/benzene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/benzene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/biodiesel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/biodiesel_still.png index 86c9cf509..45aed5fff 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/biodiesel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/biodiesel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/boosted_diesel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/boosted_diesel_still.png index 1ff80da07..4c415ed1a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/boosted_diesel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/boosted_diesel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/butadiene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/butadiene_still.png index 5647135fa..d2dab0a50 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/butadiene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/butadiene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/caprolactam_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/caprolactam_still.png index e0b876cd7..299819989 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/caprolactam_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/caprolactam_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/chlorine_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/chlorine_still.png index 32854988f..80390fa34 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/chlorine_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/chlorine_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png index 930933ed6..82cb52433 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/chromium_hydrochloric_solution_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/creosote_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/creosote_still.png index bd354fee2..624c20e18 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/creosote_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/creosote_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/crude_oil_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/crude_oil_still.png index 47af468ae..0b946b032 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/crude_oil_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/crude_oil_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/cryofluid_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/cryofluid_still.png index 22bdba85b..f80e24323 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/cryofluid_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/cryofluid_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/deuterium_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/deuterium_still.png index 83c51b5bb..8c955134b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/deuterium_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/deuterium_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/diesel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/diesel_still.png index de2fd7b7e..aebafefa2 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/diesel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/diesel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/diethyl_ether_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/diethyl_ether_still.png index 562ea58f2..fb77d3c45 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/diethyl_ether_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/diethyl_ether_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/ethanol_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/ethanol_still.png index c4560bc34..972d8214a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/ethanol_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/ethanol_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylbenzene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylbenzene_still.png index 75f1334c6..f786dcd86 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylbenzene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylbenzene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylene_still.png index ee40510e5..d33a1d736 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/ethylene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_fuel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_fuel_still.png index e0fced572..4c739f83f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_fuel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_fuel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png index fd28e9dc1..a3cc0a4fe 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_steam_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_still.png index 475bec1ba..12d75eef2 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/heavy_water_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_3_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_3_still.png index 1a3ae25d4..b6cae6050 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_3_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_3_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_plasma_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_plasma_still.png index 83ba0a288..1dfa62fea 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_plasma_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_plasma_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_still.png index 06cc54de1..8cd414072 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/helium_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png index e82991d84..65a08f052 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_steam_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png index b8493c9ca..2b5821c0d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_heavy_water_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_water_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_water_still.png index 3e592796e..268db3554 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_water_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/high_pressure_water_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png index 61fa911e5..32342dda0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrochloric_acid_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrogen_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrogen_still.png index a94207aa3..6acf9a0a8 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrogen_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/hydrogen_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/light_fuel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/light_fuel_still.png index 7538308c9..12ad1a536 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/light_fuel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/light_fuel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/liquid_air_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/liquid_air_still.png index f4e5fbe7f..0dfd4a0e6 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/liquid_air_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/liquid_air_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/lubricant_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/lubricant_still.png index 05a258ed6..48b3777bf 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/lubricant_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/lubricant_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png index c724490fd..d57fe51d1 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/manganese_sulfuric_solution_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/methane_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/methane_still.png index 51462fc86..cb93970cf 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/methane_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/methane_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/molten_redstone_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/molten_redstone_still.png index 47c922351..d8652f526 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/molten_redstone_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/molten_redstone_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/naphtha_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/naphtha_still.png index 52d478fc4..d5398512c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/naphtha_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/naphtha_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/nitrogen_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/nitrogen_still.png index 42d6caa1e..67efe6103 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/nitrogen_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/nitrogen_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/nylon_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/nylon_still.png index 3cfa6afbb..138b669f4 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/nylon_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/nylon_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/oxygen_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/oxygen_still.png index 6aec3a40f..057d25697 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/oxygen_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/oxygen_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/plant_oil_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/plant_oil_still.png index be1db3084..b5aa70cc9 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/plant_oil_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/plant_oil_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png index 4a0cd873d..95ecc5464 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/platinum_sulfuric_solution_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/polyethylene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/polyethylene_still.png index fc12c5b99..09a54d6eb 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/polyethylene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/polyethylene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png index 59bf23f95..6477d4c46 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/polyvinyl_chloride_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/propene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/propene_still.png index 6e4eb7817..d18ead9f7 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/propene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/propene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png index f4f7a4a23..7d9ffbf14 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/purified_platinum_sulfuric_solution_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png index 3981ba9ec..59369a321 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_biodiesel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png index 4894caa4a..cb223b9de 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/raw_synthetic_oil_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/shale_oil_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/shale_oil_still.png index ca87d6c9e..6b8e2a470 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/shale_oil_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/shale_oil_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png index dcc198fbd..6f035824a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sodium_hydroxide_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/soldering_alloy_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/soldering_alloy_still.png index 391f2d7c8..dd0c597e2 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/soldering_alloy_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/soldering_alloy_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png index f3655ff4a..bf445a3f0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_heavy_fuel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png index f96004f04..16219f6e8 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_light_fuel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png index 2e706b89d..622e6fd58 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/steam_cracked_naphtha_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png index 0dca237f0..c31e9fd3d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_rubber_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png index 498bd6557..2ef688819 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_butadiene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_still.png index 5da415657..20db03813 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/styrene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sugar_solution_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sugar_solution_still.png index 415758a0d..b50c44258 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sugar_solution_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sugar_solution_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png index 819aefe88..fb3175ff3 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_acid_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png index 4b7c6777f..fb5e0b461 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_crude_oil_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png index b48111dfa..685ab30dc 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_heavy_fuel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png index 0899d0245..87b0e996b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_light_fuel_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png index ed450a102..e3082dd15 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/sulfuric_naphtha_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/toluene_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/toluene_still.png index f85ba67bc..48f24d00e 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/toluene_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/toluene_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/tritium_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/tritium_still.png index 490acfb7f..75afd9b43 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/tritium_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/tritium_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/uu_matter_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/uu_matter_still.png index 971209a07..5bc165783 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/uu_matter_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/uu_matter_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png b/src/generated/resources/assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png index 38e43beca..079d03955 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png and b/src/generated/resources/assets/modern_industrialization/textures/fluid/vinyl_chloride_still.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/acetylene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/acetylene_bucket.png index 375390045..5642de931 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/acetylene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/acetylene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_acid_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_acid_bucket.png index 86e2dd052..5a589401a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_acid_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_acid_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_glue_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_glue_bucket.png index 72afe05ba..fb46b4cde 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_glue_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/acrylic_glue_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/argon_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/argon_bucket.png index 90d3a00fa..b1d39feda 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/argon_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/argon_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/benzene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/benzene_bucket.png index 2512a8c68..637925273 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/benzene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/benzene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/biodiesel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/biodiesel_bucket.png index 160cce8d8..7a724622f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/biodiesel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/biodiesel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/boosted_diesel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/boosted_diesel_bucket.png index 7b70e32c3..29d4731d0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/boosted_diesel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/boosted_diesel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/butadiene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/butadiene_bucket.png index 46de1b95b..bfb1e94a3 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/butadiene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/butadiene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/caprolactam_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/caprolactam_bucket.png index c7ac14baa..e65e3394d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/caprolactam_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/caprolactam_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/chlorine_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/chlorine_bucket.png index 419fce77a..daea80507 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/chlorine_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/chlorine_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/chromium_hydrochloric_solution_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/chromium_hydrochloric_solution_bucket.png index 3e171da49..44e9bf1b3 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/chromium_hydrochloric_solution_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/chromium_hydrochloric_solution_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/creosote_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/creosote_bucket.png index ae4bc7931..a9066e490 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/creosote_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/creosote_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/crude_oil_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/crude_oil_bucket.png index c49c2238a..2b164a4ad 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/crude_oil_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/crude_oil_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/cryofluid_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/cryofluid_bucket.png index a7ba1b9fb..c0c397164 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/cryofluid_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/cryofluid_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/deuterium_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/deuterium_bucket.png index ba933fa7c..4c864cdac 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/deuterium_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/deuterium_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/diesel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/diesel_bucket.png index 1dc917108..dd6929636 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/diesel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/diesel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/diethyl_ether_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/diethyl_ether_bucket.png index 24eb14378..4b3ac71ac 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/diethyl_ether_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/diethyl_ether_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/ethanol_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/ethanol_bucket.png index a20c14301..bf1083c1b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/ethanol_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/ethanol_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/ethylbenzene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/ethylbenzene_bucket.png index d03b011f9..1967fcc5e 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/ethylbenzene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/ethylbenzene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/ethylene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/ethylene_bucket.png index c71e854e4..917656e64 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/ethylene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/ethylene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/he_mox_fuel_rod_depleted.png b/src/generated/resources/assets/modern_industrialization/textures/item/he_mox_fuel_rod_depleted.png index 4d7f28076..00334e660 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/he_mox_fuel_rod_depleted.png and b/src/generated/resources/assets/modern_industrialization/textures/item/he_mox_fuel_rod_depleted.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/he_uranium_fuel_rod_depleted.png b/src/generated/resources/assets/modern_industrialization/textures/item/he_uranium_fuel_rod_depleted.png index c872453d7..139024ad9 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/he_uranium_fuel_rod_depleted.png and b/src/generated/resources/assets/modern_industrialization/textures/item/he_uranium_fuel_rod_depleted.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/heavy_fuel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/heavy_fuel_bucket.png index ecf4ee0db..d9089311a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/heavy_fuel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/heavy_fuel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_bucket.png index 42674c2c9..e9068bf6c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_steam_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_steam_bucket.png index 13a7beafa..b25be42db 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_steam_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/heavy_water_steam_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/helium_3_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/helium_3_bucket.png index 41d62c85b..76acba9df 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/helium_3_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/helium_3_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/helium_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/helium_bucket.png index efa30cf81..808951ffc 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/helium_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/helium_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/helium_plasma_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/helium_plasma_bucket.png index c1d0389fc..79c18edd4 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/helium_plasma_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/helium_plasma_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_bucket.png index d09ca2cab..7e07fb707 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_steam_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_steam_bucket.png index c5722d4f7..becd02a82 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_steam_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_heavy_water_steam_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_water_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_water_bucket.png index 7e95dd514..663f65a6d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_water_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/high_pressure_water_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/hydrochloric_acid_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/hydrochloric_acid_bucket.png index 0062715f5..e5284e216 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/hydrochloric_acid_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/hydrochloric_acid_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/hydrogen_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/hydrogen_bucket.png index cd543c0a6..c9af183ec 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/hydrogen_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/hydrogen_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/le_mox_fuel_rod_depleted.png b/src/generated/resources/assets/modern_industrialization/textures/item/le_mox_fuel_rod_depleted.png index 7dabe77ad..b9aaea3be 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/le_mox_fuel_rod_depleted.png and b/src/generated/resources/assets/modern_industrialization/textures/item/le_mox_fuel_rod_depleted.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/le_uranium_fuel_rod_depleted.png b/src/generated/resources/assets/modern_industrialization/textures/item/le_uranium_fuel_rod_depleted.png index 7b4825ca3..9930e0c1a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/le_uranium_fuel_rod_depleted.png and b/src/generated/resources/assets/modern_industrialization/textures/item/le_uranium_fuel_rod_depleted.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/light_fuel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/light_fuel_bucket.png index e1c5d03c9..ebc2f454d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/light_fuel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/light_fuel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/lignite_coal.png b/src/generated/resources/assets/modern_industrialization/textures/item/lignite_coal.png index a5fe2df0b..e3162c8e6 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/lignite_coal.png and b/src/generated/resources/assets/modern_industrialization/textures/item/lignite_coal.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/liquid_air_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/liquid_air_bucket.png index 7f8ec0dcf..1b6569e46 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/liquid_air_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/liquid_air_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/lubricant_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/lubricant_bucket.png index c1feacb03..710e634c0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/lubricant_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/lubricant_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/manganese_sulfuric_solution_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/manganese_sulfuric_solution_bucket.png index 5acb753cc..af36c0790 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/manganese_sulfuric_solution_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/manganese_sulfuric_solution_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/methane_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/methane_bucket.png index f04939d9f..723e95ed2 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/methane_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/methane_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/molten_redstone_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/molten_redstone_bucket.png index d9d21b121..931b28af8 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/molten_redstone_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/molten_redstone_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/monazite_crushed_dust.png b/src/generated/resources/assets/modern_industrialization/textures/item/monazite_crushed_dust.png index ce044a192..0b43f920f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/monazite_crushed_dust.png and b/src/generated/resources/assets/modern_industrialization/textures/item/monazite_crushed_dust.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/monazite_dust.png b/src/generated/resources/assets/modern_industrialization/textures/item/monazite_dust.png index cfe8d2405..aee206582 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/monazite_dust.png and b/src/generated/resources/assets/modern_industrialization/textures/item/monazite_dust.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/monazite_tiny_dust.png b/src/generated/resources/assets/modern_industrialization/textures/item/monazite_tiny_dust.png index 067556009..8bbb024d4 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/monazite_tiny_dust.png and b/src/generated/resources/assets/modern_industrialization/textures/item/monazite_tiny_dust.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/naphtha_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/naphtha_bucket.png index 748792726..cf79fabc2 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/naphtha_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/naphtha_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/nitrogen_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/nitrogen_bucket.png index e208dc358..d545e526f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/nitrogen_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/nitrogen_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/nylon_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/nylon_bucket.png index 09e0a373d..cb995896b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/nylon_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/nylon_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/oxygen_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/oxygen_bucket.png index 348e5bf10..95bd3e888 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/oxygen_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/oxygen_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/plant_oil_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/plant_oil_bucket.png index 16fd7eee0..3b1026b5d 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/plant_oil_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/plant_oil_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/platinum_sulfuric_solution_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/platinum_sulfuric_solution_bucket.png index faa1eabd5..73a44737e 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/platinum_sulfuric_solution_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/platinum_sulfuric_solution_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/polyethylene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/polyethylene_bucket.png index 21f7e33d8..58cdde5a7 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/polyethylene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/polyethylene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/polyvinyl_chloride_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/polyvinyl_chloride_bucket.png index 6d4925f89..0c32d865b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/polyvinyl_chloride_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/polyvinyl_chloride_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/propene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/propene_bucket.png index 8e925921c..385713869 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/propene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/propene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/purified_platinum_sulfuric_solution_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/purified_platinum_sulfuric_solution_bucket.png index 18b3f34f3..4fb04298c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/purified_platinum_sulfuric_solution_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/purified_platinum_sulfuric_solution_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/raw_biodiesel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/raw_biodiesel_bucket.png index a5ec058a1..6a0df0066 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/raw_biodiesel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/raw_biodiesel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/raw_iridium.png b/src/generated/resources/assets/modern_industrialization/textures/item/raw_iridium.png index f4e0f7ccc..813f32254 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/raw_iridium.png and b/src/generated/resources/assets/modern_industrialization/textures/item/raw_iridium.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/raw_synthetic_oil_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/raw_synthetic_oil_bucket.png index ebb9f2895..47e9b8fb0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/raw_synthetic_oil_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/raw_synthetic_oil_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/raw_uranium.png b/src/generated/resources/assets/modern_industrialization/textures/item/raw_uranium.png index 66e699592..00e69ef0c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/raw_uranium.png and b/src/generated/resources/assets/modern_industrialization/textures/item/raw_uranium.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/shale_oil_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/shale_oil_bucket.png index 7e8333b77..f26f997c0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/shale_oil_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/shale_oil_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sodium_hydroxide_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sodium_hydroxide_bucket.png index 29fc53e00..0c399cf75 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sodium_hydroxide_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sodium_hydroxide_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/soldering_alloy_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/soldering_alloy_bucket.png index 48488b845..6e4e8439b 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/soldering_alloy_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/soldering_alloy_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_heavy_fuel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_heavy_fuel_bucket.png index 73e89bf9a..d39bfb560 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_heavy_fuel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_heavy_fuel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_light_fuel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_light_fuel_bucket.png index 3905c4da9..dac6c23a1 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_light_fuel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_light_fuel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_naphtha_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_naphtha_bucket.png index 7c07b6cd8..a06bb42e9 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_naphtha_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/steam_cracked_naphtha_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/styrene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/styrene_bucket.png index cd88c31f5..ee58e44db 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/styrene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/styrene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_bucket.png index 57059bb4d..558c52cf4 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_rubber_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_rubber_bucket.png index e44359bc5..c28cb2142 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_rubber_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/styrene_butadiene_rubber_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sugar_solution_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sugar_solution_bucket.png index 9149a0145..0b6635266 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sugar_solution_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sugar_solution_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_acid_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_acid_bucket.png index 34038d282..d0e77261a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_acid_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_acid_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_crude_oil_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_crude_oil_bucket.png index 2997137ed..0979e8722 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_crude_oil_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_crude_oil_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_heavy_fuel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_heavy_fuel_bucket.png index fe707a5d5..8d019560c 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_heavy_fuel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_heavy_fuel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_light_fuel_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_light_fuel_bucket.png index 885979b10..d257702fb 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_light_fuel_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_light_fuel_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_naphtha_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_naphtha_bucket.png index 6b0590667..aa1975d05 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_naphtha_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/sulfuric_naphtha_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/toluene_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/toluene_bucket.png index ca322b1a5..b15d9571f 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/toluene_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/toluene_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/tritium_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/tritium_bucket.png index 859b132b1..aec1816f0 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/tritium_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/tritium_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/uranium_fuel_rod_depleted.png b/src/generated/resources/assets/modern_industrialization/textures/item/uranium_fuel_rod_depleted.png index 441610cc0..7a6b3c78a 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/uranium_fuel_rod_depleted.png and b/src/generated/resources/assets/modern_industrialization/textures/item/uranium_fuel_rod_depleted.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/uu_matter_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/uu_matter_bucket.png index 121a53982..6caf35072 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/uu_matter_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/uu_matter_bucket.png differ diff --git a/src/generated/resources/assets/modern_industrialization/textures/item/vinyl_chloride_bucket.png b/src/generated/resources/assets/modern_industrialization/textures/item/vinyl_chloride_bucket.png index c9fc70e5b..533c635e3 100644 Binary files a/src/generated/resources/assets/modern_industrialization/textures/item/vinyl_chloride_bucket.png and b/src/generated/resources/assets/modern_industrialization/textures/item/vinyl_chloride_bucket.png differ diff --git a/src/generated/resources/data/c/tags/item/gems/lignite_coal.json b/src/generated/resources/data/c/tags/item/lignite_coal.json similarity index 100% rename from src/generated/resources/data/c/tags/item/gems/lignite_coal.json rename to src/generated/resources/data/c/tags/item/lignite_coal.json diff --git a/src/generated/resources/data/modern_industrialization/advancement/advanced_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/advanced_upgrade.json index 1ca01c79d..6d8f0a56b 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/advanced_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/advancement/advanced_upgrade.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.advanced_upgrade.description" }, "icon": { - "count": 1, "id": "modern_industrialization:advanced_upgrade" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/analog_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/analog_circuit.json index 00e510e32..3768b639f 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/analog_circuit.json +++ b/src/generated/resources/data/modern_industrialization/advancement/analog_circuit.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:analog_circuit" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/assembler.json b/src/generated/resources/data/modern_industrialization/advancement/assembler.json index d4b11787f..e67fd4b77 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/assembler.json +++ b/src/generated/resources/data/modern_industrialization/advancement/assembler.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:assembler" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/basic_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/basic_upgrade.json index ebe900f45..14aedfb79 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/basic_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/advancement/basic_upgrade.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:basic_upgrade" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/blastproof_alloy_plate.json b/src/generated/resources/data/modern_industrialization/advancement/blastproof_alloy_plate.json index 5c336fd00..8900f5f75 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/blastproof_alloy_plate.json +++ b/src/generated/resources/data/modern_industrialization/advancement/blastproof_alloy_plate.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.blastproof_alloy_plate.description" }, "icon": { - "count": 1, "id": "modern_industrialization:blastproof_alloy_plate" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/bronze_compressor.json b/src/generated/resources/data/modern_industrialization/advancement/bronze_compressor.json index c652aa216..75750d9b7 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/bronze_compressor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/bronze_compressor.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.bronze_compressor.description" }, "icon": { - "count": 1, "id": "modern_industrialization:bronze_compressor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/bronze_furnace.json b/src/generated/resources/data/modern_industrialization/advancement/bronze_furnace.json index 0eccb4fd7..986ab7ed4 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/bronze_furnace.json +++ b/src/generated/resources/data/modern_industrialization/advancement/bronze_furnace.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.bronze_furnace.description" }, "icon": { - "count": 1, "id": "modern_industrialization:bronze_furnace" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/bronze_macerator.json b/src/generated/resources/data/modern_industrialization/advancement/bronze_macerator.json index ce53f26ba..7e28d3053 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/bronze_macerator.json +++ b/src/generated/resources/data/modern_industrialization/advancement/bronze_macerator.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.bronze_macerator.description" }, "icon": { - "count": 1, "id": "modern_industrialization:bronze_macerator" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/bronze_mixer.json b/src/generated/resources/data/modern_industrialization/advancement/bronze_mixer.json index 237b8ebd9..87a731333 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/bronze_mixer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/bronze_mixer.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.bronze_mixer.description" }, "icon": { - "count": 1, "id": "modern_industrialization:bronze_mixer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/capacitor.json b/src/generated/resources/data/modern_industrialization/advancement/capacitor.json index 18a0d26ef..a54017b48 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/capacitor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/capacitor.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.capacitor.description" }, "icon": { - "count": 1, "id": "modern_industrialization:capacitor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/centrifuge.json b/src/generated/resources/data/modern_industrialization/advancement/centrifuge.json index c9ebd622c..fda05287d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/centrifuge.json +++ b/src/generated/resources/data/modern_industrialization/advancement/centrifuge.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.centrifuge.description" }, "icon": { - "count": 1, "id": "modern_industrialization:centrifuge" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/chemical_reactor.json b/src/generated/resources/data/modern_industrialization/advancement/chemical_reactor.json index 020ecabf6..83cd97527 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/chemical_reactor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/chemical_reactor.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.chemical_reactor.description" }, "icon": { - "count": 1, "id": "modern_industrialization:chemical_reactor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/coke_oven.json b/src/generated/resources/data/modern_industrialization/advancement/coke_oven.json index 782c813a5..55102b12c 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/coke_oven.json +++ b/src/generated/resources/data/modern_industrialization/advancement/coke_oven.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:coke_oven" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/diesel_chainsaw.json b/src/generated/resources/data/modern_industrialization/advancement/diesel_chainsaw.json index 8402e0aef..63f144a5d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/diesel_chainsaw.json +++ b/src/generated/resources/data/modern_industrialization/advancement/diesel_chainsaw.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:diesel_chainsaw" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/diesel_jetpack.json b/src/generated/resources/data/modern_industrialization/advancement/diesel_jetpack.json index ce50b9a9a..2bb797eeb 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/diesel_jetpack.json +++ b/src/generated/resources/data/modern_industrialization/advancement/diesel_jetpack.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:diesel_jetpack" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/diesel_mining_drill.json b/src/generated/resources/data/modern_industrialization/advancement/diesel_mining_drill.json index 4f38f4ab7..bfa7a0934 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/diesel_mining_drill.json +++ b/src/generated/resources/data/modern_industrialization/advancement/diesel_mining_drill.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:diesel_mining_drill" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/digital_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/digital_circuit.json index 7295e3170..7be471313 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/digital_circuit.json +++ b/src/generated/resources/data/modern_industrialization/advancement/digital_circuit.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.digital_circuit.description" }, "icon": { - "count": 1, "id": "modern_industrialization:digital_circuit" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/distillation_tower.json b/src/generated/resources/data/modern_industrialization/advancement/distillation_tower.json index 230b98127..83100dbe4 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/distillation_tower.json +++ b/src/generated/resources/data/modern_industrialization/advancement/distillation_tower.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:distillation_tower" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/distillery.json b/src/generated/resources/data/modern_industrialization/advancement/distillery.json index d857ab678..aeb195f3c 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/distillery.json +++ b/src/generated/resources/data/modern_industrialization/advancement/distillery.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.distillery.description" }, "icon": { - "count": 1, "id": "modern_industrialization:distillery" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/electric_blast_furnace.json b/src/generated/resources/data/modern_industrialization/advancement/electric_blast_furnace.json index d719755d3..591731bb9 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/electric_blast_furnace.json +++ b/src/generated/resources/data/modern_industrialization/advancement/electric_blast_furnace.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:electric_blast_furnace" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/electric_quarry.json b/src/generated/resources/data/modern_industrialization/advancement/electric_quarry.json index 4ed3484c9..c37834311 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/electric_quarry.json +++ b/src/generated/resources/data/modern_industrialization/advancement/electric_quarry.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:electric_quarry" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/electrolyzer.json b/src/generated/resources/data/modern_industrialization/advancement/electrolyzer.json index a4f218f08..4160f2246 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/electrolyzer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/electrolyzer.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.electrolyzer.description" }, "icon": { - "count": 1, "id": "modern_industrialization:electrolyzer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/electronic_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/electronic_circuit.json index ef3b418d2..6daea5a11 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/electronic_circuit.json +++ b/src/generated/resources/data/modern_industrialization/advancement/electronic_circuit.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.electronic_circuit.description" }, "icon": { - "count": 1, "id": "modern_industrialization:electronic_circuit" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/fire_clay_bricks.json b/src/generated/resources/data/modern_industrialization/advancement/fire_clay_bricks.json index f077fe312..16352d4c6 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/fire_clay_bricks.json +++ b/src/generated/resources/data/modern_industrialization/advancement/fire_clay_bricks.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.fire_clay_bricks.description" }, "icon": { - "count": 1, "id": "modern_industrialization:fire_clay_bricks" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/forge_hammer.json b/src/generated/resources/data/modern_industrialization/advancement/forge_hammer.json index 850f46996..1c0dfe63b 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/forge_hammer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/forge_hammer.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:forge_hammer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/fusion_reactor.json b/src/generated/resources/data/modern_industrialization/advancement/fusion_reactor.json index c5c01c7e9..9d76b51c3 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/fusion_reactor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/fusion_reactor.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:fusion_reactor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/gravichestplate.json b/src/generated/resources/data/modern_industrialization/advancement/gravichestplate.json index afcfc7b6d..e9d90b42c 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/gravichestplate.json +++ b/src/generated/resources/data/modern_industrialization/advancement/gravichestplate.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:gravichestplate" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/guidebook.json b/src/generated/resources/data/modern_industrialization/advancement/guidebook.json index 6551a1e59..5f514d127 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/guidebook.json +++ b/src/generated/resources/data/modern_industrialization/advancement/guidebook.json @@ -11,7 +11,6 @@ "translate": "advancements.modern_industrialization.guidebook.description" }, "icon": { - "count": 1, "id": "modern_industrialization:guidebook" }, "show_toast": false, diff --git a/src/generated/resources/data/modern_industrialization/advancement/heat_exchanger.json b/src/generated/resources/data/modern_industrialization/advancement/heat_exchanger.json index 9be52c995..638335cb0 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/heat_exchanger.json +++ b/src/generated/resources/data/modern_industrialization/advancement/heat_exchanger.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.heat_exchanger.description" }, "icon": { - "count": 1, "id": "modern_industrialization:heat_exchanger" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/highly_advanced_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/highly_advanced_upgrade.json index bd000b21b..e6db8a25d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/highly_advanced_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/advancement/highly_advanced_upgrade.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.highly_advanced_upgrade.description" }, "icon": { - "count": 1, "id": "modern_industrialization:highly_advanced_upgrade" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/hv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/hv_diesel_generator.json index 5e8a1916b..5e85759f0 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/hv_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/advancement/hv_diesel_generator.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.hv_diesel_generator.description" }, "icon": { - "count": 1, "id": "modern_industrialization:hv_diesel_generator" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/hv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/hv_steam_turbine.json index 0e74037c0..58448253c 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/hv_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/advancement/hv_steam_turbine.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.hv_steam_turbine.description" }, "icon": { - "count": 1, "id": "modern_industrialization:hv_steam_turbine" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/implosion_compressor.json b/src/generated/resources/data/modern_industrialization/advancement/implosion_compressor.json index e10924013..8d436dbb6 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/implosion_compressor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/implosion_compressor.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:implosion_compressor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/inductor.json b/src/generated/resources/data/modern_industrialization/advancement/inductor.json index 445a9f7e3..6a5898f4b 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/inductor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/inductor.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.inductor.description" }, "icon": { - "count": 1, "id": "modern_industrialization:inductor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/kanthal_coil.json b/src/generated/resources/data/modern_industrialization/advancement/kanthal_coil.json index f5dc8279e..f6d9a279a 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/kanthal_coil.json +++ b/src/generated/resources/data/modern_industrialization/advancement/kanthal_coil.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.kanthal_coil.description" }, "icon": { - "count": 1, "id": "modern_industrialization:kanthal_coil" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/large_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/large_diesel_generator.json index 818f08ddb..044acf429 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/large_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/advancement/large_diesel_generator.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.large_diesel_generator.description" }, "icon": { - "count": 1, "id": "modern_industrialization:large_diesel_generator" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/advancement/large_steam_boiler.json index b594866fa..f24a0ee9c 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/large_steam_boiler.json +++ b/src/generated/resources/data/modern_industrialization/advancement/large_steam_boiler.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.large_steam_boiler.description" }, "icon": { - "count": 1, "id": "modern_industrialization:large_steam_boiler" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/large_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/large_steam_turbine.json index 4cee21647..930a8d414 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/large_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/advancement/large_steam_turbine.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.large_steam_turbine.description" }, "icon": { - "count": 1, "id": "modern_industrialization:large_steam_turbine" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/lv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/lv_steam_turbine.json index 48c8e010d..a8e56e447 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/lv_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/advancement/lv_steam_turbine.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.lv_steam_turbine.description" }, "icon": { - "count": 1, "id": "modern_industrialization:lv_steam_turbine" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/mixed_ingot_iridium.json b/src/generated/resources/data/modern_industrialization/advancement/mixed_ingot_iridium.json index d762b8987..2b45b0d22 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/mixed_ingot_iridium.json +++ b/src/generated/resources/data/modern_industrialization/advancement/mixed_ingot_iridium.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.mixed_ingot_iridium.description" }, "icon": { - "count": 1, "id": "modern_industrialization:mixed_ingot_iridium" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/mv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/mv_diesel_generator.json index acfce3442..b612f548a 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/mv_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/advancement/mv_diesel_generator.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.mv_diesel_generator.description" }, "icon": { - "count": 1, "id": "modern_industrialization:mv_diesel_generator" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/mv_lv_transformer.json b/src/generated/resources/data/modern_industrialization/advancement/mv_lv_transformer.json index ee296a777..dca9eba1d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/mv_lv_transformer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/mv_lv_transformer.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.mv_lv_transformer.description" }, "icon": { - "count": 1, "id": "modern_industrialization:mv_lv_transformer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/mv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/mv_steam_turbine.json index 891051a09..57125c659 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/mv_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/advancement/mv_steam_turbine.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:mv_steam_turbine" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/nuclear_reactor.json b/src/generated/resources/data/modern_industrialization/advancement/nuclear_reactor.json index dad06d622..45fde8e42 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/nuclear_reactor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/nuclear_reactor.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:nuclear_reactor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/nuke.json b/src/generated/resources/data/modern_industrialization/advancement/nuke.json index 920f83830..5ab2e9507 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/nuke.json +++ b/src/generated/resources/data/modern_industrialization/advancement/nuke.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.nuke.description" }, "icon": { - "count": 1, "id": "modern_industrialization:nuke" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/oil_drilling_rig.json b/src/generated/resources/data/modern_industrialization/advancement/oil_drilling_rig.json index 250fe21ed..0304ff9c5 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/oil_drilling_rig.json +++ b/src/generated/resources/data/modern_industrialization/advancement/oil_drilling_rig.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:oil_drilling_rig" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/plasma_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/plasma_turbine.json index 20fb2e355..caebe576e 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/plasma_turbine.json +++ b/src/generated/resources/data/modern_industrialization/advancement/plasma_turbine.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.plasma_turbine.description" }, "icon": { - "count": 1, "id": "modern_industrialization:plasma_turbine" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/polarizer.json b/src/generated/resources/data/modern_industrialization/advancement/polarizer.json index bff870c23..e352c0eb1 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/polarizer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/polarizer.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.polarizer.description" }, "icon": { - "count": 1, "id": "modern_industrialization:polarizer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/pressurizer.json b/src/generated/resources/data/modern_industrialization/advancement/pressurizer.json index 164f76465..a4b1372d3 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/pressurizer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/pressurizer.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.pressurizer.description" }, "icon": { - "count": 1, "id": "modern_industrialization:pressurizer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/processing_unit.json b/src/generated/resources/data/modern_industrialization/advancement/processing_unit.json index 7744eee03..d8c0212a5 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/processing_unit.json +++ b/src/generated/resources/data/modern_industrialization/advancement/processing_unit.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.processing_unit.description" }, "icon": { - "count": 1, "id": "modern_industrialization:processing_unit" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/quantum_chestplate.json b/src/generated/resources/data/modern_industrialization/advancement/quantum_chestplate.json index 6ac6aeed3..6db85e8fe 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/quantum_chestplate.json +++ b/src/generated/resources/data/modern_industrialization/advancement/quantum_chestplate.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:quantum_chestplate" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/quantum_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/quantum_circuit.json index 995556701..47abe63cf 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/quantum_circuit.json +++ b/src/generated/resources/data/modern_industrialization/advancement/quantum_circuit.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:quantum_circuit" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/quantum_sword.json b/src/generated/resources/data/modern_industrialization/advancement/quantum_sword.json index 1efc943fd..d42cc1ad6 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/quantum_sword.json +++ b/src/generated/resources/data/modern_industrialization/advancement/quantum_sword.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:quantum_sword" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/quantum_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/quantum_upgrade.json index f2909c51e..16c54a087 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/quantum_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/advancement/quantum_upgrade.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:quantum_upgrade" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/raw_iridium.json b/src/generated/resources/data/modern_industrialization/advancement/raw_iridium.json index efd785b9b..22288e978 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/raw_iridium.json +++ b/src/generated/resources/data/modern_industrialization/advancement/raw_iridium.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.raw_iridium.description" }, "icon": { - "count": 1, "id": "modern_industrialization:raw_iridium" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/diesel_jetpack.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/diesel_jetpack.json new file mode 100644 index 000000000..f7a3c79fc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/diesel_jetpack.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:armor/diesel_jetpack" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:armor/diesel_jetpack" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/gravichestplate.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/gravichestplate.json new file mode 100644 index 000000000..b549b7d71 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/gravichestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:armor/gravichestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:armor/gravichestplate" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/rubber_boots.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/rubber_boots.json new file mode 100644 index 000000000..f80c0a877 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/rubber_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:rubber_sheet" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:armor/rubber_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:armor/rubber_boots" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/rubber_helmet.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/rubber_helmet.json new file mode 100644 index 000000000..c069a1f8a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/armor/rubber_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:rubber_sheet" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:armor/rubber_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:armor/rubber_helmet" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/cadmium_battery.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/cadmium_battery.json new file mode 100644 index 000000000..0b2e62e60 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/cadmium_battery.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/battery_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/battery/cadmium_battery" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/battery/cadmium_battery" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/lv_battery.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/lv_battery.json new file mode 100644 index 000000000..c23171778 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/lv_battery.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/battery_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/battery/lv_battery" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/battery/lv_battery" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/plutonium_battery.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/plutonium_battery.json new file mode 100644 index 000000000..049307d53 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/plutonium_battery.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/battery_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/battery/plutonium_battery" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/battery/plutonium_battery" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/portable_storage_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/portable_storage_unit.json new file mode 100644 index 000000000..72b9a2af3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/portable_storage_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/battery/portable_storage_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/battery/portable_storage_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/silicon_battery.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/silicon_battery.json new file mode 100644 index 000000000..6ee7e207a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/silicon_battery.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/battery_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/battery/silicon_battery" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/battery/silicon_battery" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/sodium_battery.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/sodium_battery.json new file mode 100644 index 000000000..48ba5dcf5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/battery/sodium_battery.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/battery_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/battery/sodium_battery" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/battery/sodium_battery" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/blocks/fusion_chamber.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/blocks/fusion_chamber.json new file mode 100644 index 000000000..a0025a349 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/blocks/fusion_chamber.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/blocks/fusion_chamber" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/blocks/fusion_chamber" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/advanced_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/advanced_machine_casing.json new file mode 100644 index 000000000..9cd9d4e15 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/advanced_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/advanced_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/advanced_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/blastproof_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/blastproof_casing.json new file mode 100644 index 000000000..06ac0456e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/blastproof_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "#c:plates/blastproof_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/blastproof_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/blastproof_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/bronze_plated_bricks.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/bronze_plated_bricks.json new file mode 100644 index 000000000..d01c708a2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/bronze_plated_bricks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/bronze" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/bronze_plated_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/bronze_plated_bricks" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/clean_stainless_steel_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/clean_stainless_steel_machine_casing.json new file mode 100644 index 000000000..6354a8ad3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/clean_stainless_steel_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/stainless_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/clean_stainless_steel_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/clean_stainless_steel_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/frostproof_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/frostproof_machine_casing.json new file mode 100644 index 000000000..d0fc8f812 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/frostproof_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/aluminum" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/frostproof_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/frostproof_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/heatproof_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/heatproof_machine_casing.json new file mode 100644 index 000000000..b81c32e3c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/heatproof_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/invar" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/heatproof_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/heatproof_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/highly_advanced_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/highly_advanced_machine_casing.json new file mode 100644 index 000000000..fe131f419 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/highly_advanced_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/highly_advanced_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/highly_advanced_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/iridium_machine_casing_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/iridium_machine_casing_pipe.json new file mode 100644 index 000000000..81a49de57 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/iridium_machine_casing_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/iridium_machine_casing_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/iridium_machine_casing_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_casing.json new file mode 100644 index 000000000..88df37d05 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/nuclear_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/nuclear_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_fluid_hatch.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_fluid_hatch.json new file mode 100644 index 000000000..5c255329d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_fluid_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/nuclear_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/nuclear_fluid_hatch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/nuclear_fluid_hatch" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_item_hatch.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_item_hatch.json new file mode 100644 index 000000000..8d8d3f2db --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_item_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/nuclear_alloy" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/nuclear_item_hatch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/nuclear_item_hatch" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_pipe_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_pipe_casing.json new file mode 100644 index 000000000..bc5d97ccd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/nuclear_pipe_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/nuclear_pipe_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/nuclear_pipe_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/plasma_handling_iridium_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/plasma_handling_iridium_machine_casing.json new file mode 100644 index 000000000..cb5b458d4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/plasma_handling_iridium_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/iridium" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/plasma_handling_iridium_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/plasma_handling_iridium_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/quantum_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/quantum_machine_casing.json new file mode 100644 index 000000000..6a05dc105 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/quantum_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/quantum_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/quantum_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/solid_titanium_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/solid_titanium_machine_casing.json new file mode 100644 index 000000000..149bd3850 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/solid_titanium_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/titanium" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/solid_titanium_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/solid_titanium_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/stainless_steel_casing_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/stainless_steel_casing_pipe.json new file mode 100644 index 000000000..5b0be788d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/stainless_steel_casing_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/stainless_steel_casing_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/stainless_steel_casing_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/titanium_casing_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/titanium_casing_pipe.json new file mode 100644 index 000000000..43005b147 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/titanium_casing_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/titanium_casing_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/titanium_casing_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/turbo_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/turbo_machine_casing.json new file mode 100644 index 000000000..1d87c0301 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/casing/turbo_machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/casing/turbo_machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/casing/turbo_machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/digital_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/digital_circuit.json new file mode 100644 index 000000000..c9a5cd6b5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/digital_circuit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_digital_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:digital_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/digital_circuit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_digital_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/digital_circuit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit.json new file mode 100644 index 000000000..69d3abcaf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/electronic_circuit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/electronic_circuit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit_board.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit_board.json new file mode 100644 index 000000000..29d1f043a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/electronic_circuit_board.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/electronic_circuit_board" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/electronic_circuit_board" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit.json new file mode 100644 index 000000000..6c40f3bb0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/lv_circuit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/lv_circuit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit_board.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit_board.json new file mode 100644 index 000000000..24e2a1bb9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/lv_circuit_board.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/copper" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/lv_circuit_board" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/lv_circuit_board" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/processing_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/processing_unit.json new file mode 100644 index 000000000..58137c967 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/processing_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_digital_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:digital_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/processing_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_digital_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/processing_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/quantum_circuit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/quantum_circuit.json new file mode 100644 index 000000000..c41013b66 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/circuit/craft/quantum_circuit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_quantum_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:quantum_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/circuit/craft/quantum_circuit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_quantum_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/circuit/craft/quantum_circuit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_motor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_motor.json new file mode 100644 index 000000000..890e7be97 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_motor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/advanced_motor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/advanced_motor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_pump.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_pump.json new file mode 100644 index 000000000..d99735e4d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/advanced_pump.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/advanced_pump" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/advanced_pump" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/air_intake.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/air_intake.json new file mode 100644 index 000000000..82599efca --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/air_intake.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/stainless_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/air_intake" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/air_intake" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/and_gate.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/and_gate.json new file mode 100644 index 000000000..830937733 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/and_gate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/and_gate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/and_gate" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/arithmetic_logic_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/arithmetic_logic_unit.json new file mode 100644 index 000000000..6b6297b79 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/arithmetic_logic_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/arithmetic_logic_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/arithmetic_logic_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/capacitor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/capacitor.json new file mode 100644 index 000000000..e8465c687 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/capacitor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/gold" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/capacitor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/capacitor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/conveyor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/conveyor.json new file mode 100644 index 000000000..60d976cf0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/conveyor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/conveyor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/conveyor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode.json new file mode 100644 index 000000000..c28ef8883 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/silicon" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/diode" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/diode" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode_doped.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode_doped.json new file mode 100644 index 000000000..0d01a8646 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/diode_doped.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/diode_doped" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/diode_doped" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/inductor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/inductor.json new file mode 100644 index 000000000..6f488a567 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/inductor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/inductor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/inductor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/invar_rotary_blade.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/invar_rotary_blade.json new file mode 100644 index 000000000..0421c663c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/invar_rotary_blade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gear": { + "conditions": { + "items": [ + { + "items": "#c:gears/invar" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/invar_rotary_blade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gear" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/invar_rotary_blade" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_motor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_motor.json new file mode 100644 index 000000000..83d0a216c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_motor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_processing_unit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:processing_unit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/large_advanced_motor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_processing_unit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/large_advanced_motor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_pump.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_pump.json new file mode 100644 index 000000000..01db3c92e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_advanced_pump.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_processing_unit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:processing_unit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/large_advanced_pump" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_processing_unit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/large_advanced_pump" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_heat_exchanger.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_heat_exchanger.json new file mode 100644 index 000000000..338335906 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_heat_exchanger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gear": { + "conditions": { + "items": [ + { + "items": "#c:gears/invar" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/large_heat_exchanger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gear" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/large_heat_exchanger" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_motor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_motor.json new file mode 100644 index 000000000..1d5cd84e4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_motor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/large_motor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/large_motor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_pump.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_pump.json new file mode 100644 index 000000000..9b75856e9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/large_pump.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/large_pump" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/large_pump" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/memory_management_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/memory_management_unit.json new file mode 100644 index 000000000..20b01c538 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/memory_management_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/emerald" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/memory_management_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/memory_management_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/motor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/motor.json new file mode 100644 index 000000000..a9b63559a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/motor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/motor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/motor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/not_gate.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/not_gate.json new file mode 100644 index 000000000..3d8ee19ca --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/not_gate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/not_gate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/not_gate" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/op_amp.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/op_amp.json new file mode 100644 index 000000000..68f43cee2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/op_amp.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/op_amp" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/op_amp" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/or_gate.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/or_gate.json new file mode 100644 index 000000000..83e8649fd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/or_gate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/or_gate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/or_gate" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/overdrive_module.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/overdrive_module.json new file mode 100644 index 000000000..21a18b0e8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/overdrive_module.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/overdrive_module" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/overdrive_module" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/piston.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/piston.json new file mode 100644 index 000000000..98d7ad94a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/piston.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/piston" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/piston" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/pump.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/pump.json new file mode 100644 index 000000000..c7f898bff --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/pump.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/pump" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/pump" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/redstone_control_module.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/redstone_control_module.json new file mode 100644 index 000000000..3379a2f23 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/redstone_control_module.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/redstone_control_module" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/redstone_control_module" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/resistor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/resistor.json new file mode 100644 index 000000000..e9d9f8387 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/resistor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/resistor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/resistor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/robot_arm.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/robot_arm.json new file mode 100644 index 000000000..9b8e32f92 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/robot_arm.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/robot_arm" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/robot_arm" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/small_heat_exchanger.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/small_heat_exchanger.json new file mode 100644 index 000000000..011fc4ad2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/small_heat_exchanger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/invar" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/small_heat_exchanger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/small_heat_exchanger" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/steel_rod_magnetic.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/steel_rod_magnetic.json new file mode 100644 index 000000000..c17b7cf04 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/steel_rod_magnetic.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/steel_rod_magnetic" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/steel_rod_magnetic" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor.json new file mode 100644 index 000000000..cafe672e4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/silicon" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/transistor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/transistor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor_doped.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor_doped.json new file mode 100644 index 000000000..898320c94 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/transistor_doped.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/transistor_doped" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/transistor_doped" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/ultradense_metal_ball.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/ultradense_metal_ball.json new file mode 100644 index 000000000..6e6c60e40 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/component/craft/ultradense_metal_ball.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/lead" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/component/craft/ultradense_metal_ball" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/component/craft/ultradense_metal_ball" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/advanced_machine_hull.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/advanced_machine_hull.json new file mode 100644 index 000000000..8b6143e46 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/advanced_machine_hull.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/hull/advanced_machine_hull" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/hull/advanced_machine_hull" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/highly_advanced_machine_hull.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/highly_advanced_machine_hull.json new file mode 100644 index 000000000..01971de7f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/highly_advanced_machine_hull.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/hull/highly_advanced_machine_hull" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/hull/highly_advanced_machine_hull" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/lv_machine_hull.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/lv_machine_hull.json new file mode 100644 index 000000000..1753f9c95 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/lv_machine_hull.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/hull/lv_machine_hull" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/hull/lv_machine_hull" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/quantum_machine_hull.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/quantum_machine_hull.json new file mode 100644 index 000000000..eb42b2ea6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/quantum_machine_hull.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:quantum_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/hull/quantum_machine_hull" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/hull/quantum_machine_hull" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/turbo_machine_hull.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/turbo_machine_hull.json new file mode 100644 index 000000000..027a546ac --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/hull/turbo_machine_hull.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/hull/turbo_machine_hull" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/hull/turbo_machine_hull" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/advanced_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/advanced_large_steam_boiler.json new file mode 100644 index 000000000..a0d18e390 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/advanced_large_steam_boiler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/advanced_large_steam_boiler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/advanced_large_steam_boiler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/assembler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/assembler.json new file mode 100644 index 000000000..ed74a9043 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/assembler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/assembler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/assembler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/centrifuge.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/centrifuge.json new file mode 100644 index 000000000..f1ebb5f02 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/centrifuge.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/centrifuge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/centrifuge" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/chemical_reactor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/chemical_reactor.json new file mode 100644 index 000000000..6c4fe6d3d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/chemical_reactor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/chemical_reactor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/chemical_reactor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/compressor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/compressor.json new file mode 100644 index 000000000..3a0f067fa --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/compressor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/compressor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/compressor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_chest.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_chest.json new file mode 100644 index 000000000..6db18367b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/configurable_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/configurable_chest" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_tank.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_tank.json new file mode 100644 index 000000000..7e3611b08 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/configurable_tank.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/configurable_tank" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/configurable_tank" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/cutting_machine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/cutting_machine.json new file mode 100644 index 000000000..49d6d8850 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/cutting_machine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/cutting_machine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/cutting_machine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillation_tower.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillation_tower.json new file mode 100644 index 000000000..cde82bfd3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillation_tower.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/distillation_tower" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/distillation_tower" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillery.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillery.json new file mode 100644 index 000000000..61ca51837 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/distillery.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/distillery" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/distillery" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_blast_furnace.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_blast_furnace.json new file mode 100644 index 000000000..2b0db5922 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_blast_furnace.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/electric_blast_furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/electric_blast_furnace" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_quarry.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_quarry.json new file mode 100644 index 000000000..573a672df --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electric_quarry.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/electric_quarry" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/electric_quarry" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electrolyzer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electrolyzer.json new file mode 100644 index 000000000..2453ada4f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/electrolyzer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/electrolyzer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/electrolyzer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/furnace.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/furnace.json new file mode 100644 index 000000000..c6e0b4c5d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/furnace.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/furnace" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/fusion_reactor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/fusion_reactor.json new file mode 100644 index 000000000..fa9fad78a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/fusion_reactor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:quantum_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/fusion_reactor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/fusion_reactor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/heat_exchanger.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/heat_exchanger.json new file mode 100644 index 000000000..6cf89495f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/heat_exchanger.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/heat_exchanger" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/heat_exchanger" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_advanced_large_steam_boiler.json new file mode 100644 index 000000000..bb9a54d4f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_advanced_large_steam_boiler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_processing_unit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:processing_unit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/high_pressure_advanced_large_steam_boiler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_processing_unit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/high_pressure_advanced_large_steam_boiler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_large_steam_boiler.json new file mode 100644 index 000000000..c07cdaa24 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/high_pressure_large_steam_boiler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_digital_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:digital_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/high_pressure_large_steam_boiler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_digital_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/high_pressure_large_steam_boiler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_diesel_generator.json new file mode 100644 index 000000000..342960aec --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_diesel_generator.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/hv_diesel_generator" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/hv_diesel_generator" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_steam_turbine.json new file mode 100644 index 000000000..9fbe9826a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/hv_steam_turbine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/hv_steam_turbine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/hv_steam_turbine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/implosion_compressor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/implosion_compressor.json new file mode 100644 index 000000000..db8a82096 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/implosion_compressor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/implosion_compressor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/implosion_compressor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_diesel_generator.json new file mode 100644 index 000000000..24a9f816c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_diesel_generator.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/large_diesel_generator" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/large_diesel_generator" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_boiler.json new file mode 100644 index 000000000..36d2be04d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_boiler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/large_steam_boiler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/large_steam_boiler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_turbine.json new file mode 100644 index 000000000..6b8dcda64 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_steam_turbine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/large_steam_turbine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/large_steam_turbine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank.json new file mode 100644 index 000000000..b2fc0d0ea --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/large_tank" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/large_tank" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank_hatch.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank_hatch.json new file mode 100644 index 000000000..ce38834a0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/large_tank_hatch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/large_tank_hatch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/large_tank_hatch" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_diesel_generator.json new file mode 100644 index 000000000..1e4b021d1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_diesel_generator.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/lv_diesel_generator" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/lv_diesel_generator" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_steam_turbine.json new file mode 100644 index 000000000..335ee2bb9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/lv_steam_turbine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/lv_steam_turbine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/lv_steam_turbine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/macerator.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/macerator.json new file mode 100644 index 000000000..78a491258 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/macerator.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/macerator" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/macerator" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mixer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mixer.json new file mode 100644 index 000000000..be46dad5d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mixer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/mixer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/mixer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_diesel_generator.json new file mode 100644 index 000000000..b508ff64f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_diesel_generator.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/mv_diesel_generator" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/mv_diesel_generator" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_steam_turbine.json new file mode 100644 index 000000000..f524d2e35 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/mv_steam_turbine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/mv_steam_turbine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/mv_steam_turbine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/nuclear_reactor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/nuclear_reactor.json new file mode 100644 index 000000000..8f8f3829b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/nuclear_reactor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/nuclear_reactor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/nuclear_reactor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/packer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/packer.json new file mode 100644 index 000000000..827b8e3bc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/packer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/packer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/packer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/plasma_turbine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/plasma_turbine.json new file mode 100644 index 000000000..f20a01593 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/plasma_turbine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:quantum_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/plasma_turbine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/plasma_turbine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/polarizer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/polarizer.json new file mode 100644 index 000000000..d5ad2796c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/polarizer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/polarizer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/polarizer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/pressurizer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/pressurizer.json new file mode 100644 index 000000000..4a0226bbd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/pressurizer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/pressurizer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/pressurizer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/unpacker.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/unpacker.json new file mode 100644 index 000000000..651a0c5bd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/unpacker.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/unpacker" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/unpacker" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/vacuum_freezer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/vacuum_freezer.json new file mode 100644 index 000000000..c84ae2abb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/vacuum_freezer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/vacuum_freezer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/vacuum_freezer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/water_pump.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/water_pump.json new file mode 100644 index 000000000..5a14df01e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/water_pump.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/water_pump" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/water_pump" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/wiremill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/wiremill.json new file mode 100644 index 000000000..bf5141281 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/machine/wiremill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/machine/wiremill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/machine/wiremill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/ev_storage_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/ev_storage_unit.json new file mode 100644 index 000000000..c1061e437 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/ev_storage_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/storage_unit/ev_storage_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/storage_unit/ev_storage_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/hv_storage_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/hv_storage_unit.json new file mode 100644 index 000000000..62cb12416 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/hv_storage_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/storage_unit/hv_storage_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/storage_unit/hv_storage_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/lv_storage_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/lv_storage_unit.json new file mode 100644 index 000000000..7498e09ae --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/lv_storage_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/storage_unit/lv_storage_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/storage_unit/lv_storage_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/mv_storage_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/mv_storage_unit.json new file mode 100644 index 000000000..397fd6e9c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/mv_storage_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/storage_unit/mv_storage_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/storage_unit/mv_storage_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/superconductor_storage_unit.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/superconductor_storage_unit.json new file mode 100644 index 000000000..17281d7c1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/storage_unit/superconductor_storage_unit.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:quantum_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/storage_unit/superconductor_storage_unit" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/storage_unit/superconductor_storage_unit" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down.json new file mode 100644 index 000000000..e6e9b7a9f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/ev_supra/down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/ev_supra/down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down_to_up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down_to_up.json new file mode 100644 index 000000000..f050a187e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/down_to_up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:superconductor_ev_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/ev_supra/down_to_up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/ev_supra/down_to_up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up.json new file mode 100644 index 000000000..ed69dfe84 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:highly_advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/ev_supra/up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/ev_supra/up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up_to_down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up_to_down.json new file mode 100644 index 000000000..69187b453 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/ev_supra/up_to_down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:ev_superconductor_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/ev_supra/up_to_down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/ev_supra/up_to_down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down.json new file mode 100644 index 000000000..c2c44b644 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/hv_ev/down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/hv_ev/down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down_to_up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down_to_up.json new file mode 100644 index 000000000..b144f81fd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/down_to_up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:ev_hv_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/hv_ev/down_to_up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/hv_ev/down_to_up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up.json new file mode 100644 index 000000000..703301e4f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:turbo_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/hv_ev/up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/hv_ev/up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up_to_down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up_to_down.json new file mode 100644 index 000000000..1b6f285ae --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/hv_ev/up_to_down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:hv_ev_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/hv_ev/up_to_down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/hv_ev/up_to_down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down.json new file mode 100644 index 000000000..496a0599a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/lv_mv/down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/lv_mv/down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down_to_up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down_to_up.json new file mode 100644 index 000000000..1c1276346 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/down_to_up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:mv_lv_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/lv_mv/down_to_up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/lv_mv/down_to_up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up.json new file mode 100644 index 000000000..47b1cf4e4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:basic_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/lv_mv/up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/lv_mv/up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up_to_down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up_to_down.json new file mode 100644 index 000000000..14e3d7846 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/lv_mv/up_to_down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:lv_mv_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/lv_mv/up_to_down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/lv_mv/up_to_down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down.json new file mode 100644 index 000000000..af782753a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/mv_hv/down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/mv_hv/down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down_to_up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down_to_up.json new file mode 100644 index 000000000..3dffc4276 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/down_to_up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:hv_mv_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/mv_hv/down_to_up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/mv_hv/down_to_up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up.json new file mode 100644 index 000000000..5f0629584 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/mv_hv/up" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/mv_hv/up" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up_to_down.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up_to_down.json new file mode 100644 index 000000000..21f3fda45 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/electric_age/transformer/mv_hv/up_to_down.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:mv_hv_transformer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:electric_age/transformer/mv_hv/up_to_down" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:electric_age/transformer/mv_hv/up_to_down" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/bronze_dust.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/bronze_dust.json new file mode 100644 index 000000000..f2bb66235 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/bronze_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:materials/bronze_dust" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin": { + "conditions": { + "items": [ + { + "items": "#c:ingots/tin" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:materials/bronze_dust" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/bronze_tiny_dust.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/bronze_tiny_dust.json new file mode 100644 index 000000000..d713c8f31 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/bronze_tiny_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:materials/bronze_tiny_dust" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin": { + "conditions": { + "items": [ + { + "items": "#c:ingots/tin" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:materials/bronze_tiny_dust" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_bricks.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_bricks.json new file mode 100644 index 000000000..8da8121d0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_bricks.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:fire_clay_brick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:materials/fire_clay_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:materials/fire_clay_bricks" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_dust.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_dust.json new file mode 100644 index 000000000..c214e5674 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/fire_clay_dust.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:materials/fire_clay_dust" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:materials/fire_clay_dust" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/uncooked_steel_dust.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/uncooked_steel_dust.json new file mode 100644 index 000000000..097b1b8c5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/materials/uncooked_steel_dust.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_coke": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:coke" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_coke_dust": { + "conditions": { + "items": [ + { + "items": "#c:dusts/coke" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:materials/uncooked_steel_dust" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_coke", + "has_coke_dust" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:materials/uncooked_steel_dust" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/forge_hammer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/forge_hammer.json new file mode 100644 index 000000000..d4be5651b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/forge_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:misc/forge_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:misc/forge_hammer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/guide_book.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/guide_book.json new file mode 100644 index 000000000..549e61055 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/guide_book.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:misc/guide_book" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:misc/guide_book" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/packer_block_template.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/packer_block_template.json new file mode 100644 index 000000000..fb062df86 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/packer_block_template.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:misc/packer_block_template" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:misc/packer_block_template" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/packer_double_ingot_template.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/packer_double_ingot_template.json new file mode 100644 index 000000000..8fdab9cce --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/packer_double_ingot_template.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:misc/packer_double_ingot_template" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:misc/packer_double_ingot_template" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/trash_can.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/trash_can.json new file mode 100644 index 000000000..686b20204 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/misc/trash_can.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:misc/trash_can" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:misc/trash_can" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/oil/oil_drilling_rig.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/oil/oil_drilling_rig.json new file mode 100644 index 000000000..72e01fbd9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/oil/oil_drilling_rig.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hull": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:advanced_machine_hull" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:oil/oil_drilling_rig" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hull" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:oil/oil_drilling_rig" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/aluminum_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/aluminum_drill.json new file mode 100644 index 000000000..933bc8109 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/aluminum_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/aluminum_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/aluminum_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/bronze_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/bronze_drill.json new file mode 100644 index 000000000..e87bf3a5e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/bronze_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gear": { + "conditions": { + "items": [ + { + "items": "#c:gears/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/bronze_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gear" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/bronze_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/copper_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/copper_drill.json new file mode 100644 index 000000000..3d55b9f29 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/copper_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gear": { + "conditions": { + "items": [ + { + "items": "#c:gears/iron" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/copper_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gear" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/copper_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/gold_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/gold_drill.json new file mode 100644 index 000000000..242ea8042 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/gold_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/gold_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/gold_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/stainless_steel_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/stainless_steel_drill.json new file mode 100644 index 000000000..58d38722a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/stainless_steel_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_digital_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:digital_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/stainless_steel_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_digital_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/stainless_steel_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/steel_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/steel_drill.json new file mode 100644 index 000000000..00a4e205f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/steel_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/steel_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/steel_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/titanium_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/titanium_drill.json new file mode 100644 index 000000000..15adca6bd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/quarry/drill/titanium_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_processing_unit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:processing_unit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:quarry/drill/titanium_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_processing_unit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:quarry/drill/titanium_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/boiler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/boiler.json new file mode 100644 index 000000000..6706b14bc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/boiler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/bronze" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/boiler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/boiler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/casing_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/casing_pipe.json new file mode 100644 index 000000000..b36e1cb18 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/casing_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:bronze_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/casing_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/casing_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/compressor.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/compressor.json new file mode 100644 index 000000000..11985d805 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/compressor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:bronze_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/compressor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/compressor" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/cutting_machine.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/cutting_machine.json new file mode 100644 index 000000000..39afd2e6f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/cutting_machine.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:bronze_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/cutting_machine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/cutting_machine" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/furnace.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/furnace.json new file mode 100644 index 000000000..00b6f9cb6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/furnace.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/bronze" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/furnace" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/macerator.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/macerator.json new file mode 100644 index 000000000..75b8e8ee9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/macerator.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:bronze_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/macerator" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/macerator" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/machine_casing.json new file mode 100644 index 000000000..700b5d62c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/bronze" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/mixer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/mixer.json new file mode 100644 index 000000000..95cbcecfc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/mixer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:bronze_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/mixer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/mixer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/water_pump.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/water_pump.json new file mode 100644 index 000000000..8f25382a2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/bronze/water_pump.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:bronze_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/bronze/water_pump" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/bronze/water_pump" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_fluid.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_fluid.json new file mode 100644 index 000000000..750eaf3c8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_fluid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/decolor_pipes/craft/eight_fluid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/decolor_pipes/craft/eight_fluid" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_item.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_item.json new file mode 100644 index 000000000..6df32c488 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/eight_item.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/decolor_pipes/craft/eight_item" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/decolor_pipes/craft/eight_item" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_fluid.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_fluid.json new file mode 100644 index 000000000..3a64c7e27 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_fluid.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/decolor_pipes/craft/one_fluid" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/decolor_pipes/craft/one_fluid" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_item.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_item.json new file mode 100644 index 000000000..15873eefd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/decolor_pipes/craft/one_item.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/decolor_pipes/craft/one_item" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/decolor_pipes/craft/one_item" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/coke_oven.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/coke_oven.json new file mode 100644 index 000000000..a5712b48c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/coke_oven.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/fireclay/coke_oven" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/fireclay/coke_oven" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/steam_blast_furnace.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/steam_blast_furnace.json new file mode 100644 index 000000000..6b7565091 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fireclay/steam_blast_furnace.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/fireclay/steam_blast_furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/fireclay/steam_blast_furnace" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fluid_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fluid_pipe.json new file mode 100644 index 000000000..23f43c026 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/fluid_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/fluid_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/fluid_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/item_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/item_pipe.json new file mode 100644 index 000000000..9632b339a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/item_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gear": { + "conditions": { + "items": [ + { + "items": "#c:gears/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/item_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gear" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/item_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/boiler.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/boiler.json new file mode 100644 index 000000000..09f51e76d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/boiler.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/boiler" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/boiler" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/casing_pipe.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/casing_pipe.json new file mode 100644 index 000000000..043425f46 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/casing_pipe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/casing_pipe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/casing_pipe" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/furnace.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/furnace.json new file mode 100644 index 000000000..95cde9e46 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/furnace.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/furnace" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/machine_casing.json new file mode 100644 index 000000000..d92a454ed --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/machine_casing.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/machine_casing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/machine_casing" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/packer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/packer.json new file mode 100644 index 000000000..1dcea0faf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/packer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/packer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/packer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/quarry.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/quarry.json new file mode 100644 index 000000000..ead983c9e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/quarry.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/quarry" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/quarry" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/steel_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/steel_upgrade.json new file mode 100644 index 000000000..6bd979e0e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/steel_upgrade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/steel_upgrade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/steel_upgrade" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/unpacker.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/unpacker.json new file mode 100644 index 000000000..3cc108231 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/unpacker.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/unpacker" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/unpacker" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/wiremill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/wiremill.json new file mode 100644 index 000000000..8c22acf5b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/steam_age/steel/wiremill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_machine_casing": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_machine_casing" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:steam_age/steel/wiremill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_machine_casing" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:steam_age/steel/wiremill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/config_card.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/config_card.json new file mode 100644 index 000000000..b00a13c35 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/config_card.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_analog_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:analog_circuit_board" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:tools/config_card" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_analog_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:tools/config_card" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/diesel_chainsaw.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/diesel_chainsaw.json new file mode 100644 index 000000000..d4082960f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/diesel_chainsaw.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:tools/diesel_chainsaw" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:tools/diesel_chainsaw" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/diesel_mining_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/diesel_mining_drill.json new file mode 100644 index 000000000..2859c2ec2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/diesel_mining_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_electronic_circuit": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:electronic_circuit" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:tools/diesel_mining_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_electronic_circuit" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:tools/diesel_mining_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/steam_mining_drill.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/steam_mining_drill.json new file mode 100644 index 000000000..b142238bb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/steam_mining_drill.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:tools/steam_mining_drill" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:tools/steam_mining_drill" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/wrench.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/wrench.json new file mode 100644 index 000000000..3b36d35ad --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/tools/wrench.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "#c:plates/bronze" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:tools/wrench" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:tools/wrench" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/blast_furnace.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/blast_furnace.json new file mode 100644 index 000000000..c8c3fa170 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/blast_furnace.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/blast_furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/blast_furnace" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_boots.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_boots.json new file mode 100644 index 000000000..d6ce12698 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:iron_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/chainmail_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/chainmail_boots" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_chestplate.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_chestplate.json new file mode 100644 index 000000000..4c15314db --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_chestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:iron_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/chainmail_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/chainmail_chestplate" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_helmet.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_helmet.json new file mode 100644 index 000000000..dcf8f44f1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:iron_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/chainmail_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/chainmail_helmet" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_leggings.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_leggings.json new file mode 100644 index 000000000..2b6ee659a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chainmail_leggings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:iron_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/chainmail_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/chainmail_leggings" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chains.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chains.json new file mode 100644 index 000000000..09ab4128e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/chains.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:steel_ring" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/chains" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/chains" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/clay_uncrafting.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/clay_uncrafting.json new file mode 100644 index 000000000..30ecdcde0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/clay_uncrafting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "minecraft:clay" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/clay_uncrafting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/clay_uncrafting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/easy_chest.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/easy_chest.json new file mode 100644 index 000000000..125fde2b1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/easy_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "#minecraft:logs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/easy_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/easy_chest" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/lignite_torch.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/lignite_torch.json new file mode 100644 index 000000000..e672b083d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/lignite_torch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/lignite_torch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/lignite_torch" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steam_bucket.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steam_bucket.json new file mode 100644 index 000000000..16747c18c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steam_bucket.json @@ -0,0 +1,41 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:mod_loaded", + "modid": "dehydration" + } + } + ], + "parent": "minecraft:recipes/root", + "criteria": { + "has_bucket": { + "conditions": { + "items": [ + { + "items": "minecraft:water_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/steam_bucket" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_bucket" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/steam_bucket" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_anvil.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_anvil.json new file mode 100644 index 000000000..92f56c15c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_anvil.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/steel_anvil" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/steel_anvil" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_forge_hammer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_forge_hammer.json new file mode 100644 index 000000000..ca91329fc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_forge_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/steel_forge_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/steel_forge_hammer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_hopper.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_hopper.json new file mode 100644 index 000000000..727b2c04c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/steel_hopper.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plate": { + "conditions": { + "items": [ + { + "items": "#c:plates/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/steel_hopper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plate" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/steel_hopper" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/torch.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/torch.json new file mode 100644 index 000000000..6c131785e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/misc/vanilla_recipes/torch.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "TODO": { + "conditions": { + "items": [ + { + "items": "minecraft:diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:vanilla_recipes/torch" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "TODO" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:vanilla_recipes/torch" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/recipes/tools/tools/smithing/netherite_hammer.json b/src/generated/resources/data/modern_industrialization/advancement/recipes/tools/tools/smithing/netherite_hammer.json new file mode 100644 index 000000000..ffc8199fd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/advancement/recipes/tools/tools/smithing/netherite_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_diamond_hammer": { + "conditions": { + "items": [ + { + "items": "modern_industrialization:diamond_hammer" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modern_industrialization:tools/smithing/netherite_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_diamond_hammer" + ] + ], + "rewards": { + "recipes": [ + "modern_industrialization:tools/smithing/netherite_hammer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/advancement/replicator.json b/src/generated/resources/data/modern_industrialization/advancement/replicator.json index 2e5cda346..d17e45e63 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/replicator.json +++ b/src/generated/resources/data/modern_industrialization/advancement/replicator.json @@ -18,7 +18,6 @@ }, "frame": "challenge", "icon": { - "count": 1, "id": "modern_industrialization:replicator" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/resistor.json b/src/generated/resources/data/modern_industrialization/advancement/resistor.json index 9d023dc65..dce9cb99d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/resistor.json +++ b/src/generated/resources/data/modern_industrialization/advancement/resistor.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.resistor.description" }, "icon": { - "count": 1, "id": "modern_industrialization:resistor" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/singularity.json b/src/generated/resources/data/modern_industrialization/advancement/singularity.json index 8c49b8dbd..2c883985d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/singularity.json +++ b/src/generated/resources/data/modern_industrialization/advancement/singularity.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.singularity.description" }, "icon": { - "count": 1, "id": "modern_industrialization:singularity" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/stainless_steel_ingot.json b/src/generated/resources/data/modern_industrialization/advancement/stainless_steel_ingot.json index bd09d4cf0..83b0a286a 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/stainless_steel_ingot.json +++ b/src/generated/resources/data/modern_industrialization/advancement/stainless_steel_ingot.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:stainless_steel_ingot" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/steam_blast_furnace.json b/src/generated/resources/data/modern_industrialization/advancement/steam_blast_furnace.json index 0eff5b9f7..ac6a8015d 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/steam_blast_furnace.json +++ b/src/generated/resources/data/modern_industrialization/advancement/steam_blast_furnace.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.steam_blast_furnace.description" }, "icon": { - "count": 1, "id": "modern_industrialization:steam_blast_furnace" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/steam_mining_drill.json b/src/generated/resources/data/modern_industrialization/advancement/steam_mining_drill.json index b66af5d44..1cfba27bc 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/steam_mining_drill.json +++ b/src/generated/resources/data/modern_industrialization/advancement/steam_mining_drill.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:steam_mining_drill" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/steam_quarry.json b/src/generated/resources/data/modern_industrialization/advancement/steam_quarry.json index 2f15c2024..0f6c26055 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/steam_quarry.json +++ b/src/generated/resources/data/modern_industrialization/advancement/steam_quarry.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:steam_quarry" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/steel_machine_casing.json b/src/generated/resources/data/modern_industrialization/advancement/steel_machine_casing.json index b2dc31b48..d26715a0e 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/steel_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/advancement/steel_machine_casing.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:steel_machine_casing" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/steel_packer.json b/src/generated/resources/data/modern_industrialization/advancement/steel_packer.json index 359d37e7e..4e0e76948 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/steel_packer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/steel_packer.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.steel_packer.description" }, "icon": { - "count": 1, "id": "modern_industrialization:steel_packer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/steel_wiremill.json b/src/generated/resources/data/modern_industrialization/advancement/steel_wiremill.json index 27aac456a..438f3e3fa 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/steel_wiremill.json +++ b/src/generated/resources/data/modern_industrialization/advancement/steel_wiremill.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.steel_wiremill.description" }, "icon": { - "count": 1, "id": "modern_industrialization:steel_wiremill" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/superconductor_cable.json b/src/generated/resources/data/modern_industrialization/advancement/superconductor_cable.json index d27d1d109..7d4a98338 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/superconductor_cable.json +++ b/src/generated/resources/data/modern_industrialization/advancement/superconductor_cable.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:superconductor_cable" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/titanium_ingot.json b/src/generated/resources/data/modern_industrialization/advancement/titanium_ingot.json index 75dec818e..bc7702da9 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/titanium_ingot.json +++ b/src/generated/resources/data/modern_industrialization/advancement/titanium_ingot.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.titanium_ingot.description" }, "icon": { - "count": 1, "id": "modern_industrialization:titanium_ingot" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/turbo_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/turbo_upgrade.json index 539fa895e..0788fd5a0 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/turbo_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/advancement/turbo_upgrade.json @@ -17,7 +17,6 @@ "translate": "advancements.modern_industrialization.turbo_upgrade.description" }, "icon": { - "count": 1, "id": "modern_industrialization:turbo_upgrade" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/used_steel_upgrade.json b/src/generated/resources/data/modern_industrialization/advancement/used_steel_upgrade.json index b13a83d5e..60fe8f410 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/used_steel_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/advancement/used_steel_upgrade.json @@ -10,7 +10,6 @@ "translate": "advancements.modern_industrialization.used_steel_upgrade.description" }, "icon": { - "count": 1, "id": "modern_industrialization:steel_upgrade" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/uu_matter_bucket.json b/src/generated/resources/data/modern_industrialization/advancement/uu_matter_bucket.json index 0c524622e..beb9542a6 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/uu_matter_bucket.json +++ b/src/generated/resources/data/modern_industrialization/advancement/uu_matter_bucket.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:uu_matter_bucket" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/advancement/vacuum_freezer.json b/src/generated/resources/data/modern_industrialization/advancement/vacuum_freezer.json index af129da4f..634d1835f 100644 --- a/src/generated/resources/data/modern_industrialization/advancement/vacuum_freezer.json +++ b/src/generated/resources/data/modern_industrialization/advancement/vacuum_freezer.json @@ -18,7 +18,6 @@ }, "frame": "goal", "icon": { - "count": 1, "id": "modern_industrialization:vacuum_freezer" }, "title": { diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json index ab87ae5b2..7ba411dab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/lead" + "ingredient": "#c:dusts/lead" }, { "amount": 1, - "tag": "c:dusts/antimony" + "ingredient": "#c:dusts/antimony" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:battery_alloy_dust" + "id": "modern_industrialization:battery_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json index ee9e47861..303f920ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/battery_alloy/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" }, { "amount": 1, - "tag": "c:tiny_dusts/antimony" + "ingredient": "#c:tiny_dusts/antimony" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:battery_alloy_tiny_dust" + "id": "modern_industrialization:battery_alloy_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json index f9a92e5c6..2af845a9c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/tin" + "ingredient": "#c:dusts/tin" }, { "amount": 3, - "tag": "c:dusts/copper" + "ingredient": "#c:dusts/copper" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/tiny_dust.json index a2170ade2..cc02bcf18 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/bronze/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/tin" + "ingredient": "#c:tiny_dusts/tin" }, { "amount": 3, - "tag": "c:tiny_dusts/copper" + "ingredient": "#c:tiny_dusts/copper" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/dust.json index e6f559766..8ba6a042c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/copper" + "ingredient": "#c:dusts/copper" }, { "amount": 1, - "tag": "c:dusts/nickel" + "ingredient": "#c:dusts/nickel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cupronickel_dust" + "id": "modern_industrialization:cupronickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/tiny_dust.json index 9f7f6f37f..aecb2e6e4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/cupronickel/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/copper" + "ingredient": "#c:tiny_dusts/copper" }, { "amount": 1, - "tag": "c:tiny_dusts/nickel" + "ingredient": "#c:tiny_dusts/nickel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cupronickel_tiny_dust" + "id": "modern_industrialization:cupronickel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/dust.json index 33966be4e..9366bb478 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/gold" + "ingredient": "#c:dusts/gold" }, { "amount": 1, - "tag": "c:dusts/silver" + "ingredient": "#c:dusts/silver" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:electrum_dust" + "id": "modern_industrialization:electrum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/tiny_dust.json index 6fe1a491c..850fbc87f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/electrum/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/gold" + "ingredient": "#c:tiny_dusts/gold" }, { "amount": 1, - "tag": "c:tiny_dusts/silver" + "ingredient": "#c:tiny_dusts/silver" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:electrum_tiny_dust" + "id": "modern_industrialization:electrum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/dust.json index 56348955f..cbf90bb62 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "tag": "c:dusts/uranium_238" + "ingredient": "#c:dusts/uranium_238" }, { "amount": 3, - "tag": "c:dusts/plutonium" + "ingredient": "#c:dusts/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_mox_dust" + "id": "modern_industrialization:he_mox_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/tiny_dust.json index 490794025..f3cbd9410 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_mox/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "tag": "c:tiny_dusts/uranium_238" + "ingredient": "#c:tiny_dusts/uranium_238" }, { "amount": 3, - "tag": "c:tiny_dusts/plutonium" + "ingredient": "#c:tiny_dusts/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_mox_tiny_dust" + "id": "modern_industrialization:he_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/dust.json index f9b3fbbcd..12f678751 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "tag": "c:dusts/uranium_238" + "ingredient": "#c:dusts/uranium_238" }, { "amount": 3, - "tag": "c:dusts/uranium_235" + "ingredient": "#c:dusts/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_uranium_dust" + "id": "modern_industrialization:he_uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/tiny_dust.json index 9dc3c31c2..a40a7ed3e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/he_uranium/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "tag": "c:tiny_dusts/uranium_238" + "ingredient": "#c:tiny_dusts/uranium_238" }, { "amount": 3, - "tag": "c:tiny_dusts/uranium_235" + "ingredient": "#c:tiny_dusts/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_uranium_tiny_dust" + "id": "modern_industrialization:he_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/dust.json index bde93f55f..70fd9e4a2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:dusts/iron" + "ingredient": "#c:dusts/iron" }, { "amount": 1, - "tag": "c:dusts/nickel" + "ingredient": "#c:dusts/nickel" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/tiny_dust.json index c9fee04f0..54ff4353d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/invar/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:tiny_dusts/iron" + "ingredient": "#c:tiny_dusts/iron" }, { "amount": 1, - "tag": "c:tiny_dusts/nickel" + "ingredient": "#c:tiny_dusts/nickel" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:invar_tiny_dust" + "id": "modern_industrialization:invar_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/dust.json index f3ce05d43..bfa90873b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/dust.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/stainless_steel" + "ingredient": "#c:dusts/stainless_steel" }, { "amount": 1, - "tag": "c:dusts/chromium" + "ingredient": "#c:dusts/chromium" }, { "amount": 1, - "tag": "c:dusts/aluminum" + "ingredient": "#c:dusts/aluminum" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_dust" + "id": "modern_industrialization:kanthal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/tiny_dust.json index a579ee88d..482afe134 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/kanthal/tiny_dust.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/stainless_steel" + "ingredient": "#c:tiny_dusts/stainless_steel" }, { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" }, { "amount": 1, - "tag": "c:tiny_dusts/aluminum" + "ingredient": "#c:tiny_dusts/aluminum" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_tiny_dust" + "id": "modern_industrialization:kanthal_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/dust.json index 433dff1ad..291fbd41e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:dusts/uranium_238" + "ingredient": "#c:dusts/uranium_238" }, { "amount": 1, - "tag": "c:dusts/plutonium" + "ingredient": "#c:dusts/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_mox_dust" + "id": "modern_industrialization:le_mox_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/tiny_dust.json index cdeae19f4..9f96d8778 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_mox/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:tiny_dusts/uranium_238" + "ingredient": "#c:tiny_dusts/uranium_238" }, { "amount": 1, - "tag": "c:tiny_dusts/plutonium" + "ingredient": "#c:tiny_dusts/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_mox_tiny_dust" + "id": "modern_industrialization:le_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/dust.json index ac78e9eeb..a7b4a294d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:dusts/uranium_238" + "ingredient": "#c:dusts/uranium_238" }, { "amount": 1, - "tag": "c:dusts/uranium_235" + "ingredient": "#c:dusts/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_uranium_dust" + "id": "modern_industrialization:le_uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/tiny_dust.json index 783dc7bfc..1134f7653 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/le_uranium/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:tiny_dusts/uranium_238" + "ingredient": "#c:tiny_dusts/uranium_238" }, { "amount": 1, - "tag": "c:tiny_dusts/uranium_235" + "ingredient": "#c:tiny_dusts/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_uranium_tiny_dust" + "id": "modern_industrialization:le_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/dust.json index 5cdda580e..bd8fcfc1c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/tin" + "ingredient": "#c:dusts/tin" }, { "amount": 1, - "tag": "c:dusts/lead" + "ingredient": "#c:dusts/lead" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:soldering_alloy_dust" + "id": "modern_industrialization:soldering_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/tiny_dust.json index 5a04860df..8ae2623f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/soldering_alloy/tiny_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/tin" + "ingredient": "#c:tiny_dusts/tin" }, { "amount": 1, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:soldering_alloy_tiny_dust" + "id": "modern_industrialization:soldering_alloy_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/dust.json index 389736b6c..6fe0915e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/dust.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 6, - "tag": "c:dusts/iron" + "ingredient": "#c:dusts/iron" }, { "amount": 1, - "tag": "c:dusts/chromium" + "ingredient": "#c:dusts/chromium" }, { "amount": 1, - "tag": "c:dusts/nickel" + "ingredient": "#c:dusts/nickel" }, { "amount": 1, - "tag": "c:dusts/manganese" + "ingredient": "#c:dusts/manganese" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/tiny_dust.json index b140fb960..1289deec8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/stainless_steel/tiny_dust.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 6, - "tag": "c:tiny_dusts/iron" + "ingredient": "#c:tiny_dusts/iron" }, { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" }, { "amount": 1, - "tag": "c:tiny_dusts/nickel" + "ingredient": "#c:tiny_dusts/nickel" }, { "amount": 1, - "tag": "c:tiny_dusts/manganese" + "ingredient": "#c:tiny_dusts/manganese" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/dust.json index 960da855e..9e7c3bec7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/dust.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/iridium" + "ingredient": "#c:dusts/iridium" }, { "amount": 3, - "tag": "c:dusts/annealed_copper" + "ingredient": "#c:dusts/annealed_copper" }, { "amount": 3, - "tag": "c:dusts/yttrium" + "ingredient": "#c:dusts/yttrium" }, { "amount": 2, - "tag": "c:dusts/neodymium" + "ingredient": "#c:dusts/neodymium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:superconductor_dust" + "id": "modern_industrialization:superconductor_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/tiny_dust.json index af1f42d45..128a35b38 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/alloy/mixer/superconductor/tiny_dust.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/iridium" + "ingredient": "#c:tiny_dusts/iridium" }, { "amount": 3, - "tag": "c:tiny_dusts/annealed_copper" + "ingredient": "#c:tiny_dusts/annealed_copper" }, { "amount": 3, - "tag": "c:tiny_dusts/yttrium" + "ingredient": "#c:tiny_dusts/yttrium" }, { "amount": 2, - "tag": "c:tiny_dusts/neodymium" + "ingredient": "#c:tiny_dusts/neodymium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:superconductor_tiny_dust" + "id": "modern_industrialization:superconductor_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/armor/diesel_jetpack.json b/src/generated/resources/data/modern_industrialization/recipe/armor/diesel_jetpack.json new file mode 100644 index 000000000..231b9cd26 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/armor/diesel_jetpack.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": "modern_industrialization:large_motor", + "P": "modern_industrialization:large_pump", + "R": "modern_industrialization:aluminum_rotor", + "c": "modern_industrialization:electronic_circuit", + "t": "modern_industrialization:aluminum_tank" + }, + "pattern": [ + "PtP", + "McM", + "R R" + ], + "result": { + "id": "modern_industrialization:diesel_jetpack" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/armor/gravichestplate.json b/src/generated/resources/data/modern_industrialization/recipe/armor/gravichestplate.json new file mode 100644 index 000000000..dd82e1a50 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/armor/gravichestplate.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:superconductor_coil", + "P": "modern_industrialization:superconductor_plate", + "U": "modern_industrialization:highly_advanced_upgrade", + "c": "modern_industrialization:cooling_cell" + }, + "pattern": [ + "PUP", + "PCP", + "cPc" + ], + "result": { + "id": "modern_industrialization:gravichestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/armor/rubber_boots.json b/src/generated/resources/data/modern_industrialization/recipe/armor/rubber_boots.json new file mode 100644 index 000000000..613a51f0f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/armor/rubber_boots.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "modern_industrialization:rubber_sheet" + }, + "pattern": [ + "S S", + "S S" + ], + "result": { + "id": "modern_industrialization:rubber_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/armor/rubber_helmet.json b/src/generated/resources/data/modern_industrialization/recipe/armor/rubber_helmet.json new file mode 100644 index 000000000..7bb27705f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/armor/rubber_helmet.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "modern_industrialization:rubber_sheet" + }, + "pattern": [ + "SSS", + "S S" + ], + "result": { + "id": "modern_industrialization:rubber_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/cadmium_battery.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/cadmium_battery.json index aa95d2a7f..22615fd1a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/cadmium_battery.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/cadmium_battery.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" }, { "amount": 2, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" }, { "amount": 4, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" }, { "amount": 2, - "tag": "c:dusts/cadmium" + "ingredient": "#c:dusts/cadmium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_battery" + "id": "modern_industrialization:cadmium_battery" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/lv_battery.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/lv_battery.json index ddfefd555..980197d0c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/lv_battery.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/lv_battery.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 4, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" }, { "amount": 2, - "item": "minecraft:redstone" + "ingredient": "minecraft:redstone" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:redstone_battery" + "id": "modern_industrialization:redstone_battery" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/plutonium_battery.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/plutonium_battery.json index b192203b4..92b8a1884 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/plutonium_battery.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/plutonium_battery.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" }, { "amount": 2, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" }, { "amount": 4, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" }, { "amount": 2, - "tag": "c:dusts/plutonium" + "ingredient": "#c:dusts/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_battery" + "id": "modern_industrialization:plutonium_battery" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/portable_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/portable_storage_unit.json index 4333819e7..1cf9bd73e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/portable_storage_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/portable_storage_unit.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" }, { "amount": 2, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:portable_storage_unit" + "id": "modern_industrialization:portable_storage_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/silicon_battery.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/silicon_battery.json index 3683a4575..176894804 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/silicon_battery.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/silicon_battery.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" }, { "amount": 2, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 4, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" }, { "amount": 2, - "tag": "c:dusts/silicon" + "ingredient": "#c:dusts/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_battery" + "id": "modern_industrialization:silicon_battery" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/sodium_battery.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/sodium_battery.json index 016bcaf7e..be0ab13f2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/sodium_battery.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/battery/sodium_battery.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" }, { "amount": 2, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 4, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" }, { "amount": 2, - "tag": "c:dusts/sodium" + "ingredient": "#c:dusts/sodium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:sodium_battery" + "id": "modern_industrialization:sodium_battery" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/blocks/fusion_chamber.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/blocks/fusion_chamber.json index d7e412660..7a790683a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/blocks/fusion_chamber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/blocks/fusion_chamber.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:superconductor_coil" + "ingredient": "modern_industrialization:superconductor_coil" }, { "amount": 2, - "item": "modern_industrialization:large_heat_exchanger" + "ingredient": "modern_industrialization:large_heat_exchanger" }, { "amount": 2, - "item": "modern_industrialization:nuclear_alloy_large_plate" + "ingredient": "modern_industrialization:nuclear_alloy_large_plate" }, { "amount": 1, - "item": "modern_industrialization:plasma_handling_iridium_machine_casing" + "ingredient": "modern_industrialization:plasma_handling_iridium_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:fusion_chamber" + "id": "modern_industrialization:fusion_chamber" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/advanced_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/advanced_machine_casing.json index a9848dec7..af24d7c3e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/advanced_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/advanced_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_casing" + "id": "modern_industrialization:advanced_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/blastproof_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/blastproof_casing.json index 75a5f99b4..f9a1dc3c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/blastproof_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/blastproof_casing.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/blastproof_alloy" + "ingredient": "#c:plates/blastproof_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:blastproof_casing" + "id": "modern_industrialization:blastproof_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/bronze_plated_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/bronze_plated_bricks.json index 6a06aec6c..725467068 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/bronze_plated_bricks.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/bronze_plated_bricks.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 1, - "item": "modern_industrialization:fire_clay_bricks" + "ingredient": "modern_industrialization:fire_clay_bricks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_plated_bricks" + "id": "modern_industrialization:bronze_plated_bricks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/clean_stainless_steel_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/clean_stainless_steel_machine_casing.json index a09eb6217..1848b6de3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/clean_stainless_steel_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/clean_stainless_steel_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" }, { "amount": 1, - "tag": "c:gears/stainless_steel" + "ingredient": "#c:gears/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:clean_stainless_steel_machine_casing" + "id": "modern_industrialization:clean_stainless_steel_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/frostproof_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/frostproof_machine_casing.json index 662832fe8..f6de8fdf4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/frostproof_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/frostproof_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" }, { "amount": 1, - "tag": "c:gears/aluminum" + "ingredient": "#c:gears/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:frostproof_machine_casing" + "id": "modern_industrialization:frostproof_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/heatproof_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/heatproof_machine_casing.json index eedb7c4bf..2df61adef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/heatproof_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/heatproof_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/invar" + "ingredient": "#c:plates/invar" }, { "amount": 1, - "tag": "c:gears/invar" + "ingredient": "#c:gears/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:heatproof_machine_casing" + "id": "modern_industrialization:heatproof_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/highly_advanced_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/highly_advanced_machine_casing.json index b17cdef49..cf62aef6e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/highly_advanced_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/highly_advanced_machine_casing.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" }, { "amount": 4, - "tag": "c:plates/chromium" + "ingredient": "#c:plates/chromium" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_casing" + "id": "modern_industrialization:highly_advanced_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/iridium_machine_casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/iridium_machine_casing_pipe.json index 3423a1c29..a47661ee3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/iridium_machine_casing_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/iridium_machine_casing_pipe.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:plasma_handling_iridium_machine_casing" + "ingredient": "modern_industrialization:plasma_handling_iridium_machine_casing" }, { "amount": 6, - "item": "modern_industrialization:iridium_curved_plate" + "ingredient": "modern_industrialization:iridium_curved_plate" }, { "amount": 2, - "item": "modern_industrialization:large_advanced_pump" + "ingredient": "modern_industrialization:large_advanced_pump" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iridium_machine_casing_pipe" + "id": "modern_industrialization:iridium_machine_casing_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_casing.json index 6a7430912..bf5a169ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nuclear_casing" + "id": "modern_industrialization:nuclear_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_fluid_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_fluid_hatch.json index 646c0bf4c..4daca3ba8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_fluid_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_fluid_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_fluid_input_hatch" + "ingredient": "modern_industrialization:highly_advanced_fluid_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nuclear_fluid_hatch" + "id": "modern_industrialization:nuclear_fluid_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_item_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_item_hatch.json index ae6624831..1d64c8d90 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_item_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_item_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_item_input_hatch" + "ingredient": "modern_industrialization:highly_advanced_item_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nuclear_item_hatch" + "id": "modern_industrialization:nuclear_item_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_pipe_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_pipe_casing.json index bc746d924..9d00c4ef2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_pipe_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/nuclear_pipe_casing.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 2, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" }, { "amount": 1, - "item": "modern_industrialization:nuclear_casing" + "ingredient": "modern_industrialization:nuclear_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nuclear_alloy_machine_casing_pipe" + "id": "modern_industrialization:nuclear_alloy_machine_casing_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/plasma_handling_iridium_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/plasma_handling_iridium_machine_casing.json index f8d92286b..047545e02 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/plasma_handling_iridium_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/plasma_handling_iridium_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/iridium" + "ingredient": "#c:plates/iridium" }, { "amount": 1, - "item": "modern_industrialization:superconductor_coil" + "ingredient": "modern_industrialization:superconductor_coil" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plasma_handling_iridium_machine_casing" + "id": "modern_industrialization:plasma_handling_iridium_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/quantum_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/quantum_machine_casing.json index aeeaff6a6..dfaeb4f72 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/quantum_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/quantum_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/iridium" + "ingredient": "#c:plates/iridium" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_machine_casing" + "id": "modern_industrialization:quantum_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/solid_titanium_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/solid_titanium_machine_casing.json index 5428b5447..7763307eb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/solid_titanium_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/solid_titanium_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" }, { "amount": 1, - "tag": "c:gears/titanium" + "ingredient": "#c:gears/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:solid_titanium_machine_casing" + "id": "modern_industrialization:solid_titanium_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/stainless_steel_casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/stainless_steel_casing_pipe.json index 0ffb4349d..4a2a635c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/stainless_steel_casing_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/stainless_steel_casing_pipe.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:clean_stainless_steel_machine_casing" + "ingredient": "modern_industrialization:clean_stainless_steel_machine_casing" }, { "amount": 6, - "item": "modern_industrialization:stainless_steel_curved_plate" + "ingredient": "modern_industrialization:stainless_steel_curved_plate" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_machine_casing_pipe" + "id": "modern_industrialization:stainless_steel_machine_casing_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/titanium_casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/titanium_casing_pipe.json index 6b4e4b4c2..8d24cf5f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/titanium_casing_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/titanium_casing_pipe.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:solid_titanium_machine_casing" + "ingredient": "modern_industrialization:solid_titanium_machine_casing" }, { "amount": 6, - "item": "modern_industrialization:titanium_curved_plate" + "ingredient": "modern_industrialization:titanium_curved_plate" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_machine_casing_pipe" + "id": "modern_industrialization:titanium_machine_casing_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/turbo_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/turbo_machine_casing.json index 610ce04bd..7a4083c85 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/turbo_machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/casing/turbo_machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_casing" + "id": "modern_industrialization:turbo_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/digital_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/digital_circuit.json index 6f9fcc645..1ca161383 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/digital_circuit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/digital_circuit.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:or_gate" + "ingredient": "modern_industrialization:or_gate" }, { "amount": 4, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 2, - "item": "modern_industrialization:not_gate" + "ingredient": "modern_industrialization:not_gate" }, { "amount": 1, - "item": "modern_industrialization:and_gate" + "ingredient": "modern_industrialization:and_gate" }, { "amount": 1, - "item": "modern_industrialization:digital_circuit_board" + "ingredient": "modern_industrialization:digital_circuit_board" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:digital_circuit" + "id": "modern_industrialization:digital_circuit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit.json index 6012f3281..ef0c8d16f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:diode" + "ingredient": "modern_industrialization:diode" }, { "amount": 4, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "modern_industrialization:transistor" + "ingredient": "modern_industrialization:transistor" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit_board" + "ingredient": "modern_industrialization:electronic_circuit_board" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "id": "modern_industrialization:electronic_circuit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit_board.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit_board.json index f69fb0ca7..d9f34a967 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit_board.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/electronic_circuit_board.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 3, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" }, { "amount": 4, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit_board" + "ingredient": "modern_industrialization:analog_circuit_board" }, { "amount": 1, - "item": "modern_industrialization:redstone_battery" + "ingredient": "modern_industrialization:redstone_battery" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electronic_circuit_board" + "id": "modern_industrialization:electronic_circuit_board" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit.json index f47c17c72..3cd75982e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:inductor" + "ingredient": "modern_industrialization:inductor" }, { "amount": 3, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" }, { "amount": 2, - "item": "modern_industrialization:resistor" + "ingredient": "modern_industrialization:resistor" }, { "amount": 2, - "item": "modern_industrialization:capacitor" + "ingredient": "modern_industrialization:capacitor" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit_board" + "ingredient": "modern_industrialization:analog_circuit_board" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "id": "modern_industrialization:analog_circuit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit_board.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit_board.json index 368378e73..2ab6ec052 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit_board.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/lv_circuit_board.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 1, - "tag": "c:plates/copper" + "ingredient": "#c:plates/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:analog_circuit_board" + "id": "modern_industrialization:analog_circuit_board" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/processing_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/processing_unit.json index dad9792c5..1e5e21887 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/processing_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/processing_unit.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" }, { "amount": 2, - "item": "modern_industrialization:random_access_memory" + "ingredient": "modern_industrialization:random_access_memory" }, { "amount": 1, - "item": "modern_industrialization:memory_management_unit" + "ingredient": "modern_industrialization:memory_management_unit" }, { "amount": 1, - "item": "modern_industrialization:arithmetic_logic_unit" + "ingredient": "modern_industrialization:arithmetic_logic_unit" }, { "amount": 1, - "item": "modern_industrialization:processing_unit_board" + "ingredient": "modern_industrialization:processing_unit_board" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:processing_unit" + "id": "modern_industrialization:processing_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/quantum_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/quantum_circuit.json index 33ad61ecb..f3a39c3d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/quantum_circuit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/circuit/craft/quantum_circuit.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 2, - "item": "modern_industrialization:cooling_cell" + "ingredient": "modern_industrialization:cooling_cell" }, { "amount": 2, - "item": "modern_industrialization:qubit" + "ingredient": "modern_industrialization:qubit" }, { "amount": 1, - "item": "modern_industrialization:quantum_circuit_board" + "ingredient": "modern_industrialization:quantum_circuit_board" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_circuit" + "id": "modern_industrialization:quantum_circuit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/advanced_motor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/advanced_motor.json index ecdcf054b..bf677b163 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/advanced_motor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/advanced_motor.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_rod_magnetic" + "ingredient": "modern_industrialization:stainless_steel_rod_magnetic" }, { "amount": 2, - "tag": "c:rods/stainless_steel" + "ingredient": "#c:rods/stainless_steel" }, { "amount": 2, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 4, - "item": "modern_industrialization:annealed_copper_wire" + "ingredient": "modern_industrialization:annealed_copper_wire" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_motor" + "id": "modern_industrialization:advanced_motor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/air_intake.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/air_intake.json index e5f08ffd1..7eaafd6ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/air_intake.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/air_intake.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_rotor" + "ingredient": "modern_industrialization:stainless_steel_rotor" }, { "amount": 4, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:air_intake" + "id": "modern_industrialization:air_intake" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/and_gate.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/and_gate.json index 3e36a9e8e..d9a7e8b73 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/and_gate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/and_gate.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:resistor" + "ingredient": "modern_industrialization:resistor" }, { "amount": 1, - "item": "modern_industrialization:op_amp" + "ingredient": "modern_industrialization:op_amp" }, { "amount": 4, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:and_gate" + "id": "modern_industrialization:and_gate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/arithmetic_logic_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/arithmetic_logic_unit.json index 15d4e8c43..44773ef9e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/arithmetic_logic_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/arithmetic_logic_unit.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/diamond" + "ingredient": "#c:plates/diamond" }, { "amount": 2, - "item": "modern_industrialization:and_gate" + "ingredient": "modern_industrialization:and_gate" }, { "amount": 2, - "item": "modern_industrialization:or_gate" + "ingredient": "modern_industrialization:or_gate" }, { "amount": 4, - "item": "modern_industrialization:not_gate" + "ingredient": "modern_industrialization:not_gate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:arithmetic_logic_unit" + "id": "modern_industrialization:arithmetic_logic_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/conveyor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/conveyor.json index 1b523bfb1..d5e576eff 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/conveyor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/conveyor.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:conveyor" + "id": "modern_industrialization:conveyor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode.json index eef2808ed..dfb3544d1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/silicon" + "ingredient": "#c:plates/silicon" }, { "amount": 3, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" }, { "amount": 3, - "item": "modern_industrialization:electrum_fine_wire" + "ingredient": "modern_industrialization:electrum_fine_wire" }, { "amount": 2, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diode" + "id": "modern_industrialization:diode" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode_doped.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode_doped.json index 7254e00fb..8382066e6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode_doped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/diode_doped.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_n_doped_plate" + "ingredient": "modern_industrialization:silicon_n_doped_plate" }, { "amount": 3, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" }, { "amount": 3, - "item": "modern_industrialization:electrum_fine_wire" + "ingredient": "modern_industrialization:electrum_fine_wire" }, { "amount": 2, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:diode" + "id": "modern_industrialization:diode" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/invar_rotary_blade.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/invar_rotary_blade.json index 4275ad73c..1c744b575 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/invar_rotary_blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/invar_rotary_blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 4, - "tag": "c:dusts/diamond" + "ingredient": "#c:dusts/diamond" }, { "amount": 1, - "tag": "c:gears/invar" + "ingredient": "#c:gears/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_rotary_blade" + "id": "modern_industrialization:invar_rotary_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_motor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_motor.json index cc41c2216..debf82374 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_motor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_motor.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 2, - "tag": "c:rods/titanium" + "ingredient": "#c:rods/titanium" }, { "amount": 6, - "item": "modern_industrialization:advanced_motor" + "ingredient": "modern_industrialization:advanced_motor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_advanced_motor" + "id": "modern_industrialization:large_advanced_motor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_pump.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_pump.json index 4b05a1610..7ff63dc4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_advanced_pump.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 3, - "item": "modern_industrialization:titanium_rotor" + "ingredient": "modern_industrialization:titanium_rotor" }, { "amount": 1, - "item": "modern_industrialization:large_advanced_motor" + "ingredient": "modern_industrialization:large_advanced_motor" }, { "amount": 3, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_advanced_pump" + "id": "modern_industrialization:large_advanced_pump" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_heat_exchanger.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_heat_exchanger.json index ac8ab565d..a784aefc8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_heat_exchanger.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_heat_exchanger.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:small_heat_exchanger" + "ingredient": "modern_industrialization:small_heat_exchanger" }, { "amount": 1, - "item": "modern_industrialization:large_advanced_pump" + "ingredient": "modern_industrialization:large_advanced_pump" }, { "amount": 2, - "item": "modern_industrialization:aluminum_rotor" + "ingredient": "modern_industrialization:aluminum_rotor" }, { "amount": 4, - "tag": "c:gears/invar" + "ingredient": "#c:gears/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_heat_exchanger" + "id": "modern_industrialization:large_heat_exchanger" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_motor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_motor.json index 46eb66b8d..ef89ad227 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_motor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_motor.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 2, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" }, { "amount": 6, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_motor" + "id": "modern_industrialization:large_motor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_pump.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_pump.json index 907fae046..fb35b0301 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/large_pump.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 3, - "item": "modern_industrialization:aluminum_rotor" + "ingredient": "modern_industrialization:aluminum_rotor" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 3, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_pump" + "id": "modern_industrialization:large_pump" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/memory_management_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/memory_management_unit.json index 3ebc484cb..81e8a93e5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/memory_management_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/memory_management_unit.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/emerald" + "ingredient": "#c:plates/emerald" }, { "amount": 2, - "item": "modern_industrialization:silicon_wafer" + "ingredient": "modern_industrialization:silicon_wafer" }, { "amount": 6, - "item": "modern_industrialization:platinum_fine_wire" + "ingredient": "modern_industrialization:platinum_fine_wire" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:memory_management_unit" + "id": "modern_industrialization:memory_management_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/motor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/motor.json index 4aad6c0ed..8a004a647 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/motor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/motor.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_rod_magnetic" + "ingredient": "modern_industrialization:steel_rod_magnetic" }, { "amount": 2, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 4, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:motor" + "id": "modern_industrialization:motor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/not_gate.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/not_gate.json index 276b5d7f2..1cc27ed23 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/not_gate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/not_gate.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:resistor" + "ingredient": "modern_industrialization:resistor" }, { "amount": 1, - "item": "modern_industrialization:op_amp" + "ingredient": "modern_industrialization:op_amp" }, { "amount": 1, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:not_gate" + "id": "modern_industrialization:not_gate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/op_amp.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/op_amp.json index 32230c539..06d608eca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/op_amp.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/op_amp.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:resistor" + "ingredient": "modern_industrialization:resistor" }, { "amount": 4, - "item": "modern_industrialization:transistor" + "ingredient": "modern_industrialization:transistor" }, { "amount": 1, - "item": "modern_industrialization:diode" + "ingredient": "modern_industrialization:diode" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:op_amp" + "id": "modern_industrialization:op_amp" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/or_gate.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/or_gate.json index 14e3d8e57..5434b377f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/or_gate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/or_gate.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:op_amp" + "ingredient": "modern_industrialization:op_amp" }, { "amount": 2, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" }, { "amount": 1, - "item": "modern_industrialization:diode" + "ingredient": "modern_industrialization:diode" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:or_gate" + "id": "modern_industrialization:or_gate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/overdrive_module.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/overdrive_module.json index 325d916ea..26027d67e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/overdrive_module.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/overdrive_module.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:diode" + "ingredient": "modern_industrialization:diode" }, { "amount": 2, - "item": "modern_industrialization:transistor" + "ingredient": "modern_industrialization:transistor" }, { "amount": 4, - "item": "modern_industrialization:electrum_fine_wire" + "ingredient": "modern_industrialization:electrum_fine_wire" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit_board" + "ingredient": "modern_industrialization:electronic_circuit_board" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:overdrive_module" + "id": "modern_industrialization:overdrive_module" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/piston.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/piston.json index c496bf18d..6810d6587 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/piston.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/piston.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 2, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 3, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 1, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:piston" + "id": "modern_industrialization:piston" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/redstone_control_module.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/redstone_control_module.json index 3e21ccc7f..68cf6ad34 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/redstone_control_module.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/redstone_control_module.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "item": "minecraft:redstone" + "ingredient": "minecraft:redstone" }, { "amount": 1, - "item": "minecraft:redstone_torch" + "ingredient": "minecraft:redstone_torch" }, { "amount": 1, - "item": "modern_industrialization:capacitor" + "ingredient": "modern_industrialization:capacitor" }, { "amount": 2, - "item": "modern_industrialization:resistor" + "ingredient": "modern_industrialization:resistor" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit_board" + "ingredient": "modern_industrialization:analog_circuit_board" }, { "amount": 2, - "item": "modern_industrialization:inductor" + "ingredient": "modern_industrialization:inductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:redstone_control_module" + "id": "modern_industrialization:redstone_control_module" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/robot_arm.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/robot_arm.json index 6d709e349..a4c93a1b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/robot_arm.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/robot_arm.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 2, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" }, { "amount": 3, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:piston" + "ingredient": "modern_industrialization:piston" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:robot_arm" + "id": "modern_industrialization:robot_arm" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/small_heat_exchanger.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/small_heat_exchanger.json index b68f91a8d..2a3123f8f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/small_heat_exchanger.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/small_heat_exchanger.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/invar" + "ingredient": "#c:plates/invar" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_large_plate" + "ingredient": "modern_industrialization:stainless_steel_large_plate" }, { "amount": 4, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:small_heat_exchanger" + "id": "modern_industrialization:small_heat_exchanger" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor.json index 93fda05cc..faed0d95a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 3, - "tag": "c:plates/silicon" + "ingredient": "#c:plates/silicon" }, { "amount": 1, - "item": "modern_industrialization:electrum_fine_wire" + "ingredient": "modern_industrialization:electrum_fine_wire" }, { "amount": 3, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:transistor" + "id": "modern_industrialization:transistor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor_doped.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor_doped.json index 52f591fd1..e8329fbd0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor_doped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/transistor_doped.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:silicon_p_doped_plate" + "ingredient": "modern_industrialization:silicon_p_doped_plate" }, { "amount": 1, - "item": "modern_industrialization:silicon_n_doped_plate" + "ingredient": "modern_industrialization:silicon_n_doped_plate" }, { "amount": 1, - "item": "modern_industrialization:electrum_fine_wire" + "ingredient": "modern_industrialization:electrum_fine_wire" }, { "amount": 3, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:transistor" + "id": "modern_industrialization:transistor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/ultradense_metal_ball.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/ultradense_metal_ball.json index c8fe9a186..eb471ad9f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/ultradense_metal_ball.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/component/craft/ultradense_metal_ball.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:tungsten_large_plate" + "ingredient": "modern_industrialization:tungsten_large_plate" }, { "amount": 4, - "tag": "c:plates/lead" + "ingredient": "#c:plates/lead" }, { "amount": 1, - "tag": "c:plates/iridium" + "ingredient": "#c:plates/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ultradense_metal_ball" + "id": "modern_industrialization:ultradense_metal_ball" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/advanced_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/advanced_machine_hull.json index 963367a2f..259d64232 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/advanced_machine_hull.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/advanced_machine_hull.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:silicon_battery" + "ingredient": "modern_industrialization:silicon_battery" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_casing" + "ingredient": "modern_industrialization:advanced_machine_casing" }, { "amount": 3, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/highly_advanced_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/highly_advanced_machine_hull.json index 9e3ea20c0..9e32459cc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/highly_advanced_machine_hull.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/highly_advanced_machine_hull.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:cadmium_battery" + "ingredient": "modern_industrialization:cadmium_battery" }, { "amount": 1, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_casing" + "ingredient": "modern_industrialization:highly_advanced_machine_casing" }, { "amount": 3, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/lv_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/lv_machine_hull.json index 38e4509c4..adb979c11 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/lv_machine_hull.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/lv_machine_hull.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 3, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:redstone_battery" + "ingredient": "modern_industrialization:redstone_battery" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "id": "modern_industrialization:basic_machine_hull" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/quantum_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/quantum_machine_hull.json index 18e3c1fdb..a0e35469a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/quantum_machine_hull.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/quantum_machine_hull.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:plutonium_battery" + "ingredient": "modern_industrialization:plutonium_battery" }, { "amount": 1, - "item": "modern_industrialization:quantum_circuit" + "ingredient": "modern_industrialization:quantum_circuit" }, { "amount": 1, - "item": "modern_industrialization:quantum_machine_casing" + "ingredient": "modern_industrialization:quantum_machine_casing" }, { "amount": 3, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "id": "modern_industrialization:quantum_machine_hull" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/turbo_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/turbo_machine_hull.json index 48bdfd421..e2f34fca5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/turbo_machine_hull.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/hull/turbo_machine_hull.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:sodium_battery" + "ingredient": "modern_industrialization:sodium_battery" }, { "amount": 1, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_casing" + "ingredient": "modern_industrialization:turbo_machine_casing" }, { "amount": 3, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/advanced_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/advanced_large_steam_boiler.json index aa795bdb6..0ea992150 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/advanced_large_steam_boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/advanced_large_steam_boiler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 2, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:large_steam_boiler" + "ingredient": "modern_industrialization:large_steam_boiler" }, { "amount": 2, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_large_steam_boiler" + "id": "modern_industrialization:advanced_large_steam_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/assembler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/assembler.json index dccc6eee9..f9d948bb8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/assembler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/assembler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "modern_industrialization:conveyor" + "ingredient": "modern_industrialization:conveyor" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:assembler" + "id": "modern_industrialization:assembler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/centrifuge.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/centrifuge.json index 0ff6eda92..511738461 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/centrifuge.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/centrifuge.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 1, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:centrifuge" + "id": "modern_industrialization:centrifuge" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/chemical_reactor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/chemical_reactor.json index c21152069..50346dc8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/chemical_reactor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/chemical_reactor.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_rotor" + "ingredient": "modern_industrialization:aluminum_rotor" }, { "amount": 1, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" }, { "amount": 2, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chemical_reactor" + "id": "modern_industrialization:chemical_reactor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/compressor.json index c5cf5a5b1..69fb452e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/compressor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/compressor.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:piston" + "ingredient": "modern_industrialization:piston" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_compressor" + "id": "modern_industrialization:electric_compressor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_chest.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_chest.json index 32103a4d1..d45a472de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_chest.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_chest.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 4, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:configurable_chest" + "id": "modern_industrialization:configurable_chest" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_tank.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_tank.json index 6ccf99721..6e4e7c3f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/configurable_tank.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 2, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 4, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "modern_industrialization:aluminum_tank" + "ingredient": "modern_industrialization:aluminum_tank" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:configurable_tank" + "id": "modern_industrialization:configurable_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/cutting_machine.json index a04f18e62..bdb328720 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/cutting_machine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/cutting_machine.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_rotary_blade" + "ingredient": "modern_industrialization:invar_rotary_blade" }, { "amount": 2, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:conveyor" + "ingredient": "modern_industrialization:conveyor" }, { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_cutting_machine" + "id": "modern_industrialization:electric_cutting_machine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillation_tower.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillation_tower.json index c1165b171..2cc39126a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillation_tower.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillation_tower.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" }, { "amount": 2, - "item": "modern_industrialization:distillery" + "ingredient": "modern_industrialization:distillery" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:distillation_tower" + "id": "modern_industrialization:distillation_tower" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillery.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillery.json index 7e3408d35..4a598b203 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillery.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/distillery.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" }, { "amount": 2, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:distillery" + "id": "modern_industrialization:distillery" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_blast_furnace.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_blast_furnace.json index 5c9fc4447..09eae9c9a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_blast_furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_blast_furnace.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 7, - "item": "modern_industrialization:cupronickel_wire_magnetic" + "ingredient": "modern_industrialization:cupronickel_wire_magnetic" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "minecraft:blast_furnace" + "ingredient": "minecraft:blast_furnace" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_blast_furnace" + "id": "modern_industrialization:electric_blast_furnace" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_quarry.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_quarry.json index ff064f7ec..052b79b27 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_quarry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electric_quarry.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 1, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 2, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:steam_quarry" + "ingredient": "modern_industrialization:steam_quarry" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_quarry" + "id": "modern_industrialization:electric_quarry" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electrolyzer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electrolyzer.json index bc5b08d5e..515081a24 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electrolyzer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/electrolyzer.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:cupronickel_wire_magnetic" + "ingredient": "modern_industrialization:cupronickel_wire_magnetic" }, { "amount": 2, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrolyzer" + "id": "modern_industrialization:electrolyzer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/furnace.json index c21776776..4b4b41f93 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/furnace.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:cupronickel_wire_magnetic" + "ingredient": "modern_industrialization:cupronickel_wire_magnetic" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_furnace" + "id": "modern_industrialization:electric_furnace" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/fusion_reactor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/fusion_reactor.json index 7710c024b..c0cb1d60c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/fusion_reactor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/fusion_reactor.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:fusion_chamber" + "ingredient": "modern_industrialization:fusion_chamber" }, { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "ingredient": "modern_industrialization:quantum_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:quantum_circuit" + "ingredient": "modern_industrialization:quantum_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:fusion_reactor" + "id": "modern_industrialization:fusion_reactor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/heat_exchanger.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/heat_exchanger.json index 1c468e343..4bce3f3a1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/heat_exchanger.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/heat_exchanger.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:small_heat_exchanger" + "ingredient": "modern_industrialization:small_heat_exchanger" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:stainless_steel_machine_casing_pipe" + "ingredient": "modern_industrialization:stainless_steel_machine_casing_pipe" }, { "amount": 2, - "item": "modern_industrialization:frostproof_machine_casing" + "ingredient": "modern_industrialization:frostproof_machine_casing" }, { "amount": 2, - "item": "modern_industrialization:heatproof_machine_casing" + "ingredient": "modern_industrialization:heatproof_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:heat_exchanger" + "id": "modern_industrialization:heat_exchanger" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_advanced_large_steam_boiler.json index 1c4890df9..9b2518b57 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_advanced_large_steam_boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_advanced_large_steam_boiler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 2, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 1, - "item": "modern_industrialization:high_pressure_large_steam_boiler" + "ingredient": "modern_industrialization:high_pressure_large_steam_boiler" }, { "amount": 2, - "item": "modern_industrialization:large_advanced_pump" + "ingredient": "modern_industrialization:large_advanced_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:high_pressure_advanced_large_steam_boiler" + "id": "modern_industrialization:high_pressure_advanced_large_steam_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_large_steam_boiler.json index 73343fc8d..5df7f351e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_large_steam_boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/high_pressure_large_steam_boiler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:clean_stainless_steel_machine_casing" + "ingredient": "modern_industrialization:clean_stainless_steel_machine_casing" }, { "amount": 2, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" }, { "amount": 1, - "item": "modern_industrialization:advanced_large_steam_boiler" + "ingredient": "modern_industrialization:advanced_large_steam_boiler" }, { "amount": 4, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:high_pressure_large_steam_boiler" + "id": "modern_industrialization:high_pressure_large_steam_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json index 4641f858e..215f26492 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_diesel_generator.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" }, { "amount": 2, - "tag": "c:gears/stainless_steel" + "ingredient": "#c:gears/stainless_steel" }, { "amount": 3, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 1, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_diesel_generator" + "id": "modern_industrialization:hv_diesel_generator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json index 2648c9229..f9424d5c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/hv_steam_turbine.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" }, { "amount": 2, - "item": "modern_industrialization:advanced_motor" + "ingredient": "modern_industrialization:advanced_motor" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "item": "modern_industrialization:stainless_steel_rotor" + "ingredient": "modern_industrialization:stainless_steel_rotor" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_steam_turbine" + "id": "modern_industrialization:hv_steam_turbine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json index b62bc665f..dbad5a673 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/implosion_compressor.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:advanced_motor" + "ingredient": "modern_industrialization:advanced_motor" }, { "amount": 2, - "item": "modern_industrialization:titanium_large_plate" + "ingredient": "modern_industrialization:titanium_large_plate" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 4, - "item": "modern_industrialization:blastproof_alloy_large_plate" + "ingredient": "modern_industrialization:blastproof_alloy_large_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:implosion_compressor" + "id": "modern_industrialization:implosion_compressor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json index eb1751afe..30251648f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_diesel_generator.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:large_advanced_pump" + "ingredient": "modern_industrialization:large_advanced_pump" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 2, - "item": "modern_industrialization:titanium_gear" + "ingredient": "modern_industrialization:titanium_gear" }, { "amount": 2, - "item": "modern_industrialization:large_advanced_motor" + "ingredient": "modern_industrialization:large_advanced_motor" }, { "amount": 1, - "item": "modern_industrialization:hv_diesel_generator" + "ingredient": "modern_industrialization:hv_diesel_generator" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_diesel_generator" + "id": "modern_industrialization:large_diesel_generator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json index c7c07fd91..906bd0a5d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_boiler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_plated_bricks" + "ingredient": "modern_industrialization:bronze_plated_bricks" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 1, - "item": "modern_industrialization:bronze_boiler" + "ingredient": "modern_industrialization:bronze_boiler" }, { "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_steam_boiler" + "id": "modern_industrialization:large_steam_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json index 681677ea3..82514d96f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_steam_turbine.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:hv_steam_turbine" + "ingredient": "modern_industrialization:hv_steam_turbine" }, { "amount": 2, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:stainless_steel_rotor" + "ingredient": "modern_industrialization:stainless_steel_rotor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_steam_turbine" + "id": "modern_industrialization:large_steam_turbine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json index 56d703265..7ca1858cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:steel_tank" + "ingredient": "modern_industrialization:steel_tank" }, { "amount": 2, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 2, - "item": "modern_industrialization:tin_rotor" + "ingredient": "modern_industrialization:tin_rotor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_tank" + "id": "modern_industrialization:large_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json index ff9c504a0..d3c9d5316 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/large_tank_hatch.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_tank" + "ingredient": "modern_industrialization:steel_tank" }, { "amount": 1, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:large_tank_hatch" + "id": "modern_industrialization:large_tank_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json index 7f36543dd..d58b99763 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_diesel_generator.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 2, - "tag": "c:gears/tin" + "ingredient": "#c:gears/tin" }, { "amount": 3, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lv_diesel_generator" + "id": "modern_industrialization:lv_diesel_generator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_steam_turbine.json index 23be101ea..c6fd6441f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/lv_steam_turbine.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "item": "modern_industrialization:tin_rotor" + "ingredient": "modern_industrialization:tin_rotor" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lv_steam_turbine" + "id": "modern_industrialization:lv_steam_turbine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/macerator.json index 810035f45..ad5b540cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/macerator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/macerator.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_rotary_blade" + "ingredient": "modern_industrialization:invar_rotary_blade" }, { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 2, - "item": "modern_industrialization:piston" + "ingredient": "modern_industrialization:piston" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_macerator" + "id": "modern_industrialization:electric_macerator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mixer.json index c1d41dd42..58de80244 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mixer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mixer.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" }, { "amount": 1, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "item": "modern_industrialization:tin_rotor" + "ingredient": "modern_industrialization:tin_rotor" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_mixer" + "id": "modern_industrialization:electric_mixer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_diesel_generator.json index 2cf5c9e6d..628d4bd09 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_diesel_generator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_diesel_generator.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 2, - "tag": "c:gears/aluminum" + "ingredient": "#c:gears/aluminum" }, { "amount": 3, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_diesel_generator" + "id": "modern_industrialization:mv_diesel_generator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_steam_turbine.json index e8a8cd7c2..772ffc8fc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_steam_turbine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/mv_steam_turbine.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 2, - "item": "modern_industrialization:aluminum_rotor" + "ingredient": "modern_industrialization:aluminum_rotor" }, { "amount": 2, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_steam_turbine" + "id": "modern_industrialization:mv_steam_turbine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/nuclear_reactor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/nuclear_reactor.json index fa73ec6b9..2acdef3f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/nuclear_reactor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/nuclear_reactor.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:nuclear_alloy_large_plate" + "ingredient": "modern_industrialization:nuclear_alloy_large_plate" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" }, { "amount": 2, - "item": "modern_industrialization:cadmium_control_rod" + "ingredient": "modern_industrialization:cadmium_control_rod" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nuclear_reactor" + "id": "modern_industrialization:nuclear_reactor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/packer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/packer.json index 4082f8a99..33f848853 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/packer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/packer.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "modern_industrialization:conveyor" + "ingredient": "modern_industrialization:conveyor" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_packer" + "id": "modern_industrialization:electric_packer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/plasma_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/plasma_turbine.json index 0a0cf52e8..8dcfbc71c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/plasma_turbine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/plasma_turbine.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:superconductor_coil" + "ingredient": "modern_industrialization:superconductor_coil" }, { "amount": 2, - "item": "modern_industrialization:quantum_circuit" + "ingredient": "modern_industrialization:quantum_circuit" }, { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "ingredient": "modern_industrialization:quantum_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:titanium_rotor" + "ingredient": "modern_industrialization:titanium_rotor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plasma_turbine" + "id": "modern_industrialization:plasma_turbine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/polarizer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/polarizer.json index 4215de63e..4466ef35e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/polarizer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/polarizer.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:tin_wire" + "ingredient": "modern_industrialization:tin_wire" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:inductor" + "ingredient": "modern_industrialization:inductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:polarizer" + "id": "modern_industrialization:polarizer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/pressurizer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/pressurizer.json index f82b7b7bb..e34d87857 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/pressurizer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/pressurizer.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" }, { "amount": 2, - "item": "modern_industrialization:titanium_machine_casing_pipe" + "ingredient": "modern_industrialization:titanium_machine_casing_pipe" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:pressurizer" + "id": "modern_industrialization:pressurizer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/unpacker.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/unpacker.json index 302461936..120f4548e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/unpacker.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/unpacker.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 2, - "item": "modern_industrialization:conveyor" + "ingredient": "modern_industrialization:conveyor" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_unpacker" + "id": "modern_industrialization:electric_unpacker" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/vacuum_freezer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/vacuum_freezer.json index 299eb4005..578941555 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/vacuum_freezer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/vacuum_freezer.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 3, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 2, - "item": "modern_industrialization:aluminum_large_plate" + "ingredient": "modern_industrialization:aluminum_large_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:vacuum_freezer" + "id": "modern_industrialization:vacuum_freezer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/water_pump.json index 1f4e82367..037164c09 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/water_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/water_pump.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 1, - "item": "modern_industrialization:tin_rotor" + "ingredient": "modern_industrialization:tin_rotor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_water_pump" + "id": "modern_industrialization:electric_water_pump" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/wiremill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/wiremill.json index 6a0124878..5fd69841d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/wiremill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/machine/wiremill.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 2, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 4, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electric_wiremill" + "id": "modern_industrialization:electric_wiremill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/ev_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/ev_storage_unit.json index b8a6fde09..2e8cf690e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/ev_storage_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/ev_storage_unit.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:cadmium_battery" + "ingredient": "modern_industrialization:cadmium_battery" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 2, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ev_storage_unit" + "id": "modern_industrialization:ev_storage_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/hv_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/hv_storage_unit.json index 07a102897..138ebbcc9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/hv_storage_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/hv_storage_unit.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:sodium_battery" + "ingredient": "modern_industrialization:sodium_battery" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 2, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_storage_unit" + "id": "modern_industrialization:hv_storage_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/lv_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/lv_storage_unit.json index ea748d91c..c489cf66e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/lv_storage_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/lv_storage_unit.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:redstone_battery" + "ingredient": "modern_industrialization:redstone_battery" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 2, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lv_storage_unit" + "id": "modern_industrialization:lv_storage_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/mv_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/mv_storage_unit.json index e56e86500..ef65ddfd8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/mv_storage_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/mv_storage_unit.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:silicon_battery" + "ingredient": "modern_industrialization:silicon_battery" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 2, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_storage_unit" + "id": "modern_industrialization:mv_storage_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/superconductor_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/superconductor_storage_unit.json index b946cd6cb..81ce65f65 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/superconductor_storage_unit.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/storage_unit/superconductor_storage_unit.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:plutonium_battery" + "ingredient": "modern_industrialization:plutonium_battery" }, { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "ingredient": "modern_industrialization:quantum_machine_hull" }, { "amount": 2, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_storage_unit" + "id": "modern_industrialization:superconductor_storage_unit" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/down.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/down.json index d1e7889aa..9d57d1922 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/down.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/down.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" }, { "amount": 4, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_ev_transformer" + "id": "modern_industrialization:superconductor_ev_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/up.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/up.json index 79ecc35a4..fa1cb4dd9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/up.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/ev_supra/up.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 4, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" }, { "amount": 1, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ev_superconductor_transformer" + "id": "modern_industrialization:ev_superconductor_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/down.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/down.json index 1c4bc8abb..c950d5a79 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/down.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/down.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" }, { "amount": 4, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ev_hv_transformer" + "id": "modern_industrialization:ev_hv_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/up.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/up.json index c32bd5fac..83754293f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/up.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/hv_ev/up.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 4, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_ev_transformer" + "id": "modern_industrialization:hv_ev_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/down.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/down.json index e9fc596fc..9707d2cae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/down.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/down.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 4, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_lv_transformer" + "id": "modern_industrialization:mv_lv_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/up.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/up.json index f132dc0c9..c13509224 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/up.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/lv_mv/up.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 4, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lv_mv_transformer" + "id": "modern_industrialization:lv_mv_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/down.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/down.json index ba4d6a643..fb6d1d2b1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/down.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/down.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 4, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_mv_transformer" + "id": "modern_industrialization:hv_mv_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/up.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/up.json index 73cd6791c..d480ea947 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/up.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/electric_age/transformer/mv_hv/up.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 4, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_hv_transformer" + "id": "modern_industrialization:mv_hv_transformer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/oil/oil_drilling_rig.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/oil/oil_drilling_rig.json index d2812d0cb..e0be050eb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/oil/oil_drilling_rig.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/oil/oil_drilling_rig.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:steel_large_plate" + "ingredient": "modern_industrialization:steel_large_plate" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" }, { "amount": 2, - "item": "modern_industrialization:large_pump" + "ingredient": "modern_industrialization:large_pump" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:oil_drilling_rig" + "id": "modern_industrialization:oil_drilling_rig" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/aluminum_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/aluminum_drill.json index 84805f815..fed4800bc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/aluminum_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/aluminum_drill.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_drill_head" + "ingredient": "modern_industrialization:aluminum_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "item": "modern_industrialization:pump" + "ingredient": "modern_industrialization:pump" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 1, - "item": "modern_industrialization:electronic_circuit" + "ingredient": "modern_industrialization:electronic_circuit" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_drill" + "id": "modern_industrialization:aluminum_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/bronze_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/bronze_drill.json index 6bd031796..3d1a21a4c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/bronze_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/bronze_drill.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_drill_head" + "ingredient": "modern_industrialization:bronze_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 1, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_drill" + "id": "modern_industrialization:bronze_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/copper_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/copper_drill.json index a5aca7c63..859209427 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/copper_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/copper_drill.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_drill_head" + "ingredient": "modern_industrialization:copper_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 1, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_drill" + "id": "modern_industrialization:copper_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/gold_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/gold_drill.json index 300a3a707..496cc799e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/gold_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/gold_drill.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_drill_head" + "ingredient": "modern_industrialization:gold_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 2, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:gold_drill" + "id": "modern_industrialization:gold_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/stainless_steel_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/stainless_steel_drill.json index 43c546c4b..449be2844 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/stainless_steel_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/stainless_steel_drill.json @@ -5,41 +5,41 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_drill_head" + "ingredient": "modern_industrialization:stainless_steel_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 1, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "item": "modern_industrialization:advanced_motor" + "ingredient": "modern_industrialization:advanced_motor" }, { "amount": 1, - "item": "modern_industrialization:advanced_pump" + "ingredient": "modern_industrialization:advanced_pump" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 1, - "item": "modern_industrialization:digital_circuit" + "ingredient": "modern_industrialization:digital_circuit" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_drill" + "id": "modern_industrialization:stainless_steel_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/steel_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/steel_drill.json index 53d4f301b..216b1d167 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/steel_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/steel_drill.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_drill_head" + "ingredient": "modern_industrialization:steel_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 2, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 2, - "item": "modern_industrialization:motor" + "ingredient": "modern_industrialization:motor" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:analog_circuit" + "ingredient": "modern_industrialization:analog_circuit" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:steel_drill" + "id": "modern_industrialization:steel_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/titanium_drill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/titanium_drill.json index 611a21b42..ccc5e572b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/titanium_drill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/quarry/drill/titanium_drill.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_drill_head" + "ingredient": "modern_industrialization:titanium_drill_head" }, { "amount": 2, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" }, { "amount": 2, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 2, - "item": "modern_industrialization:large_advanced_motor" + "ingredient": "modern_industrialization:large_advanced_motor" }, { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" }, { "amount": 1, - "item": "modern_industrialization:processing_unit" + "ingredient": "modern_industrialization:processing_unit" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_drill" + "id": "modern_industrialization:titanium_drill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/boiler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/boiler.json index dbaf7c7f3..a8969325e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/boiler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "ingredient": "modern_industrialization:bronze_tank" }, { "amount": 3, - "item": "modern_industrialization:fire_clay_bricks" + "ingredient": "modern_industrialization:fire_clay_bricks" }, { "amount": 1, - "item": "minecraft:furnace" + "ingredient": "minecraft:furnace" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_boiler" + "id": "modern_industrialization:bronze_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/casing_pipe.json index 726bb8eee..f09124ad8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/casing_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/casing_pipe.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_machine_casing_pipe" + "id": "modern_industrialization:bronze_machine_casing_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/compressor.json index b25119f45..72035e1c9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/compressor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/compressor.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:forge_hammer" + "ingredient": "modern_industrialization:forge_hammer" }, { "amount": 2, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "c:rods/copper" + "ingredient": "#c:rods/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_compressor" + "id": "modern_industrialization:bronze_compressor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/cutting_machine.json index fc110d4d3..6ede59812 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/cutting_machine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/cutting_machine.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:diamond" + "ingredient": "minecraft:diamond" }, { "amount": 2, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_cutting_machine" + "id": "modern_industrialization:bronze_cutting_machine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/furnace.json index c2a36a856..632ca5aed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/furnace.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 5, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 1, - "item": "minecraft:furnace" + "ingredient": "minecraft:furnace" }, { "amount": 3, - "item": "modern_industrialization:fire_clay_bricks" + "ingredient": "modern_industrialization:fire_clay_bricks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_furnace" + "id": "modern_industrialization:bronze_furnace" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/macerator.json index 289d381c4..4aac283ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/macerator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/macerator.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 2, - "item": "minecraft:diamond" + "ingredient": "minecraft:diamond" }, { "amount": 3, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_macerator" + "id": "modern_industrialization:bronze_macerator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/machine_casing.json index 98020b369..9baf3c08f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 1, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "id": "modern_industrialization:bronze_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/mixer.json index 59e928212..a13704beb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/mixer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/mixer.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 1, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_mixer" + "id": "modern_industrialization:bronze_mixer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/water_pump.json index c4296c48f..d1a0801e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/water_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/bronze/water_pump.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" }, { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "ingredient": "modern_industrialization:bronze_tank" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_water_pump" + "id": "modern_industrialization:bronze_water_pump" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/fluid_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/fluid_pipe.json index a2720ffe3..184bb0779 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/fluid_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/fluid_pipe.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 1, - "item": "minecraft:glass_pane" + "ingredient": "minecraft:glass_pane" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:fluid_pipe" + "id": "modern_industrialization:fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/item_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/item_pipe.json index cdf677dc4..b2e599fd2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/item_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/item_pipe.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:item_pipe" + "id": "modern_industrialization:item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/boiler.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/boiler.json index ef5e18bc6..ed387a4e3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/boiler.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 1, - "item": "modern_industrialization:steel_tank" + "ingredient": "modern_industrialization:steel_tank" }, { "amount": 3, - "item": "modern_industrialization:fire_clay_bricks" + "ingredient": "modern_industrialization:fire_clay_bricks" }, { "amount": 1, - "item": "minecraft:furnace" + "ingredient": "minecraft:furnace" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_boiler" + "id": "modern_industrialization:steel_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/casing_pipe.json index b6e0dd8ec..2e6fd6bfc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/casing_pipe.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/casing_pipe.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 6, - "item": "modern_industrialization:steel_curved_plate" + "ingredient": "modern_industrialization:steel_curved_plate" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_machine_casing_pipe" + "id": "modern_industrialization:steel_machine_casing_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/furnace.json index 1ab5f5aeb..3e986124e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/furnace.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 5, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 1, - "item": "minecraft:furnace" + "ingredient": "minecraft:furnace" }, { "amount": 3, - "item": "modern_industrialization:fire_clay_bricks" + "ingredient": "modern_industrialization:fire_clay_bricks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_furnace" + "id": "modern_industrialization:steel_furnace" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/machine_casing.json index fdfb833ba..f42ed8532 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/machine_casing.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/machine_casing.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 1, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "id": "modern_industrialization:steel_machine_casing" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/packer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/packer.json index 94bff0d92..e155a796b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/packer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/packer.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 3, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_packer" + "id": "modern_industrialization:steel_packer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/quarry.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/quarry.json index 982ec621b..219cb946b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/quarry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/quarry.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:steel_large_plate" + "ingredient": "modern_industrialization:steel_large_plate" }, { "amount": 1, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" }, { "amount": 1, - "item": "modern_industrialization:invar_rotary_blade" + "ingredient": "modern_industrialization:invar_rotary_blade" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steam_quarry" + "id": "modern_industrialization:steam_quarry" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/steel_upgrade.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/steel_upgrade.json index 56bef7935..701da4b22 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/steel_upgrade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/steel_upgrade.json @@ -5,33 +5,33 @@ "item_inputs": [ { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" }, { "amount": 1, - "item": "modern_industrialization:bronze_rotor" + "ingredient": "modern_industrialization:bronze_rotor" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 2, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" }, { "amount": 1, - "item": "modern_industrialization:fire_clay_bricks" + "ingredient": "modern_industrialization:fire_clay_bricks" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_upgrade" + "id": "modern_industrialization:steel_upgrade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/unpacker.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/unpacker.json index 150e82d08..3a804b4c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/unpacker.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/unpacker.json @@ -5,29 +5,29 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 3, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 2, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_unpacker" + "id": "modern_industrialization:steel_unpacker" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/wiremill.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/wiremill.json index 196d1a2a2..88ede91a6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/wiremill.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/steam_age/steel/wiremill.json @@ -5,25 +5,25 @@ "item_inputs": [ { "amount": 4, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 2, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 2, - "item": "modern_industrialization:bronze_rotor" + "ingredient": "modern_industrialization:bronze_rotor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_wiremill" + "id": "modern_industrialization:steel_wiremill" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/blast_furnace.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/blast_furnace.json index f85ec883e..218f2e613 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/blast_furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/blast_furnace.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:furnace" + "ingredient": "minecraft:furnace" }, { "amount": 5, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 3, - "item": "minecraft:smooth_stone" + "ingredient": "minecraft:smooth_stone" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:blast_furnace" + "id": "minecraft:blast_furnace" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_anvil.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_anvil.json index de814cf7a..e8765bbd0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_anvil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_anvil.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:steel_block" + "ingredient": "modern_industrialization:steel_block" }, { "amount": 4, - "item": "modern_industrialization:steel_ingot" + "ingredient": "modern_industrialization:steel_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:anvil" + "id": "minecraft:anvil" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_forge_hammer.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_forge_hammer.json index 2650c7a26..beaa87225 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_forge_hammer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_forge_hammer.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 3, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 4, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:forge_hammer" + "id": "modern_industrialization:forge_hammer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_hopper.json b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_hopper.json index 51286551b..c7df99c5d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_hopper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/assembler_generated/vanilla_recipes/steel_hopper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:chest" + "ingredient": "minecraft:chest" }, { "amount": 5, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/assembler/me_wire_direct.json deleted file mode 100644 index d37a7269b..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/assembler/me_wire_direct.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/calculation_processor.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/calculation_processor.json deleted file mode 100644 index 5b1b5f092..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/calculation_processor.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "fluid_inputs": [ - { - "amount": 90, - "fluid": "modern_industrialization:molten_redstone" - } - ], - "item_inputs": [ - { - "amount": 1, - "item": "ae2:printed_calculation_processor" - }, - { - "amount": 1, - "item": "ae2:printed_silicon" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:calculation_processor" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/craft/me_wire_direct.json deleted file mode 100644 index bb95ae26b..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/craft/me_wire_direct.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "G G", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/assembler/me_wire_direct.json deleted file mode 100644 index 450ac93d7..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/black" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:black_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_1.json deleted file mode 100644 index 4649baf03..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/black" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:black_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_8.json deleted file mode 100644 index 70285c2e3..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/black" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:black_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_direct.json deleted file mode 100644 index 1952923b0..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/black" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:black_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/mixer/me_wire_8.json deleted file mode 100644 index ff7aac8a6..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/black/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/black" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:black_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/assembler/me_wire_direct.json deleted file mode 100644 index ddae8ac90..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/blue" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:blue_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_1.json deleted file mode 100644 index cb21a0384..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/blue" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:blue_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_8.json deleted file mode 100644 index ce2e8da99..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/blue" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:blue_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_direct.json deleted file mode 100644 index cc561578a..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/blue" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:blue_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/mixer/me_wire_8.json deleted file mode 100644 index a78701d7e..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/blue/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/blue" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:blue_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/assembler/me_wire_direct.json deleted file mode 100644 index 7290f4b1d..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/brown" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:brown_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_1.json deleted file mode 100644 index e591d7826..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/brown" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:brown_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_8.json deleted file mode 100644 index ad02f4f56..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/brown" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:brown_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_direct.json deleted file mode 100644 index 3eaed9f61..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/brown" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:brown_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/mixer/me_wire_8.json deleted file mode 100644 index 3ca10c1c9..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/brown/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/brown" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:brown_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/assembler/me_wire_direct.json deleted file mode 100644 index 86ac2dcb2..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/cyan" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:cyan_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_1.json deleted file mode 100644 index 0103bed37..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/cyan" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:cyan_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_8.json deleted file mode 100644 index 8c076c0b6..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/cyan" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:cyan_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_direct.json deleted file mode 100644 index 7e5968e5a..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/cyan" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:cyan_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/mixer/me_wire_8.json deleted file mode 100644 index e23e49acd..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/cyan/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/cyan" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:cyan_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_1.json deleted file mode 100644 index 2d29baca5..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "b": { - "item": "minecraft:water_bucket" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pb" - ], - "result": { - "count": 1, - "id": "modern_industrialization:me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_8.json deleted file mode 100644 index b850f9b95..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "b": { - "item": "minecraft:water_bucket" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pbp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/mixer/me_wire.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/mixer/me_wire.json deleted file mode 100644 index fb189ffa8..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/decolor/mixer/me_wire.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "fluid_inputs": [ - { - "amount": 125, - "fluid": "minecraft:water" - } - ], - "item_inputs": [ - { - "amount": 1, - "tag": "modern_industrialization:me_wires" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "modern_industrialization:me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/assembler/me_wire_direct.json deleted file mode 100644 index 4cf2940bc..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/gray" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:gray_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_1.json deleted file mode 100644 index 690007815..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/gray" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:gray_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_8.json deleted file mode 100644 index 66f7d3888..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/gray" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:gray_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_direct.json deleted file mode 100644 index 56ad04678..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/gray" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:gray_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/mixer/me_wire_8.json deleted file mode 100644 index 1f8b0eb8d..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/gray/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/gray" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:gray_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/assembler/me_wire_direct.json deleted file mode 100644 index 3481a20ae..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/green" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:green_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_1.json deleted file mode 100644 index eef6fd50a..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/green" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:green_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_8.json deleted file mode 100644 index 29ce2121c..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/green" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:green_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_direct.json deleted file mode 100644 index 4e25eb999..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/green" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:green_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/mixer/me_wire_8.json deleted file mode 100644 index 5fa4000b4..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/green/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/green" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:green_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/assembler/me_wire_direct.json deleted file mode 100644 index de6771297..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/light_blue" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:light_blue_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_1.json deleted file mode 100644 index 77558077b..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/light_blue" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:light_blue_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_8.json deleted file mode 100644 index f7f302c5e..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/light_blue" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:light_blue_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_direct.json deleted file mode 100644 index 9a78e87b4..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/light_blue" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:light_blue_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/mixer/me_wire_8.json deleted file mode 100644 index 859316055..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_blue/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/light_blue" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:light_blue_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/assembler/me_wire_direct.json deleted file mode 100644 index 146ea4146..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/light_gray" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:light_gray_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_1.json deleted file mode 100644 index 73c64c139..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/light_gray" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:light_gray_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_8.json deleted file mode 100644 index a89bd9402..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/light_gray" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:light_gray_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_direct.json deleted file mode 100644 index 6ea5107f2..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/light_gray" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:light_gray_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/mixer/me_wire_8.json deleted file mode 100644 index 099dbe3e8..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/light_gray/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/light_gray" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:light_gray_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/assembler/me_wire_direct.json deleted file mode 100644 index 3a13c8abb..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/lime" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:lime_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_1.json deleted file mode 100644 index b53949b26..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/lime" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:lime_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_8.json deleted file mode 100644 index 0e300ba94..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/lime" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:lime_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_direct.json deleted file mode 100644 index d3a8693f1..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/lime" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:lime_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/mixer/me_wire_8.json deleted file mode 100644 index e1d76cf07..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/lime/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/lime" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:lime_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/assembler/me_wire_direct.json deleted file mode 100644 index 230063105..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/magenta" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:magenta_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_1.json deleted file mode 100644 index 3f3dba7e9..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/magenta" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:magenta_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_8.json deleted file mode 100644 index 521427754..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/magenta" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:magenta_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_direct.json deleted file mode 100644 index 6bf7e4caa..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/magenta" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:magenta_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/mixer/me_wire_8.json deleted file mode 100644 index 729b049af..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/magenta/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/magenta" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:magenta_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/assembler/me_wire_direct.json deleted file mode 100644 index a06a25a5c..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/orange" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:orange_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_1.json deleted file mode 100644 index ba47ec270..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/orange" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:orange_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_8.json deleted file mode 100644 index 373c9bf28..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/orange" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:orange_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_direct.json deleted file mode 100644 index 2d6bf1ef0..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/orange" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:orange_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/mixer/me_wire_8.json deleted file mode 100644 index ecf167ddf..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/orange/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/orange" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:orange_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/assembler/me_wire_direct.json deleted file mode 100644 index 2ae0c1d8b..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/pink" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:pink_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_1.json deleted file mode 100644 index 91b24a0ff..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/pink" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:pink_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_8.json deleted file mode 100644 index 08b5c13b2..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/pink" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:pink_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_direct.json deleted file mode 100644 index 1f82e9b12..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/pink" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:pink_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/mixer/me_wire_8.json deleted file mode 100644 index 5712832b4..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/pink/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/pink" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:pink_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/assembler/me_wire_direct.json deleted file mode 100644 index 5fb05a25a..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/purple" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:purple_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_1.json deleted file mode 100644 index 97b20adfd..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/purple" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:purple_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_8.json deleted file mode 100644 index c4a7e692e..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/purple" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:purple_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_direct.json deleted file mode 100644 index c81965b13..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/purple" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:purple_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/mixer/me_wire_8.json deleted file mode 100644 index 662420a07..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/purple/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/purple" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:purple_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/assembler/me_wire_direct.json deleted file mode 100644 index bcb6bfb6b..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/red" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:red_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_1.json deleted file mode 100644 index b20a2beaf..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/red" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:red_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_8.json deleted file mode 100644 index 892f1c365..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/red" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:red_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_direct.json deleted file mode 100644 index 50b1761a5..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/red" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:red_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/mixer/me_wire_8.json deleted file mode 100644 index 789c874dd..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/red/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/red" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:red_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/assembler/me_wire_direct.json deleted file mode 100644 index 6fc4b8ee8..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/white" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:white_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_1.json deleted file mode 100644 index 0d3faddba..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/white" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:white_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_8.json deleted file mode 100644 index bba420bd1..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/white" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:white_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_direct.json deleted file mode 100644 index f6f259d53..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/white" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:white_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/mixer/me_wire_8.json deleted file mode 100644 index a9572f4b9..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/white/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/white" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:white_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/assembler/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/assembler/me_wire_direct.json deleted file mode 100644 index f05de335e..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/assembler/me_wire_direct.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 4, - "item": "ae2:quartz_fiber" - }, - { - "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" - }, - { - "amount": 1, - "tag": "c:dyes/yellow" - }, - { - "amount": 2, - "tag": "ae2:glass_cable" - } - ], - "item_outputs": [ - { - "amount": 16, - "item": "modern_industrialization:yellow_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_1.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_1.json deleted file mode 100644 index 90012df8d..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_1.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/yellow" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "pd" - ], - "result": { - "count": 1, - "id": "modern_industrialization:yellow_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_8.json deleted file mode 100644 index bc78c2144..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "d": { - "tag": "c:dyes/yellow" - }, - "p": { - "tag": "modern_industrialization:me_wires" - } - }, - "pattern": [ - "ppp", - "pdp", - "ppp" - ], - "result": { - "count": 8, - "id": "modern_industrialization:yellow_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_direct.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_direct.json deleted file mode 100644 index f79dd76b3..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/craft/me_wire_direct.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "ae2:glass_cable" - }, - "d": { - "tag": "c:dyes/yellow" - }, - "q": { - "item": "ae2:quartz_fiber" - } - }, - "pattern": [ - "qCq", - "GdG", - "qCq" - ], - "result": { - "count": 16, - "id": "modern_industrialization:yellow_me_wire" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/mixer/me_wire_8.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/mixer/me_wire_8.json deleted file mode 100644 index 104907e66..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/dyes/yellow/mixer/me_wire_8.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "modern_industrialization:ae_compat_loaded" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 8, - "tag": "modern_industrialization:me_wires" - }, - { - "amount": 1, - "tag": "c:dyes/yellow" - } - ], - "item_outputs": [ - { - "amount": 8, - "item": "modern_industrialization:yellow_me_wire" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/electrolyzer/ae2_certus_quartz_crystal_to_ae2_charged_certus_quartz_crystal.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/electrolyzer/ae2_certus_quartz_crystal_to_ae2_charged_certus_quartz_crystal.json deleted file mode 100644 index 667211834..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/electrolyzer/ae2_certus_quartz_crystal_to_ae2_charged_certus_quartz_crystal.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:electrolyzer", - "duration": 60, - "eu": 8, - "item_inputs": [ - { - "amount": 1, - "item": "ae2:certus_quartz_crystal" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:charged_certus_quartz_crystal" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/engineering_processor.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/engineering_processor.json deleted file mode 100644 index 6d0ce76b6..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/engineering_processor.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "fluid_inputs": [ - { - "amount": 90, - "fluid": "modern_industrialization:molten_redstone" - } - ], - "item_inputs": [ - { - "amount": 1, - "item": "ae2:printed_engineering_processor" - }, - { - "amount": 1, - "item": "ae2:printed_silicon" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:engineering_processor" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/logic_processor.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/logic_processor.json deleted file mode 100644 index 322965abe..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/logic_processor.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:assembler", - "duration": 200, - "eu": 8, - "fluid_inputs": [ - { - "amount": 90, - "fluid": "modern_industrialization:molten_redstone" - } - ], - "item_inputs": [ - { - "amount": 1, - "item": "ae2:printed_logic_processor" - }, - { - "amount": 1, - "item": "ae2:printed_silicon" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:logic_processor" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/_c_gems_certus_quartz_to_ae2_certus_quartz_dust.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/_c_gems_certus_quartz_to_ae2_certus_quartz_dust.json deleted file mode 100644 index 8b022ea07..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/_c_gems_certus_quartz_to_ae2_certus_quartz_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:macerator", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 1, - "tag": "c:gems/certus_quartz" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:certus_quartz_dust" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/ae2_fluix_crystal_to_ae2_fluix_dust.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/ae2_fluix_crystal_to_ae2_fluix_dust.json deleted file mode 100644 index 719957853..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/ae2_fluix_crystal_to_ae2_fluix_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:macerator", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 1, - "item": "ae2:fluix_crystal" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:fluix_dust" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/ae2_sky_stone_block_to_ae2_sky_dust.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/ae2_sky_stone_block_to_ae2_sky_dust.json deleted file mode 100644 index 739c437d2..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/ae2_sky_stone_block_to_ae2_sky_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:macerator", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 1, - "item": "ae2:sky_stone_block" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:sky_dust" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/minecraft_ender_pearl_to_ae2_ender_dust.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/minecraft_ender_pearl_to_ae2_ender_dust.json deleted file mode 100644 index 91c7a6887..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/macerator/minecraft_ender_pearl_to_ae2_ender_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:macerator", - "duration": 100, - "eu": 2, - "item_inputs": [ - { - "amount": 1, - "item": "minecraft:ender_pearl" - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:ender_dust" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/mixer/fluix.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/mixer/fluix.json deleted file mode 100644 index 3de73363b..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/mixer/fluix.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:mixer", - "duration": 100, - "eu": 8, - "fluid_inputs": [ - { - "amount": 1000, - "fluid": "minecraft:water", - "probability": 0.0 - } - ], - "item_inputs": [ - { - "amount": 1, - "item": "minecraft:quartz" - }, - { - "amount": 1, - "item": "ae2:charged_certus_quartz_crystal" - }, - { - "amount": 1, - "item": "minecraft:redstone" - } - ], - "item_outputs": [ - { - "amount": 2, - "item": "ae2:fluix_crystal" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_calculation_processor.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_calculation_processor.json deleted file mode 100644 index c4014d752..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_calculation_processor.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:packer", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 1, - "item": "ae2:certus_quartz_crystal" - }, - { - "amount": 1, - "item": "ae2:calculation_processor_press", - "probability": 0.0 - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:printed_calculation_processor" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_engineering_processor.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_engineering_processor.json deleted file mode 100644 index 1b0040944..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_engineering_processor.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:packer", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 1, - "tag": "c:gems/diamond" - }, - { - "amount": 1, - "item": "ae2:engineering_processor_press", - "probability": 0.0 - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:printed_engineering_processor" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_logic_processor.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_logic_processor.json deleted file mode 100644 index 8cb7eb069..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_logic_processor.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:packer", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 1, - "tag": "c:ingots/gold" - }, - { - "amount": 1, - "item": "ae2:logic_processor_press", - "probability": 0.0 - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:printed_logic_processor" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_silicon.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_silicon.json deleted file mode 100644 index 4c3a40397..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_silicon.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:packer", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 1, - "tag": "c:silicon" - }, - { - "amount": 1, - "item": "ae2:silicon_press", - "probability": 0.0 - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:printed_silicon" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_silicon_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_silicon_from_ingot.json deleted file mode 100644 index 46d2376e2..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/compat/ae2/printed_silicon_from_ingot.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:mod_loaded", - "modid": "ae2" - } - ], - "type": "modern_industrialization:packer", - "duration": 200, - "eu": 8, - "item_inputs": [ - { - "amount": 1, - "item": "modern_industrialization:silicon_ingot" - }, - { - "amount": 1, - "item": "ae2:silicon_press", - "probability": 0.0 - } - ], - "item_outputs": [ - { - "amount": 1, - "item": "ae2:printed_silicon" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/acacia.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/acacia.json index 791d86dbd..65b14548e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/acacia.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/acacia.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:acacia_logs" + "ingredient": "#minecraft:acacia_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:acacia_planks" + "id": "minecraft:acacia_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/birch.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/birch.json index 6c56bde4a..8ae4404d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/birch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/birch.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:birch_logs" + "ingredient": "#minecraft:birch_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:birch_planks" + "id": "minecraft:birch_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/cherry.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/cherry.json index 76fd0f954..9fff602ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/cherry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/cherry.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:cherry_logs" + "ingredient": "#minecraft:cherry_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:cherry_planks" + "id": "minecraft:cherry_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/crimson.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/crimson.json index 1f4fd362a..a85d0a2c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/crimson.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/crimson.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:crimson_stems" + "ingredient": "#minecraft:crimson_stems" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:crimson_planks" + "id": "minecraft:crimson_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/dark_oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/dark_oak.json index 404b5f6b8..f100bfe2f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/dark_oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/dark_oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:dark_oak_logs" + "ingredient": "#minecraft:dark_oak_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:dark_oak_planks" + "id": "minecraft:dark_oak_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/jungle.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/jungle.json index b8c7d08ec..c2b3ecc3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/jungle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/jungle.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:jungle_logs" + "ingredient": "#minecraft:jungle_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:jungle_planks" + "id": "minecraft:jungle_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/mangrove.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/mangrove.json index 93773f1fa..bc92fd39d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/mangrove.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/mangrove.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:mangrove_logs" + "ingredient": "#minecraft:mangrove_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:mangrove_planks" + "id": "minecraft:mangrove_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/oak.json index f285241fc..52f2ecaf1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:oak_logs" + "ingredient": "#minecraft:oak_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:oak_planks" + "id": "minecraft:oak_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/spruce.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/spruce.json index b41019337..23b7cae61 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/spruce.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/spruce.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:spruce_logs" + "ingredient": "#minecraft:spruce_logs" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:spruce_planks" + "id": "minecraft:spruce_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/warped.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/warped.json index c27e81ec4..fe5d09f5c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/warped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/planks/warped.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "minecraft:warped_stems" + "ingredient": "#minecraft:warped_stems" } ], "item_outputs": [ { "amount": 6, - "item": "minecraft:warped_planks" + "id": "minecraft:warped_planks" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/acacia.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/acacia.json index ea9b0f7d8..76e07c2c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/acacia.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/acacia.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:acacia_planks" + "ingredient": "minecraft:acacia_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:acacia_slab" + "id": "minecraft:acacia_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/birch.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/birch.json index 7107eb4c8..ab4b80871 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/birch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/birch.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:birch_planks" + "ingredient": "minecraft:birch_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:birch_slab" + "id": "minecraft:birch_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/cherry.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/cherry.json index 3e1c84a01..e4b3b795b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/cherry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/cherry.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cherry_planks" + "ingredient": "minecraft:cherry_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:cherry_slab" + "id": "minecraft:cherry_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/crimson.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/crimson.json index 8e33442c6..88d9d4526 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/crimson.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/crimson.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:crimson_planks" + "ingredient": "minecraft:crimson_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:crimson_slab" + "id": "minecraft:crimson_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/dark_oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/dark_oak.json index 12538482d..59945761b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/dark_oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/dark_oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:dark_oak_planks" + "ingredient": "minecraft:dark_oak_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:dark_oak_slab" + "id": "minecraft:dark_oak_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/jungle.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/jungle.json index 4aa849bb3..38e002b05 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/jungle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/jungle.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:jungle_planks" + "ingredient": "minecraft:jungle_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:jungle_slab" + "id": "minecraft:jungle_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/mangrove.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/mangrove.json index 930adfadd..b8ae54dde 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/mangrove.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/mangrove.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:mangrove_planks" + "ingredient": "minecraft:mangrove_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:mangrove_slab" + "id": "minecraft:mangrove_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/oak.json index 108677181..32c864ab7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:oak_planks" + "ingredient": "minecraft:oak_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:oak_slab" + "id": "minecraft:oak_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/spruce.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/spruce.json index b31434f54..32b43e1b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/spruce.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/spruce.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:spruce_planks" + "ingredient": "minecraft:spruce_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:spruce_slab" + "id": "minecraft:spruce_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/warped.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/warped.json index 9827b07ea..46be9269c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/warped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/slabs/warped.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:warped_planks" + "ingredient": "minecraft:warped_planks" } ], "item_outputs": [ { "amount": 2, - "item": "minecraft:warped_slab" + "id": "minecraft:warped_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/acacia.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/acacia.json index cea79dce9..a54a53a37 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/acacia.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/acacia.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:acacia_log" + "ingredient": "minecraft:acacia_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_acacia_log" + "id": "minecraft:stripped_acacia_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/birch.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/birch.json index 40f91d376..cda07fd52 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/birch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/birch.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:birch_log" + "ingredient": "minecraft:birch_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_birch_log" + "id": "minecraft:stripped_birch_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/cherry.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/cherry.json index 639fd8c4c..039240a93 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/cherry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/cherry.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cherry_log" + "ingredient": "minecraft:cherry_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_cherry_log" + "id": "minecraft:stripped_cherry_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/crimson.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/crimson.json index 971f45163..ceb0a0b81 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/crimson.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/crimson.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:crimson_stem" + "ingredient": "minecraft:crimson_stem" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_crimson_stem" + "id": "minecraft:stripped_crimson_stem" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/dark_oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/dark_oak.json index 4c469ace1..86459370b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/dark_oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/dark_oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:dark_oak_log" + "ingredient": "minecraft:dark_oak_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_dark_oak_log" + "id": "minecraft:stripped_dark_oak_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/jungle.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/jungle.json index fd0e94b24..a041cacd8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/jungle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/jungle.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:jungle_log" + "ingredient": "minecraft:jungle_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_jungle_log" + "id": "minecraft:stripped_jungle_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/mangrove.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/mangrove.json index a0707eb9b..0cc4ef451 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/mangrove.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/mangrove.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:mangrove_log" + "ingredient": "minecraft:mangrove_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_mangrove_log" + "id": "minecraft:stripped_mangrove_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/oak.json index 156c4c159..d00a29125 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:oak_log" + "ingredient": "minecraft:oak_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_oak_log" + "id": "minecraft:stripped_oak_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/spruce.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/spruce.json index f0383d9d6..eb7c7bdc1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/spruce.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/spruce.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:spruce_log" + "ingredient": "minecraft:spruce_log" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_spruce_log" + "id": "minecraft:stripped_spruce_log" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/warped.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/warped.json index f996beec5..792802894 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/warped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped/warped.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:warped_stem" + "ingredient": "minecraft:warped_stem" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_warped_stem" + "id": "minecraft:stripped_warped_stem" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/acacia.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/acacia.json index 2b9173468..f91d03cd0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/acacia.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/acacia.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:acacia_wood" + "ingredient": "minecraft:acacia_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_acacia_wood" + "id": "minecraft:stripped_acacia_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/birch.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/birch.json index 03bf09fc5..dfbe828c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/birch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/birch.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:birch_wood" + "ingredient": "minecraft:birch_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_birch_wood" + "id": "minecraft:stripped_birch_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/cherry.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/cherry.json index d53b3419a..940c91e4a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/cherry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/cherry.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cherry_wood" + "ingredient": "minecraft:cherry_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_cherry_wood" + "id": "minecraft:stripped_cherry_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/crimson.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/crimson.json index 6d9f409de..e1f77be67 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/crimson.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/crimson.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:crimson_hyphae" + "ingredient": "minecraft:crimson_hyphae" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_crimson_hyphae" + "id": "minecraft:stripped_crimson_hyphae" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/dark_oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/dark_oak.json index cc43947d5..1f4dd6efb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/dark_oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/dark_oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:dark_oak_wood" + "ingredient": "minecraft:dark_oak_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_dark_oak_wood" + "id": "minecraft:stripped_dark_oak_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/jungle.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/jungle.json index cd7309b62..4cefb2478 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/jungle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/jungle.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:jungle_wood" + "ingredient": "minecraft:jungle_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_jungle_wood" + "id": "minecraft:stripped_jungle_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/mangrove.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/mangrove.json index fecb96b57..a2dd4347e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/mangrove.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/mangrove.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:mangrove_wood" + "ingredient": "minecraft:mangrove_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_mangrove_wood" + "id": "minecraft:stripped_mangrove_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/oak.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/oak.json index ad0652d5f..277a8af56 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/oak.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:oak_wood" + "ingredient": "minecraft:oak_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_oak_wood" + "id": "minecraft:stripped_oak_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/spruce.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/spruce.json index ad4f3f43d..f683a91c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/spruce.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/spruce.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:spruce_wood" + "ingredient": "minecraft:spruce_wood" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_spruce_wood" + "id": "minecraft:stripped_spruce_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/warped.json b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/warped.json index 61b44588a..8b4bf7731 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/warped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/cutting_machine/stripped_wood/warped.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:warped_hyphae" + "ingredient": "minecraft:warped_hyphae" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:stripped_warped_hyphae" + "id": "minecraft:stripped_warped_hyphae" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/fluid_pipe_stained_glass.json index 3a99000e8..6ae91c408 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:black_stained_glass_pane" + "ingredient": "minecraft:black_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:black_fluid_pipe" + "id": "modern_industrialization:black_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/item_pipe_direct.json index 95f512abe..160838438 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:black_item_pipe" + "id": "modern_industrialization:black_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_1.json index 730b0c6a5..7f164e8d5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/black" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/black", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:black_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_8.json index c3de557f6..6ff6086c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/black" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/black", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_stained_glass.json index 793e90018..4587353c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:black_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:black_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_1.json index 41e0732d4..0f1dc1efe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/black" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/black", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:black_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_8.json index e880adb0e..85bad1ae9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/black" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/black", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_direct.json index 1d2632e1e..aa381267f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/black" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/black" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/carpet.json index 23dcfe203..77199135a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:black_wool" + "ingredient": "minecraft:black_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:black_carpet" + "id": "minecraft:black_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/glass_pane.json index e76b20a1e..ccff69781 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:black_stained_glass" + "ingredient": "minecraft:black_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:black_stained_glass_pane" + "id": "minecraft:black_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/bed.json index d5f9d9941..7d07af395 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:black_bed" + "id": "minecraft:black_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/benzene.json index 0c136b1ac..d2f77237d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:black_dye" + "id": "minecraft:black_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/candle.json index 81702b080..8ab8666e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:black_candle" + "id": "minecraft:black_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/carpet.json index 640dcff37..c509b63c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:black_carpet" + "id": "minecraft:black_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/fluid_pipe_8.json index 0f9670b4b..72539c7fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:black_fluid_pipe" + "id": "modern_industrialization:black_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass.json index 77f0e3e36..3ad8a480a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:black_stained_glass" + "id": "minecraft:black_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass_pane.json index 642c68c03..1216e4fd9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:black_stained_glass_pane" + "id": "minecraft:black_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/item_pipe_8.json index 04dc7f5af..4bf91239e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:black_item_pipe" + "id": "modern_industrialization:black_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/shulker_box.json index 4739089f8..3ad3df129 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:black_shulker_box" + "id": "minecraft:black_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/synthetic_oil.json index 0162e5229..1f334a234 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:black_dye" + "id": "minecraft:black_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/terracotta.json index 5f0fcfe97..10ea69741 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:black_terracotta" + "id": "minecraft:black_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/wool.json index d1c059117..a8d831556 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/black/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/black" + "ingredient": "#c:dyes/black" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:black_wool" + "id": "minecraft:black_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/fluid_pipe_stained_glass.json index 8e0266af7..1df54d0c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:blue_stained_glass_pane" + "ingredient": "minecraft:blue_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:blue_fluid_pipe" + "id": "modern_industrialization:blue_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/item_pipe_direct.json index 950b05447..ec1b747ae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:blue_item_pipe" + "id": "modern_industrialization:blue_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_1.json index f8987eecb..82deba7c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/blue" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/blue", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:blue_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_8.json index 97eef24c4..f54761e1d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/blue" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/blue", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_stained_glass.json index 658598c21..ba20701ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:blue_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:blue_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_1.json index 4995fdee5..53543b3af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/blue" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/blue", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:blue_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_8.json index 5f985f7dd..4fe6a7937 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/blue" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/blue", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_direct.json index 9996ba9d2..0f2845857 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/blue" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/blue" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/carpet.json index b604e41b2..a496db689 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:blue_wool" + "ingredient": "minecraft:blue_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:blue_carpet" + "id": "minecraft:blue_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/glass_pane.json index eec47df8e..6126fc831 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:blue_stained_glass" + "ingredient": "minecraft:blue_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:blue_stained_glass_pane" + "id": "minecraft:blue_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/bed.json index 39c20b439..4c87bad8f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:blue_bed" + "id": "minecraft:blue_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/benzene.json index e6400d94b..064da44ed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:blue_dye" + "id": "minecraft:blue_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/candle.json index 7ddbf93da..3de0f110d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:blue_candle" + "id": "minecraft:blue_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/carpet.json index 7d336216c..2e3b0ffe9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:blue_carpet" + "id": "minecraft:blue_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/fluid_pipe_8.json index 36eaf8bf4..dbac85400 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:blue_fluid_pipe" + "id": "modern_industrialization:blue_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass.json index 02de72680..ce2ffdbb3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:blue_stained_glass" + "id": "minecraft:blue_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass_pane.json index a31acdb8b..c9a22d72d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:blue_stained_glass_pane" + "id": "minecraft:blue_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/item_pipe_8.json index 8f7427337..0daaa9869 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:blue_item_pipe" + "id": "modern_industrialization:blue_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/shulker_box.json index 1251a0ce4..21c15b2e1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:blue_shulker_box" + "id": "minecraft:blue_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/synthetic_oil.json index bf71895a4..3e6ae2f6a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:blue_dye" + "id": "minecraft:blue_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/terracotta.json index 0e245dc3f..aa2bd03de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:blue_terracotta" + "id": "minecraft:blue_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/wool.json index 48a5dd676..782f4e407 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/blue/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/blue" + "ingredient": "#c:dyes/blue" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:blue_wool" + "id": "minecraft:blue_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/fluid_pipe_stained_glass.json index 2129739b8..103cdc0f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:brown_stained_glass_pane" + "ingredient": "minecraft:brown_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:brown_fluid_pipe" + "id": "modern_industrialization:brown_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/item_pipe_direct.json index aa5f1fab2..84b09d71a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:brown_item_pipe" + "id": "modern_industrialization:brown_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_1.json index 16a92ab60..15bde9306 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/brown" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/brown", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:brown_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_8.json index 9d62c17cc..a77af122b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/brown" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/brown", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_stained_glass.json index a306b2097..60299a449 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:brown_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:brown_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_1.json index c3e3645f3..4dcb0eade 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/brown" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/brown", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:brown_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_8.json index 998b5fcc7..768f7614f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/brown" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/brown", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_direct.json index ebb34f577..faef2ce85 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/brown" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/brown" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/carpet.json index f016fdf95..12eb65eb4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:brown_wool" + "ingredient": "minecraft:brown_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:brown_carpet" + "id": "minecraft:brown_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/glass_pane.json index 11e31322b..a69073794 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:brown_stained_glass" + "ingredient": "minecraft:brown_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:brown_stained_glass_pane" + "id": "minecraft:brown_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/bed.json index a591f77ce..6836b0652 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:brown_bed" + "id": "minecraft:brown_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/benzene.json index bd7877530..de0d8b10f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:brown_dye" + "id": "minecraft:brown_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/candle.json index 70ab7ddbb..1b8a895b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:brown_candle" + "id": "minecraft:brown_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/carpet.json index 5816f7afc..d1a44ee83 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:brown_carpet" + "id": "minecraft:brown_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/fluid_pipe_8.json index bde31c723..87a64448e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:brown_fluid_pipe" + "id": "modern_industrialization:brown_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass.json index a58fb5ecd..05530a709 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:brown_stained_glass" + "id": "minecraft:brown_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass_pane.json index a545cbff4..89be55621 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:brown_stained_glass_pane" + "id": "minecraft:brown_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/item_pipe_8.json index d1a32ce47..2a05079e3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:brown_item_pipe" + "id": "modern_industrialization:brown_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/shulker_box.json index 946cc1b23..a9d90c50a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:brown_shulker_box" + "id": "minecraft:brown_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/synthetic_oil.json index e7917b4ef..d65a612a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:brown_dye" + "id": "minecraft:brown_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/terracotta.json index 5589d9c12..0b5fde3a1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:brown_terracotta" + "id": "minecraft:brown_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/wool.json index 2749da28d..57be916c6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/brown/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/brown" + "ingredient": "#c:dyes/brown" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:brown_wool" + "id": "minecraft:brown_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/fluid_pipe_stained_glass.json index 26d5f81fb..65169fc68 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:cyan_stained_glass_pane" + "ingredient": "minecraft:cyan_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:cyan_fluid_pipe" + "id": "modern_industrialization:cyan_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/item_pipe_direct.json index fb145e911..7610b19bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:cyan_item_pipe" + "id": "modern_industrialization:cyan_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_1.json index c499a98bf..10d4be66f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/cyan" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/cyan", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:cyan_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_8.json index 7cfc01681..f2db7bf33 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/cyan" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/cyan", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_stained_glass.json index 1f58fbcec..c2e4e581e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:cyan_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:cyan_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_1.json index b802ba0d0..937ef7463 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/cyan" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/cyan", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:cyan_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_8.json index 66e12bb15..1e06f662c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/cyan" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/cyan", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_direct.json index 578ab3fcc..d273938df 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/cyan" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/cyan" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/carpet.json index 553ee6912..2d8557ccc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cyan_wool" + "ingredient": "minecraft:cyan_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:cyan_carpet" + "id": "minecraft:cyan_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/glass_pane.json index 368db9e02..05dd09c85 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:cyan_stained_glass" + "ingredient": "minecraft:cyan_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:cyan_stained_glass_pane" + "id": "minecraft:cyan_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/bed.json index 2965fa4f1..d6351da88 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:cyan_bed" + "id": "minecraft:cyan_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/benzene.json index 769d4a5bc..44823fb22 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:cyan_dye" + "id": "minecraft:cyan_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/candle.json index 98cd123a4..76491192d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:cyan_candle" + "id": "minecraft:cyan_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/carpet.json index a76c02066..f7602532b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:cyan_carpet" + "id": "minecraft:cyan_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/fluid_pipe_8.json index 69381b351..d31ea5b9a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:cyan_fluid_pipe" + "id": "modern_industrialization:cyan_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass.json index 3a53667af..bdf2edbb8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:cyan_stained_glass" + "id": "minecraft:cyan_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass_pane.json index 5f6a2ab1b..0eabd4244 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:cyan_stained_glass_pane" + "id": "minecraft:cyan_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/item_pipe_8.json index 0cdbba6d9..48bbaed05 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:cyan_item_pipe" + "id": "modern_industrialization:cyan_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/shulker_box.json index b11dd313a..60f439365 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:cyan_shulker_box" + "id": "minecraft:cyan_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/synthetic_oil.json index d5150108a..11a4e9a5c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:cyan_dye" + "id": "minecraft:cyan_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/terracotta.json index e8234a698..5340881bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:cyan_terracotta" + "id": "minecraft:cyan_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/wool.json index 7710d9d08..b8616c59f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/cyan/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/cyan" + "ingredient": "#c:dyes/cyan" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:cyan_wool" + "id": "minecraft:cyan_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/fluid_pipe_stained_glass.json index 1e38590df..b95e201b8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:gray_stained_glass_pane" + "ingredient": "minecraft:gray_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:gray_fluid_pipe" + "id": "modern_industrialization:gray_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/item_pipe_direct.json index d12e971f4..c59845664 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:gray_item_pipe" + "id": "modern_industrialization:gray_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_1.json index 01739ceb5..b90f8b8a7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/gray" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/gray", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:gray_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_8.json index 177e95896..b0af055ad 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/gray" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/gray", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_stained_glass.json index 4dc60b336..fe92f814b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:gray_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:gray_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_1.json index f923fd35a..b66955620 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/gray" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/gray", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:gray_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_8.json index bd1c443d4..c3cc2eda7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/gray" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/gray", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_direct.json index f98f55138..7566f4740 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/gray" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/gray" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/carpet.json index fab4d7e23..52368dca2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:gray_wool" + "ingredient": "minecraft:gray_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:gray_carpet" + "id": "minecraft:gray_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/glass_pane.json index 722aaa784..81bd62d35 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:gray_stained_glass" + "ingredient": "minecraft:gray_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:gray_stained_glass_pane" + "id": "minecraft:gray_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/bed.json index 4ae85ec17..4b5c6d243 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gray_bed" + "id": "minecraft:gray_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/benzene.json index c3c6b70a5..e1500d245 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gray_dye" + "id": "minecraft:gray_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/candle.json index d8e52e63d..beee2b67c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gray_candle" + "id": "minecraft:gray_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/carpet.json index b9f784bc1..fe81b26db 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:gray_carpet" + "id": "minecraft:gray_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/fluid_pipe_8.json index 8bd732a44..309f2f291 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:gray_fluid_pipe" + "id": "modern_industrialization:gray_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass.json index 6bff66ee4..c1e65acdf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:gray_stained_glass" + "id": "minecraft:gray_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass_pane.json index 91463699b..e1e14a3bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:gray_stained_glass_pane" + "id": "minecraft:gray_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/item_pipe_8.json index 39053db08..7378b3234 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:gray_item_pipe" + "id": "modern_industrialization:gray_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/shulker_box.json index 27cfa3a05..15de7205f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gray_shulker_box" + "id": "minecraft:gray_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/synthetic_oil.json index 62d5030a5..7225e594e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gray_dye" + "id": "minecraft:gray_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/terracotta.json index 89b9e9755..a341b2baf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:gray_terracotta" + "id": "minecraft:gray_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/wool.json index 5bfb84930..bba679d05 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/gray/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/gray" + "ingredient": "#c:dyes/gray" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:gray_wool" + "id": "minecraft:gray_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/fluid_pipe_stained_glass.json index 47e5c5b58..67d427e6a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:green_stained_glass_pane" + "ingredient": "minecraft:green_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:green_fluid_pipe" + "id": "modern_industrialization:green_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/item_pipe_direct.json index f3e5c7519..98cb90add 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:green_item_pipe" + "id": "modern_industrialization:green_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_1.json index 476cfe643..ea6a8f192 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/green" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/green", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:green_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_8.json index fac80c8ee..80ce67e38 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/green" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/green", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_stained_glass.json index 5da9b601b..ac9050434 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:green_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:green_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_1.json index 19e7fa6da..905b564bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/green" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/green", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:green_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_8.json index ba6403141..7e7b78188 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/green" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/green", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_direct.json index 14ce15c6a..1a87b70d3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/green" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/green" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/carpet.json index 2af3e4cbe..ef7e4aea7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:green_wool" + "ingredient": "minecraft:green_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:green_carpet" + "id": "minecraft:green_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/glass_pane.json index e9951efd6..3792de65c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:green_stained_glass" + "ingredient": "minecraft:green_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:green_stained_glass_pane" + "id": "minecraft:green_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/bed.json index 453993b02..45691f3cd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:green_bed" + "id": "minecraft:green_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/benzene.json index cbb378728..780bcf092 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:green_dye" + "id": "minecraft:green_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/candle.json index 5832d622a..0e5939aa7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:green_candle" + "id": "minecraft:green_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/carpet.json index bfe95521b..761bf5113 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:green_carpet" + "id": "minecraft:green_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/fluid_pipe_8.json index b69b6bd39..55e441a32 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:green_fluid_pipe" + "id": "modern_industrialization:green_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass.json index 1a6ba7ee8..648062b66 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:green_stained_glass" + "id": "minecraft:green_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass_pane.json index 3ae1844fb..786c02160 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:green_stained_glass_pane" + "id": "minecraft:green_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/item_pipe_8.json index 8bf23bdb7..2ad697008 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:green_item_pipe" + "id": "modern_industrialization:green_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/shulker_box.json index 1864ba53d..11a66ee03 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:green_shulker_box" + "id": "minecraft:green_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/synthetic_oil.json index a31d50c1b..35f78c031 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:green_dye" + "id": "minecraft:green_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/terracotta.json index 61700529b..ddf8388af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:green_terracotta" + "id": "minecraft:green_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/wool.json index 927fc3cdf..81af7490b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/green/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/green" + "ingredient": "#c:dyes/green" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:green_wool" + "id": "minecraft:green_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/fluid_pipe_stained_glass.json index 674ea6e08..1cd9d49cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:light_blue_stained_glass_pane" + "ingredient": "minecraft:light_blue_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:light_blue_fluid_pipe" + "id": "modern_industrialization:light_blue_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/item_pipe_direct.json index cf4614ec4..b9457c7c6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:light_blue_item_pipe" + "id": "modern_industrialization:light_blue_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_1.json index a86de6f79..1d0be34d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_blue" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/light_blue", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:light_blue_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_8.json index 7e7f3c833..c384f1cfa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_blue" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/light_blue", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_stained_glass.json index a9cc39d55..7d3acbbb2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:light_blue_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:light_blue_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_1.json index 155d0c66c..32e683e68 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_blue" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/light_blue", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:light_blue_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_8.json index 4efaf8b6e..ea116bfe2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_blue" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/light_blue", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_direct.json index f20eb026b..e4588c564 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/light_blue" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/light_blue" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/carpet.json index dcee97258..ff3d1929f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:light_blue_wool" + "ingredient": "minecraft:light_blue_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:light_blue_carpet" + "id": "minecraft:light_blue_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/glass_pane.json index b20ac94e4..34bebe7be 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:light_blue_stained_glass" + "ingredient": "minecraft:light_blue_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:light_blue_stained_glass_pane" + "id": "minecraft:light_blue_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/bed.json index 55689b47f..cc247a812 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_blue_bed" + "id": "minecraft:light_blue_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/benzene.json index fbdd57131..08a0039e5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_blue_dye" + "id": "minecraft:light_blue_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/candle.json index 53c0f22b8..b466b02b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_blue_candle" + "id": "minecraft:light_blue_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/carpet.json index 5016a67fe..9dc428b16 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_blue_carpet" + "id": "minecraft:light_blue_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/fluid_pipe_8.json index f115c85a2..85ecb5477 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:light_blue_fluid_pipe" + "id": "modern_industrialization:light_blue_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass.json index ec69064ef..38b59cbc4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_blue_stained_glass" + "id": "minecraft:light_blue_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass_pane.json index 76f877175..ef198e186 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_blue_stained_glass_pane" + "id": "minecraft:light_blue_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/item_pipe_8.json index 4d25c47c3..c11c56175 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:light_blue_item_pipe" + "id": "modern_industrialization:light_blue_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/shulker_box.json index 96dc17eea..64864add4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_blue_shulker_box" + "id": "minecraft:light_blue_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/synthetic_oil.json index e5ba8def1..0535739a3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_blue_dye" + "id": "minecraft:light_blue_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/terracotta.json index 9fa09fbd5..504798b2d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_blue_terracotta" + "id": "minecraft:light_blue_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/wool.json index 9b53c4205..d80bba0f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_blue/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_blue" + "ingredient": "#c:dyes/light_blue" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_blue_wool" + "id": "minecraft:light_blue_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/fluid_pipe_stained_glass.json index cbc41676b..a706519b9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:light_gray_stained_glass_pane" + "ingredient": "minecraft:light_gray_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:light_gray_fluid_pipe" + "id": "modern_industrialization:light_gray_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/item_pipe_direct.json index 71348f8ac..824041030 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:light_gray_item_pipe" + "id": "modern_industrialization:light_gray_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_1.json index 97c9048d1..226fcca00 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_gray" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/light_gray", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:light_gray_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_8.json index 3e93a6c75..039b765eb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_gray" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/light_gray", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_stained_glass.json index ff5064818..5d215b059 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:light_gray_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:light_gray_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_1.json index 22e2975ff..06829cf27 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_gray" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/light_gray", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:light_gray_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_8.json index 78404a676..9a97d4481 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/light_gray" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/light_gray", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_direct.json index a7acc2a79..1db55eb31 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/light_gray" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/light_gray" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/carpet.json index 65aae5d3c..2eeb674bb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:light_gray_wool" + "ingredient": "minecraft:light_gray_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:light_gray_carpet" + "id": "minecraft:light_gray_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/glass_pane.json index 1aefa7fdf..ea052b868 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:light_gray_stained_glass" + "ingredient": "minecraft:light_gray_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:light_gray_stained_glass_pane" + "id": "minecraft:light_gray_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/bed.json index 5278877c2..a9ab75cb0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_gray_bed" + "id": "minecraft:light_gray_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/benzene.json index 786e4efa3..5e8297425 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_gray_dye" + "id": "minecraft:light_gray_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/candle.json index e203e932b..bb19b3060 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_gray_candle" + "id": "minecraft:light_gray_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/carpet.json index c64b44a2e..781959919 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_gray_carpet" + "id": "minecraft:light_gray_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/fluid_pipe_8.json index ec085da71..edb7b21bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:light_gray_fluid_pipe" + "id": "modern_industrialization:light_gray_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass.json index 9b9ed0b98..09bfcf7a0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_gray_stained_glass" + "id": "minecraft:light_gray_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass_pane.json index a4b95b032..0311b6211 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_gray_stained_glass_pane" + "id": "minecraft:light_gray_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/item_pipe_8.json index 497431da4..8153c596e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:light_gray_item_pipe" + "id": "modern_industrialization:light_gray_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/shulker_box.json index 192270787..406930ef7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_gray_shulker_box" + "id": "minecraft:light_gray_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/synthetic_oil.json index cd7049b0b..57bb6ff07 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:light_gray_dye" + "id": "minecraft:light_gray_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/terracotta.json index f10182ce0..c42e47f13 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_gray_terracotta" + "id": "minecraft:light_gray_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/wool.json index 7ac21af3f..6d7e1d82b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/light_gray/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/light_gray" + "ingredient": "#c:dyes/light_gray" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:light_gray_wool" + "id": "minecraft:light_gray_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/fluid_pipe_stained_glass.json index 93386e0b7..b45678b94 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:lime_stained_glass_pane" + "ingredient": "minecraft:lime_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:lime_fluid_pipe" + "id": "modern_industrialization:lime_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/item_pipe_direct.json index 840602f38..83f534b15 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:lime_item_pipe" + "id": "modern_industrialization:lime_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_1.json index 05d5b5547..3d1e9f2f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/lime" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/lime", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:lime_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_8.json index 28fcd7453..e1a0a48ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/lime" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/lime", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_stained_glass.json index 255c33801..5c51ff7bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:lime_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:lime_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_1.json index 411e8e854..c1a4a5abc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/lime" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/lime", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:lime_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_8.json index 26c41d56c..1bf6dcd0d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/lime" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/lime", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_direct.json index 27bd88130..24caee61a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/lime" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/lime" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/carpet.json index 8d165eb7c..3ab0cd91e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:lime_wool" + "ingredient": "minecraft:lime_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:lime_carpet" + "id": "minecraft:lime_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/glass_pane.json index 04e08d435..0b0161625 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:lime_stained_glass" + "ingredient": "minecraft:lime_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:lime_stained_glass_pane" + "id": "minecraft:lime_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/bed.json index b184c5782..c7b6c6146 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lime_bed" + "id": "minecraft:lime_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/benzene.json index 08194a118..84d3f68f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lime_dye" + "id": "minecraft:lime_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/candle.json index 2db8e09ab..77a5853c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lime_candle" + "id": "minecraft:lime_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/carpet.json index 23dcbbd1e..e4013a2d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:lime_carpet" + "id": "minecraft:lime_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/fluid_pipe_8.json index ad099c97f..66057e0d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:lime_fluid_pipe" + "id": "modern_industrialization:lime_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass.json index 701607c62..df8743ac2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:lime_stained_glass" + "id": "minecraft:lime_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass_pane.json index c144e9cd3..98484da06 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:lime_stained_glass_pane" + "id": "minecraft:lime_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/item_pipe_8.json index c3945a00a..75af8773a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:lime_item_pipe" + "id": "modern_industrialization:lime_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/shulker_box.json index 523ce8963..4e5511748 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lime_shulker_box" + "id": "minecraft:lime_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/synthetic_oil.json index 255dd2e5f..76ff40e27 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lime_dye" + "id": "minecraft:lime_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/terracotta.json index fd84bcf2a..a47a47229 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:lime_terracotta" + "id": "minecraft:lime_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/wool.json index c6313eb39..962d8f16f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/lime/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/lime" + "ingredient": "#c:dyes/lime" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:lime_wool" + "id": "minecraft:lime_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/fluid_pipe_stained_glass.json index 93ab85cc4..1c3ebccef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:magenta_stained_glass_pane" + "ingredient": "minecraft:magenta_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:magenta_fluid_pipe" + "id": "modern_industrialization:magenta_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/item_pipe_direct.json index a7daf47e2..46492a857 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:magenta_item_pipe" + "id": "modern_industrialization:magenta_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_1.json index 810e4061a..b9bbdfed4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/magenta" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/magenta", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:magenta_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_8.json index 0c0f9dc79..664b2abae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/magenta" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/magenta", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_stained_glass.json index d8982fe15..4593dfd6d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:magenta_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:magenta_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_1.json index ce94913b0..5c29cf8d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/magenta" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/magenta", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:magenta_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_8.json index 3c76d9804..9570aa2cd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/magenta" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/magenta", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_direct.json index 50a910a20..2e3a47464 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/magenta" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/magenta" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/carpet.json index 4ffe64ce0..833178422 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:magenta_wool" + "ingredient": "minecraft:magenta_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:magenta_carpet" + "id": "minecraft:magenta_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/glass_pane.json index 819082f9a..b1f661f73 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:magenta_stained_glass" + "ingredient": "minecraft:magenta_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:magenta_stained_glass_pane" + "id": "minecraft:magenta_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/bed.json index 8046cec9b..bd67ab22a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:magenta_bed" + "id": "minecraft:magenta_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/benzene.json index 8e4172a8a..24f1a91f1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:magenta_dye" + "id": "minecraft:magenta_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/candle.json index 624862250..9b41e9a72 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:magenta_candle" + "id": "minecraft:magenta_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/carpet.json index 9adaeb6e4..300863e29 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:magenta_carpet" + "id": "minecraft:magenta_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/fluid_pipe_8.json index 9f7198066..e9b50cb9e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:magenta_fluid_pipe" + "id": "modern_industrialization:magenta_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass.json index 55d476c86..d89ffcbd0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:magenta_stained_glass" + "id": "minecraft:magenta_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass_pane.json index 440c12d61..36bf23058 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:magenta_stained_glass_pane" + "id": "minecraft:magenta_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/item_pipe_8.json index 411651126..e0b415d37 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:magenta_item_pipe" + "id": "modern_industrialization:magenta_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/shulker_box.json index aca83ec81..507720145 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:magenta_shulker_box" + "id": "minecraft:magenta_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/synthetic_oil.json index ecac3489e..d0b2d985f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:magenta_dye" + "id": "minecraft:magenta_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/terracotta.json index e4c3c5133..eadd6a4d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:magenta_terracotta" + "id": "minecraft:magenta_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/wool.json index f870269bc..fea2b41e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/magenta/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/magenta" + "ingredient": "#c:dyes/magenta" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:magenta_wool" + "id": "minecraft:magenta_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/fluid_pipe_stained_glass.json index 451c609b7..fc2edcb8c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:orange_stained_glass_pane" + "ingredient": "minecraft:orange_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:orange_fluid_pipe" + "id": "modern_industrialization:orange_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/item_pipe_direct.json index 91b7737b1..0b4655588 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:orange_item_pipe" + "id": "modern_industrialization:orange_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_1.json index 568bbbc8f..8eaa598ff 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/orange" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/orange", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:orange_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_8.json index 19ab9d366..1c9d24813 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/orange" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/orange", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_stained_glass.json index d7add2e71..2bc24dd02 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:orange_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:orange_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_1.json index f36648e0d..75241b338 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/orange" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/orange", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:orange_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_8.json index b2afd7588..385636ce7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/orange" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/orange", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_direct.json index 8ad93c2be..0891dc978 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/orange" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/orange" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/carpet.json index c6e6e488d..be6b26f67 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:orange_wool" + "ingredient": "minecraft:orange_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:orange_carpet" + "id": "minecraft:orange_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/glass_pane.json index 599a00438..b2da086b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:orange_stained_glass" + "ingredient": "minecraft:orange_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:orange_stained_glass_pane" + "id": "minecraft:orange_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/bed.json index 6ab1d90e3..047e91be0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:orange_bed" + "id": "minecraft:orange_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/benzene.json index cc7d2743a..56f3f322d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:orange_dye" + "id": "minecraft:orange_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/candle.json index cac46a450..d00504f12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:orange_candle" + "id": "minecraft:orange_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/carpet.json index 667fbeeef..ebcff044d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:orange_carpet" + "id": "minecraft:orange_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/fluid_pipe_8.json index e8a36ff16..5e9a17cca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:orange_fluid_pipe" + "id": "modern_industrialization:orange_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass.json index 205b4b109..a9bf6a00d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:orange_stained_glass" + "id": "minecraft:orange_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass_pane.json index 602c4b186..a6d1fa208 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:orange_stained_glass_pane" + "id": "minecraft:orange_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/item_pipe_8.json index ac936ecf0..a5ac73b21 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:orange_item_pipe" + "id": "modern_industrialization:orange_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/shulker_box.json index 723d2ad1c..1b3e3f5d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:orange_shulker_box" + "id": "minecraft:orange_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/synthetic_oil.json index 86200f73c..56486b0c9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:orange_dye" + "id": "minecraft:orange_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/terracotta.json index c4614fa2e..9ad0c2cc1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:orange_terracotta" + "id": "minecraft:orange_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/wool.json index 2ddcf2ca0..846e5e2b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/orange/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/orange" + "ingredient": "#c:dyes/orange" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:orange_wool" + "id": "minecraft:orange_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/fluid_pipe_stained_glass.json index d1082f880..f0e4e7bea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:pink_stained_glass_pane" + "ingredient": "minecraft:pink_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:pink_fluid_pipe" + "id": "modern_industrialization:pink_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/item_pipe_direct.json index 1cf7760ad..21618aaf5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:pink_item_pipe" + "id": "modern_industrialization:pink_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_1.json index 4f15c065b..c8606c33d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/pink" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/pink", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:pink_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_8.json index 211d0b5fa..201806650 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/pink" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/pink", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_stained_glass.json index 3b4697d7c..2058938cf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:pink_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:pink_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_1.json index 36315da74..79f43ba0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/pink" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/pink", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:pink_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_8.json index 95144263d..0ee84daf3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/pink" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/pink", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_direct.json index 9c1c5cb22..3a226cb12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/pink" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/pink" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/carpet.json index fa12f891a..a2b8e7ea0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:pink_wool" + "ingredient": "minecraft:pink_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:pink_carpet" + "id": "minecraft:pink_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/glass_pane.json index 7be96b894..28c880c2d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:pink_stained_glass" + "ingredient": "minecraft:pink_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:pink_stained_glass_pane" + "id": "minecraft:pink_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/bed.json index cfee389cd..50198a4fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:pink_bed" + "id": "minecraft:pink_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/benzene.json index a130f2bcd..5d9a30181 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:pink_dye" + "id": "minecraft:pink_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/candle.json index 4f60584a1..ea3ba27ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:pink_candle" + "id": "minecraft:pink_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/carpet.json index ef5acde98..7526b4987 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:pink_carpet" + "id": "minecraft:pink_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/fluid_pipe_8.json index fbbccecf4..b218b26d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:pink_fluid_pipe" + "id": "modern_industrialization:pink_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass.json index dcb5696d3..a6fb09e0b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:pink_stained_glass" + "id": "minecraft:pink_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass_pane.json index 19b0f07ed..2f4e28255 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:pink_stained_glass_pane" + "id": "minecraft:pink_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/item_pipe_8.json index 33e34e8ce..d0e5eddb7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:pink_item_pipe" + "id": "modern_industrialization:pink_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/shulker_box.json index 811a13525..2aea87da2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:pink_shulker_box" + "id": "minecraft:pink_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/synthetic_oil.json index b4fe63b87..34cdceb03 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:pink_dye" + "id": "minecraft:pink_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/terracotta.json index f96158411..c6edb45f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:pink_terracotta" + "id": "minecraft:pink_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/wool.json index 2757691ab..1540ef4d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/pink/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/pink" + "ingredient": "#c:dyes/pink" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:pink_wool" + "id": "minecraft:pink_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/fluid_pipe_stained_glass.json index f2b4d0153..dc0c53714 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:purple_stained_glass_pane" + "ingredient": "minecraft:purple_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:purple_fluid_pipe" + "id": "modern_industrialization:purple_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/item_pipe_direct.json index 677e4bff1..765c8cdb1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:purple_item_pipe" + "id": "modern_industrialization:purple_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_1.json index a232be19a..17a79dc66 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/purple" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/purple", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:purple_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_8.json index d72183f97..5f60fc8e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/purple" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/purple", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_stained_glass.json index aa8a3a0db..aa9bcf766 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:purple_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:purple_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_1.json index 8614cd6c2..1dcdefe08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/purple" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/purple", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:purple_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_8.json index a231c1082..e23d20849 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/purple" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/purple", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_direct.json index bd6e6bc05..1461cda1e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/purple" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/purple" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/carpet.json index 9ef5f11d6..b99a53570 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:purple_wool" + "ingredient": "minecraft:purple_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:purple_carpet" + "id": "minecraft:purple_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/glass_pane.json index 0d606c04d..2575829d1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:purple_stained_glass" + "ingredient": "minecraft:purple_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:purple_stained_glass_pane" + "id": "minecraft:purple_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/bed.json index 0a4c70244..670bddf81 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:purple_bed" + "id": "minecraft:purple_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/benzene.json index aed202331..2dac70eaf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:purple_dye" + "id": "minecraft:purple_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/candle.json index 0112fff4f..5fb7b7a93 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:purple_candle" + "id": "minecraft:purple_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/carpet.json index e748fbd54..dcd99acfc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:purple_carpet" + "id": "minecraft:purple_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/fluid_pipe_8.json index 39fc221e4..1a9e3ed84 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:purple_fluid_pipe" + "id": "modern_industrialization:purple_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass.json index 537a27973..7ce9d4ae6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:purple_stained_glass" + "id": "minecraft:purple_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass_pane.json index 78bcfd901..004fc0ddc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:purple_stained_glass_pane" + "id": "minecraft:purple_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/item_pipe_8.json index a01883059..987bfeea8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:purple_item_pipe" + "id": "modern_industrialization:purple_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/shulker_box.json index 8c3056416..bea5c7b06 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:purple_shulker_box" + "id": "minecraft:purple_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/synthetic_oil.json index 8d4e8556d..216badae4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:purple_dye" + "id": "minecraft:purple_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/terracotta.json index 26ad7ad08..2a468e9cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:purple_terracotta" + "id": "minecraft:purple_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/wool.json index 17ccb2cc5..069bccf21 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/purple/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/purple" + "ingredient": "#c:dyes/purple" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:purple_wool" + "id": "minecraft:purple_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/fluid_pipe_stained_glass.json index 1fd58abd5..d79532aa1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:red_stained_glass_pane" + "ingredient": "minecraft:red_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:red_fluid_pipe" + "id": "modern_industrialization:red_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/item_pipe_direct.json index a0a5b42a3..d9d659b90 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:red_item_pipe" + "id": "modern_industrialization:red_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_1.json index 28aaf920f..b9e22305c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/red" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/red", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:red_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_8.json index 7302c4715..53e27777f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/red" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/red", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_stained_glass.json index a1e88b3f2..a75910e85 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:red_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:red_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_1.json index 89421d845..45f70fb7a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/red" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/red", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:red_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_8.json index d19d29eb0..31dde12c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/red" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/red", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_direct.json index c77ce3ea9..4396d41cc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/red" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/red" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/carpet.json index 934d05b30..263220f5f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:red_wool" + "ingredient": "minecraft:red_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:red_carpet" + "id": "minecraft:red_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/glass_pane.json index 6519a59dd..4af996fb5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:red_stained_glass" + "ingredient": "minecraft:red_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:red_stained_glass_pane" + "id": "minecraft:red_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/bed.json index 103471d5f..f5f0193ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:red_bed" + "id": "minecraft:red_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/benzene.json index 5c051f749..8150721c8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:red_dye" + "id": "minecraft:red_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/candle.json index 326bee806..1c2ad1b07 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:red_candle" + "id": "minecraft:red_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/carpet.json index 88bb0780c..a3482b16f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:red_carpet" + "id": "minecraft:red_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/fluid_pipe_8.json index e7924825c..c400f43a5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:red_fluid_pipe" + "id": "modern_industrialization:red_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass.json index 991f326c2..08a092e0b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:red_stained_glass" + "id": "minecraft:red_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass_pane.json index 0a2d12e6d..927b83407 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:red_stained_glass_pane" + "id": "minecraft:red_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/item_pipe_8.json index 7be30b0d3..6534c15d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:red_item_pipe" + "id": "modern_industrialization:red_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/shulker_box.json index 402d34ec7..09378283d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:red_shulker_box" + "id": "minecraft:red_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/synthetic_oil.json index d566ed4ad..660c49c6d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:red_dye" + "id": "minecraft:red_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/terracotta.json index 022bb7e4d..3df72231c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:red_terracotta" + "id": "minecraft:red_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/wool.json index 073e0f95a..bfccce5be 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/red/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/red" + "ingredient": "#c:dyes/red" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:red_wool" + "id": "minecraft:red_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/fluid_pipe_stained_glass.json index 40c5eeed8..4e432a63d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:white_stained_glass_pane" + "ingredient": "minecraft:white_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:white_fluid_pipe" + "id": "modern_industrialization:white_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/item_pipe_direct.json index f6dca48d2..e9db83ad2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:white_item_pipe" + "id": "modern_industrialization:white_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_1.json index 34290d296..d6d74af94 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/white" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/white", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:white_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_8.json index 2f943692d..3cc700d0f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/white" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/white", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_stained_glass.json index a9ed16c82..b2312f439 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:white_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:white_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_1.json index d2b922dae..17615581a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/white" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/white", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:white_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_8.json index 7bd6272cb..fa1323432 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/white" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/white", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_direct.json index b788d4d4c..9254258d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/white" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/white" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/carpet.json index 0c285f327..0aa2ed675 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:white_wool" + "ingredient": "minecraft:white_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:white_carpet" + "id": "minecraft:white_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/glass_pane.json index b59436373..797f616c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:white_stained_glass" + "ingredient": "minecraft:white_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:white_stained_glass_pane" + "id": "minecraft:white_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/bed.json index 2e75408ba..5588f1c26 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:white_bed" + "id": "minecraft:white_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/benzene.json index 22e4f9391..b589350da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:white_dye" + "id": "minecraft:white_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/candle.json index 9f77d352a..0c8a225bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:white_candle" + "id": "minecraft:white_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/carpet.json index 26925d03f..797e7fca1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:white_carpet" + "id": "minecraft:white_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/fluid_pipe_8.json index 11ef24c08..bc06ad179 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:white_fluid_pipe" + "id": "modern_industrialization:white_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass.json index bef5c3648..8d33fdd64 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:white_stained_glass" + "id": "minecraft:white_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass_pane.json index f7640934a..af5c633aa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:white_stained_glass_pane" + "id": "minecraft:white_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/item_pipe_8.json index 8d2db6413..87200442d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:white_item_pipe" + "id": "modern_industrialization:white_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/shulker_box.json index 51da3ed80..5a33bdc81 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:white_shulker_box" + "id": "minecraft:white_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/synthetic_oil.json index 1a881c960..e127884f2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:white_dye" + "id": "minecraft:white_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/terracotta.json index d2af735ba..fba8f5941 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:white_terracotta" + "id": "minecraft:white_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/wool.json index 36dd7ebd2..94f71551b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/white/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/white" + "ingredient": "#c:dyes/white" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:white_wool" + "id": "minecraft:white_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/fluid_pipe_stained_glass.json index b1c0bd33d..200f01233 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/fluid_pipe_stained_glass.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:yellow_stained_glass_pane" + "ingredient": "minecraft:yellow_stained_glass_pane" }, { "amount": 2, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" }, { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:yellow_fluid_pipe" + "id": "modern_industrialization:yellow_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/item_pipe_direct.json index 9e81c1e40..7bd8da3f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/assembler/item_pipe_direct.json @@ -5,21 +5,21 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 16, - "item": "modern_industrialization:yellow_item_pipe" + "id": "modern_industrialization:yellow_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_1.json index c84dde0b6..8ad344486 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/yellow" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/yellow", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:yellow_fluid_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_8.json index f9ed9872c..c7ff45496 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/yellow" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } + "d": "#c:dyes/yellow", + "p": "#modern_industrialization:fluid_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_stained_glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_stained_glass.json index 653797891..535363871 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_stained_glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/fluid_pipe_stained_glass.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "P": { - "item": "minecraft:yellow_stained_glass_pane" - }, - "r": { - "item": "modern_industrialization:copper_rotor" - } + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:yellow_stained_glass_pane", + "r": "modern_industrialization:copper_rotor" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_1.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_1.json index 4b3ac9a06..2e6537724 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_1.json @@ -2,18 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/yellow" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/yellow", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "pd" ], "result": { - "count": 1, "id": "modern_industrialization:yellow_item_pipe" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_8.json index 408725876..9fefb189c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_8.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "d": { - "tag": "c:dyes/yellow" - }, - "p": { - "tag": "modern_industrialization:item_pipes" - } + "d": "#c:dyes/yellow", + "p": "#modern_industrialization:item_pipes" }, "pattern": [ "ppp", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_direct.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_direct.json index bea68fb92..02e6a5809 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_direct.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/craft/item_pipe_direct.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "G": { - "tag": "c:gears/steel" - }, - "d": { - "tag": "c:dyes/yellow" - } + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel", + "d": "#c:dyes/yellow" }, "pattern": [ "CCC", diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/carpet.json index ab40f5990..91776e4ea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/carpet.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:yellow_wool" + "ingredient": "minecraft:yellow_wool" } ], "item_outputs": [ { "amount": 4, - "item": "minecraft:yellow_carpet" + "id": "minecraft:yellow_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/glass_pane.json index ffb768a42..7e229c384 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/cutting_machine/glass_pane.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 6, - "item": "minecraft:yellow_stained_glass" + "ingredient": "minecraft:yellow_stained_glass" } ], "item_outputs": [ { "amount": 16, - "item": "minecraft:yellow_stained_glass_pane" + "id": "minecraft:yellow_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/bed.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/bed.json index 414085d18..e511781ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/bed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/bed.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 1, - "tag": "minecraft:beds" + "ingredient": "#minecraft:beds" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:yellow_bed" + "id": "minecraft:yellow_bed" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/benzene.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/benzene.json index f483f7855..4fa65e6e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/benzene.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/benzene.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 25, - "fluid": "modern_industrialization:benzene" + "ingredient": "modern_industrialization:benzene" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:yellow_dye" + "id": "minecraft:yellow_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/candle.json index 6e80ae42d..21ee452ed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/candle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/candle.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 1, - "tag": "minecraft:candles" + "ingredient": "#minecraft:candles" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:yellow_candle" + "id": "minecraft:yellow_candle" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/carpet.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/carpet.json index 934309ba7..4e4949812 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/carpet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/carpet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 8, - "tag": "minecraft:wool_carpets" + "ingredient": "#minecraft:wool_carpets" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:yellow_carpet" + "id": "minecraft:yellow_carpet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/fluid_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/fluid_pipe_8.json index f7474bdae..03e0096ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/fluid_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/fluid_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:fluid_pipes" + "ingredient": "#modern_industrialization:fluid_pipes" }, { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:yellow_fluid_pipe" + "id": "modern_industrialization:yellow_fluid_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass.json index 43f2b0327..44b3be228 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 8, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:yellow_stained_glass" + "id": "minecraft:yellow_stained_glass" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass_pane.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass_pane.json index 8d7568529..f53b9764c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass_pane.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/glass_pane.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 8, - "tag": "c:glass_panes" + "ingredient": "#c:glass_panes" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:yellow_stained_glass_pane" + "id": "minecraft:yellow_stained_glass_pane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/item_pipe_8.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/item_pipe_8.json index 2d0b523fd..a17bad3c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/item_pipe_8.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/item_pipe_8.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "modern_industrialization:item_pipes" + "ingredient": "#modern_industrialization:item_pipes" }, { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:yellow_item_pipe" + "id": "modern_industrialization:yellow_item_pipe" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/shulker_box.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/shulker_box.json index 957de07cd..cecc4e92e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/shulker_box.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/shulker_box.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 1, - "tag": "c:shulker_boxes" + "ingredient": "#c:shulker_boxes" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:yellow_shulker_box" + "id": "minecraft:yellow_shulker_box" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/synthetic_oil.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/synthetic_oil.json index e11a5d1b6..0899346dc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/synthetic_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/synthetic_oil.json @@ -5,20 +5,20 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:synthetic_oil" + "ingredient": "modern_industrialization:synthetic_oil" } ], "item_inputs": [ { "amount": 1, - "probability": 0.0, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow", + "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:yellow_dye" + "id": "minecraft:yellow_dye" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/terracotta.json index 899a929b3..cc1aa0e4c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/terracotta.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/terracotta.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 8, - "tag": "minecraft:terracotta" + "ingredient": "#minecraft:terracotta" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:yellow_terracotta" + "id": "minecraft:yellow_terracotta" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/wool.json b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/wool.json index 5aa2ac24d..99b36de45 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/wool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/dyes/yellow/mixer/wool.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dyes/yellow" + "ingredient": "#c:dyes/yellow" }, { "amount": 8, - "tag": "minecraft:wool" + "ingredient": "#minecraft:wool" } ], "item_outputs": [ { "amount": 8, - "item": "minecraft:yellow_wool" + "id": "minecraft:yellow_wool" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/cadmium_battery.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/cadmium_battery.json new file mode 100644 index 000000000..8e718eb65 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/cadmium_battery.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:battery_alloy_curved_plate", + "a": "#c:plates/battery_alloy", + "c": "modern_industrialization:annealed_copper_cable", + "r": "#c:dusts/cadmium" + }, + "pattern": [ + "cac", + "BrB", + "BrB" + ], + "result": { + "id": "modern_industrialization:cadmium_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/lv_battery.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/lv_battery.json new file mode 100644 index 000000000..499b6da09 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/lv_battery.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:battery_alloy_curved_plate", + "a": "#c:plates/battery_alloy", + "c": "modern_industrialization:tin_cable", + "r": "minecraft:redstone" + }, + "pattern": [ + "cac", + "BrB", + "BrB" + ], + "result": { + "id": "modern_industrialization:redstone_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/plutonium_battery.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/plutonium_battery.json new file mode 100644 index 000000000..4da81404c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/plutonium_battery.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:battery_alloy_curved_plate", + "a": "#c:plates/battery_alloy", + "c": "modern_industrialization:superconductor_cable", + "r": "#c:dusts/plutonium" + }, + "pattern": [ + "cac", + "BrB", + "BrB" + ], + "result": { + "id": "modern_industrialization:plutonium_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit.json new file mode 100644 index 000000000..d22e495ab --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:tin_cable", + "a": "#c:plates/battery_alloy", + "c": "modern_industrialization:battery_alloy_curved_plate", + "r": "modern_industrialization:analog_circuit" + }, + "pattern": [ + "aCa", + "crc", + "aCa" + ], + "result": { + "id": "modern_industrialization:portable_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/silicon_battery.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/silicon_battery.json new file mode 100644 index 000000000..27e47c5af --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/silicon_battery.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:battery_alloy_curved_plate", + "a": "#c:plates/battery_alloy", + "c": "modern_industrialization:electrum_cable", + "r": "#c:dusts/silicon" + }, + "pattern": [ + "cac", + "BrB", + "BrB" + ], + "result": { + "id": "modern_industrialization:silicon_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/sodium_battery.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/sodium_battery.json new file mode 100644 index 000000000..1cd89f9bd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/battery/sodium_battery.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:battery_alloy_curved_plate", + "a": "#c:plates/battery_alloy", + "c": "modern_industrialization:aluminum_cable", + "r": "#c:dusts/sodium" + }, + "pattern": [ + "cac", + "BrB", + "BrB" + ], + "result": { + "id": "modern_industrialization:sodium_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json new file mode 100644 index 000000000..fea8289db --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json @@ -0,0 +1,37 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 1000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:quantum_machine_hull" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:singularity" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:quantum_circuit" + }, + { + "amount": 16, + "ingredient": "#c:plates/iridium" + }, + { + "amount": 8, + "ingredient": "modern_industrialization:large_advanced_motor" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:titanium_barrel" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:quantum_barrel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json new file mode 100644 index 000000000..f58c98485 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json @@ -0,0 +1,37 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 1000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:quantum_machine_hull" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:singularity" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:quantum_circuit" + }, + { + "amount": 16, + "ingredient": "#c:plates/iridium" + }, + { + "amount": 8, + "ingredient": "modern_industrialization:large_advanced_pump" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:titanium_tank" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:quantum_tank" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber.json new file mode 100644 index 000000000..901db55a5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:superconductor_coil", + "H": "modern_industrialization:plasma_handling_iridium_machine_casing", + "L": "modern_industrialization:nuclear_alloy_large_plate", + "h": "modern_industrialization:large_heat_exchanger" + }, + "pattern": [ + "ChC", + "LHL", + "ChC" + ], + "result": { + "id": "modern_industrialization:fusion_chamber" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing.json new file mode 100644 index 000000000..d9a28d210 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/aluminum", + "H": "modern_industrialization:basic_machine_hull" + }, + "pattern": [ + "AAA", + "AHA", + "AAA" + ], + "result": { + "id": "modern_industrialization:advanced_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/blastproof_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/blastproof_casing.json new file mode 100644 index 000000000..bf6955472 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/blastproof_casing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/blastproof_alloy" + }, + "pattern": [ + "AAA", + "A A", + "AAA" + ], + "result": { + "id": "modern_industrialization:blastproof_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks.json new file mode 100644 index 000000000..cfb36ab2a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/bronze", + "H": "modern_industrialization:fire_clay_bricks" + }, + "pattern": [ + "AAA", + "AHA", + "AAA" + ], + "result": { + "id": "modern_industrialization:bronze_plated_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing.json new file mode 100644 index 000000000..4c5c6943b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/stainless_steel", + "G": "#c:gears/stainless_steel" + }, + "pattern": [ + "AAA", + "AGA", + "AAA" + ], + "result": { + "id": "modern_industrialization:clean_stainless_steel_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing.json new file mode 100644 index 000000000..fb7baa6df --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/aluminum", + "G": "#c:gears/aluminum" + }, + "pattern": [ + "AAA", + "AGA", + "AAA" + ], + "result": { + "id": "modern_industrialization:frostproof_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing.json new file mode 100644 index 000000000..c77a849ad --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "#c:gears/invar", + "P": "#c:plates/invar" + }, + "pattern": [ + "PPP", + "PGP", + "PPP" + ], + "result": { + "id": "modern_industrialization:heatproof_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing.json new file mode 100644 index 000000000..f737d2fe7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/titanium", + "C": "#c:plates/chromium", + "H": "modern_industrialization:turbo_machine_hull" + }, + "pattern": [ + "ACA", + "CHC", + "ACA" + ], + "result": { + "id": "modern_industrialization:highly_advanced_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe.json new file mode 100644 index 000000000..10795b1c8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "modern_industrialization:plasma_handling_iridium_machine_casing", + "P": "modern_industrialization:large_advanced_pump", + "p": "modern_industrialization:iridium_curved_plate" + }, + "pattern": [ + "pPp", + "p#p", + "pPp" + ], + "result": { + "count": 2, + "id": "modern_industrialization:iridium_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_casing.json new file mode 100644 index 000000000..1b475a16b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/nuclear_alloy", + "C": "modern_industrialization:turbo_machine_hull" + }, + "pattern": [ + "AAA", + "ACA", + "AAA" + ], + "result": { + "id": "modern_industrialization:nuclear_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch.json new file mode 100644 index 000000000..4e8026124 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/nuclear_alloy", + "C": "modern_industrialization:highly_advanced_fluid_input_hatch" + }, + "pattern": [ + "AAA", + "ACA", + "AAA" + ], + "result": { + "id": "modern_industrialization:nuclear_fluid_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch.json new file mode 100644 index 000000000..e919bc5b6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/nuclear_alloy", + "C": "modern_industrialization:highly_advanced_item_input_hatch" + }, + "pattern": [ + "AAA", + "ACA", + "AAA" + ], + "result": { + "id": "modern_industrialization:nuclear_item_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing.json new file mode 100644 index 000000000..3224764e6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:nuclear_casing", + "P": "modern_industrialization:advanced_pump", + "c": "modern_industrialization:blastproof_alloy_curved_plate" + }, + "pattern": [ + "cPc", + "cCc", + "cPc" + ], + "result": { + "id": "modern_industrialization:nuclear_alloy_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing.json new file mode 100644 index 000000000..a7d516d27 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/iridium", + "C": "modern_industrialization:superconductor_coil" + }, + "pattern": [ + "AAA", + "ACA", + "AAA" + ], + "result": { + "id": "modern_industrialization:plasma_handling_iridium_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing.json new file mode 100644 index 000000000..67a458291 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/iridium", + "H": "modern_industrialization:highly_advanced_machine_hull" + }, + "pattern": [ + "AAA", + "AHA", + "AAA" + ], + "result": { + "id": "modern_industrialization:quantum_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing.json new file mode 100644 index 000000000..7c221ef58 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/titanium", + "G": "#c:gears/titanium" + }, + "pattern": [ + "AAA", + "AGA", + "AAA" + ], + "result": { + "id": "modern_industrialization:solid_titanium_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe.json new file mode 100644 index 000000000..6c4fe9bf5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "modern_industrialization:clean_stainless_steel_machine_casing", + "p": "modern_industrialization:stainless_steel_curved_plate" + }, + "pattern": [ + "p p", + "p#p", + "p p" + ], + "result": { + "count": 2, + "id": "modern_industrialization:stainless_steel_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe.json new file mode 100644 index 000000000..691ad599c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "modern_industrialization:solid_titanium_machine_casing", + "p": "modern_industrialization:titanium_curved_plate" + }, + "pattern": [ + "p p", + "p#p", + "p p" + ], + "result": { + "count": 2, + "id": "modern_industrialization:titanium_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing.json new file mode 100644 index 000000000..3555c2ca3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/stainless_steel", + "H": "modern_industrialization:advanced_machine_hull" + }, + "pattern": [ + "AAA", + "AHA", + "AAA" + ], + "result": { + "id": "modern_industrialization:turbo_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json new file mode 100644 index 000000000..5b32f0685 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 500, + "eu": 16, + "fluid_inputs": [ + { + "amount": 750, + "ingredient": "modern_industrialization:polyethylene" + } + ], + "item_inputs": [ + { + "amount": 6, + "ingredient": "modern_industrialization:aluminum_cable" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:silicon_battery" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:electronic_circuit_board" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:stainless_steel_plate" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:digital_circuit_board" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json new file mode 100644 index 000000000..10190c8b2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 1200, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1500, + "ingredient": "modern_industrialization:polyvinyl_chloride" + } + ], + "item_inputs": [ + { + "amount": 8, + "ingredient": "modern_industrialization:annealed_copper_cable" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:cadmium_battery" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:digital_circuit_board" + }, + { + "amount": 4, + "ingredient": "#c:plates/platinum" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:processing_unit_board" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json new file mode 100644 index 000000000..24ef80788 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 2000, + "eu": 64, + "fluid_inputs": [ + { + "amount": 50, + "ingredient": "modern_industrialization:helium_3" + } + ], + "item_inputs": [ + { + "amount": 12, + "ingredient": "modern_industrialization:superconductor_cable" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:plutonium_battery" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:processing_unit_board" + }, + { + "amount": 6, + "ingredient": "#c:plates/iridium" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:quantum_circuit_board" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit.json new file mode 100644 index 000000000..93adb845f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:and_gate", + "N": "modern_industrialization:not_gate", + "O": "modern_industrialization:or_gate", + "b": "modern_industrialization:digital_circuit_board", + "c": "modern_industrialization:electronic_circuit" + }, + "pattern": [ + "cOc", + "NbN", + "cAc" + ], + "result": { + "id": "modern_industrialization:digital_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit.json new file mode 100644 index 000000000..5080ea3c9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:electronic_circuit_board", + "c": "modern_industrialization:analog_circuit", + "d": "modern_industrialization:diode", + "t": "modern_industrialization:transistor" + }, + "pattern": [ + "cdc", + "tbt", + "cdc" + ], + "result": { + "id": "modern_industrialization:electronic_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board.json new file mode 100644 index 000000000..992a62783 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "#c:plates/aluminum", + "B": "modern_industrialization:redstone_battery", + "b": "modern_industrialization:analog_circuit_board", + "e": "modern_industrialization:electrum_cable" + }, + "pattern": [ + "eAe", + "AbA", + "eBe" + ], + "result": { + "id": "modern_industrialization:electronic_circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit.json new file mode 100644 index 000000000..ea9aaf202 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:analog_circuit_board", + "C": "modern_industrialization:capacitor", + "L": "modern_industrialization:inductor", + "R": "modern_industrialization:resistor", + "w": "modern_industrialization:copper_wire" + }, + "pattern": [ + "RLR", + "CBC", + "www" + ], + "result": { + "id": "modern_industrialization:analog_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board.json new file mode 100644 index 000000000..97dd50be5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": "#c:plates/copper", + "r": "modern_industrialization:rubber_sheet" + }, + "pattern": [ + "r", + "c", + "r" + ], + "result": { + "id": "modern_industrialization:analog_circuit_board" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit.json new file mode 100644 index 000000000..d49f5a1b2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:arithmetic_logic_unit", + "D": "modern_industrialization:digital_circuit", + "M": "modern_industrialization:random_access_memory", + "U": "modern_industrialization:memory_management_unit", + "b": "modern_industrialization:processing_unit_board" + }, + "pattern": [ + "DUD", + "MbM", + "DAD" + ], + "result": { + "id": "modern_industrialization:processing_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit.json new file mode 100644 index 000000000..c5f550e38 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:cooling_cell", + "P": "modern_industrialization:processing_unit", + "Q": "modern_industrialization:qubit", + "b": "modern_industrialization:quantum_circuit_board" + }, + "pattern": [ + "PCP", + "QbQ", + "PCP" + ], + "result": { + "id": "modern_industrialization:quantum_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json new file mode 100644 index 000000000..7c6238730 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 200, + "ingredient": "modern_industrialization:soldering_alloy" + } + ], + "item_inputs": [ + { + "amount": 3, + "ingredient": "#modern_industrialization:fluid_pipes" + }, + { + "amount": 3, + "ingredient": "modern_industrialization:stainless_steel_rotor" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:advanced_motor" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:advanced_pump" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json new file mode 100644 index 000000000..9fd9aa664 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 2, + "ingredient": "#c:plates/gold" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:copper_wire" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:rubber_sheet" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:capacitor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json new file mode 100644 index 000000000..b929a0270 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 400, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:cryofluid" + } + ], + "item_inputs": [ + { + "amount": 3, + "ingredient": "#modern_industrialization:fluid_pipes" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:small_heat_exchanger" + }, + { + "amount": 6, + "ingredient": "#c:plates/tin" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:cooling_cell" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json new file mode 100644 index 000000000..f3abfe7cf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 8, + "ingredient": "modern_industrialization:copper_wire" + }, + { + "amount": 1, + "ingredient": "#c:rods/steel" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:inductor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/pump.json new file mode 100644 index 000000000..db8a26286 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/pump.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:soldering_alloy" + } + ], + "item_inputs": [ + { + "amount": 3, + "ingredient": "#modern_industrialization:fluid_pipes" + }, + { + "amount": 3, + "ingredient": "modern_industrialization:tin_rotor" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:motor" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:pump" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json new file mode 100644 index 000000000..e0615ae48 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json @@ -0,0 +1,39 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 400, + "eu": 20, + "fluid_inputs": [ + { + "amount": 250, + "ingredient": "modern_industrialization:cryofluid" + }, + { + "amount": 50, + "ingredient": "modern_industrialization:tritium" + } + ], + "item_inputs": [ + { + "amount": 2, + "ingredient": "modern_industrialization:arithmetic_logic_unit" + }, + { + "amount": 2, + "ingredient": "#c:plates/carbon" + }, + { + "amount": 2, + "ingredient": "#c:glass_panes" + }, + { + "amount": 6, + "ingredient": "modern_industrialization:superconductor_wire" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:qubit" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json new file mode 100644 index 000000000..bf8dc487b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 2, + "ingredient": "modern_industrialization:copper_fine_wire" + }, + { + "amount": 1, + "ingredient": "#c:dusts/coal" + } + ], + "item_outputs": [ + { + "amount": 12, + "id": "modern_industrialization:resistor" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json new file mode 100644 index 000000000..ce280f51e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 1500, + "eu": 64, + "fluid_inputs": [ + { + "amount": 1250, + "ingredient": "modern_industrialization:argon" + } + ], + "item_inputs": [ + { + "amount": 32, + "ingredient": "#c:dusts/silicon" + }, + { + "amount": 1, + "ingredient": "#c:tiny_dusts/iridium" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:monocrystalline_silicon" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json new file mode 100644 index 000000000..897d040d5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 400, + "eu": 8, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:plates/silicon" + }, + { + "amount": 1, + "ingredient": "#c:tiny_dusts/antimony" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:silicon_n_doped_plate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json new file mode 100644 index 000000000..f5f881c9c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 400, + "eu": 8, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:plates/silicon" + }, + { + "amount": 1, + "ingredient": "#c:tiny_dusts/aluminum" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:silicon_p_doped_plate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json new file mode 100644 index 000000000..d643b3b6c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 400, + "eu": 12, + "fluid_inputs": [ + { + "amount": 250, + "ingredient": "modern_industrialization:argon" + }, + { + "amount": 500, + "ingredient": "modern_industrialization:styrene_butadiene_rubber" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:silicon_wafer" + }, + { + "amount": 1, + "ingredient": "#c:dusts/antimony" + }, + { + "amount": 1, + "ingredient": "#c:dusts/aluminum" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "modern_industrialization:random_access_memory" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor.json new file mode 100644 index 000000000..ae1fe3af6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": "modern_industrialization:aluminum_cable", + "m": "modern_industrialization:stainless_steel_rod_magnetic", + "r": "#c:rods/stainless_steel", + "w": "modern_industrialization:annealed_copper_wire" + }, + "pattern": [ + "cwr", + "wmw", + "rwc" + ], + "result": { + "id": "modern_industrialization:advanced_motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json new file mode 100644 index 000000000..0ac81c212 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:stainless_steel_bolt", + "m": "modern_industrialization:advanced_motor", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:stainless_steel_rotor" + }, + "pattern": [ + "ppp", + "rmr", + "brb" + ], + "result": { + "id": "modern_industrialization:advanced_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/air_intake.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/air_intake.json new file mode 100644 index 000000000..ebfa5cf13 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/air_intake.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "R": "modern_industrialization:stainless_steel_rotor", + "a": "#c:plates/aluminum", + "r": "#c:plates/stainless_steel" + }, + "pattern": [ + "ara", + "rRr", + "ara" + ], + "result": { + "id": "modern_industrialization:air_intake" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/and_gate.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/and_gate.json new file mode 100644 index 000000000..4169f77f8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/and_gate.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:op_amp", + "r": "modern_industrialization:resistor", + "w": "modern_industrialization:aluminum_wire" + }, + "pattern": [ + "wr ", + "wAw", + "wr " + ], + "result": { + "id": "modern_industrialization:and_gate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit.json new file mode 100644 index 000000000..953f889ce --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "N": "modern_industrialization:not_gate", + "P": "#c:plates/diamond", + "a": "modern_industrialization:and_gate", + "o": "modern_industrialization:or_gate" + }, + "pattern": [ + "NaN", + "oPo", + "NaN" + ], + "result": { + "id": "modern_industrialization:arithmetic_logic_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json new file mode 100644 index 000000000..a23075870 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "#c:plates/gold", + "S": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:copper_wire" + }, + "pattern": [ + " P ", + "wSw", + " P " + ], + "result": { + "id": "modern_industrialization:capacitor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/conveyor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/conveyor.json new file mode 100644 index 000000000..ca346a751 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/conveyor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": "modern_industrialization:tin_cable", + "m": "modern_industrialization:motor", + "r": "modern_industrialization:rubber_sheet" + }, + "pattern": [ + "rrr", + "mcm", + "rrr" + ], + "result": { + "id": "modern_industrialization:conveyor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode.json new file mode 100644 index 000000000..94bf301d4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "#c:plates/steel", + "S": "#c:plates/silicon", + "e": "modern_industrialization:electrum_fine_wire", + "g": "#c:glass_blocks" + }, + "pattern": [ + "ePg", + "eSg", + "ePg" + ], + "result": { + "id": "modern_industrialization:diode" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_doped.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_doped.json new file mode 100644 index 000000000..8698fb25b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_doped.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "#c:plates/steel", + "S": "modern_industrialization:silicon_n_doped_plate", + "e": "modern_industrialization:electrum_fine_wire", + "g": "#c:glass_blocks" + }, + "pattern": [ + "ePg", + "eSg", + "ePg" + ], + "result": { + "count": 2, + "id": "modern_industrialization:diode" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/inductor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/inductor.json new file mode 100644 index 000000000..70a310e51 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/inductor.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "r": "#c:rods/steel", + "w": "modern_industrialization:copper_wire" + }, + "pattern": [ + "www", + "wrw", + "www" + ], + "result": { + "id": "modern_industrialization:inductor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade.json new file mode 100644 index 000000000..e8aca4aed --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "#c:gears/invar", + "d": "#c:dusts/diamond" + }, + "pattern": [ + " d ", + "dGd", + " d " + ], + "result": { + "id": "modern_industrialization:invar_rotary_blade" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor.json new file mode 100644 index 000000000..aa0871eca --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:processing_unit", + "m": "modern_industrialization:advanced_motor", + "r": "#c:rods/titanium" + }, + "pattern": [ + "mmm", + "Crr", + "mmm" + ], + "result": { + "id": "modern_industrialization:large_advanced_motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump.json new file mode 100644 index 000000000..a958ba76a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:processing_unit", + "M": "modern_industrialization:large_advanced_motor", + "p": "modern_industrialization:advanced_pump", + "r": "modern_industrialization:titanium_rotor" + }, + "pattern": [ + "ppp", + "rMr", + "CrC" + ], + "result": { + "id": "modern_industrialization:large_advanced_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger.json new file mode 100644 index 000000000..bea32d85d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": "modern_industrialization:large_advanced_pump", + "R": "modern_industrialization:aluminum_rotor", + "g": "#c:gears/invar", + "h": "modern_industrialization:small_heat_exchanger" + }, + "pattern": [ + "ghg", + "RLR", + "ghg" + ], + "result": { + "id": "modern_industrialization:large_heat_exchanger" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_motor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_motor.json new file mode 100644 index 000000000..15183a6a5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_motor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "m": "modern_industrialization:motor", + "r": "#c:rods/aluminum" + }, + "pattern": [ + "mmm", + "Crr", + "mmm" + ], + "result": { + "id": "modern_industrialization:large_motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_pump.json new file mode 100644 index 000000000..89a8df03b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_pump.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "M": "modern_industrialization:large_motor", + "p": "modern_industrialization:pump", + "r": "modern_industrialization:aluminum_rotor" + }, + "pattern": [ + "ppp", + "rMr", + "CrC" + ], + "result": { + "id": "modern_industrialization:large_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit.json new file mode 100644 index 000000000..0f0345c9e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "#c:plates/emerald", + "W": "modern_industrialization:platinum_fine_wire", + "w": "modern_industrialization:silicon_wafer" + }, + "pattern": [ + "WWW", + "wPw", + "WWW" + ], + "result": { + "id": "modern_industrialization:memory_management_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/motor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/motor.json new file mode 100644 index 000000000..cf7f32f56 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/motor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": "modern_industrialization:tin_cable", + "m": "modern_industrialization:steel_rod_magnetic", + "r": "#c:rods/steel", + "w": "modern_industrialization:copper_wire" + }, + "pattern": [ + "cwr", + "wmw", + "rwc" + ], + "result": { + "id": "modern_industrialization:motor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/not_gate.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/not_gate.json new file mode 100644 index 000000000..07393006b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/not_gate.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:op_amp", + "r": "modern_industrialization:resistor", + "w": "modern_industrialization:aluminum_wire" + }, + "pattern": [ + " ", + "wAr", + " " + ], + "result": { + "id": "modern_industrialization:not_gate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/op_amp.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/op_amp.json new file mode 100644 index 000000000..3cf29122d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/op_amp.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "T": "modern_industrialization:transistor", + "d": "modern_industrialization:diode", + "r": "modern_industrialization:resistor" + }, + "pattern": [ + "rTT", + "rdr", + "rTT" + ], + "result": { + "id": "modern_industrialization:op_amp" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/or_gate.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/or_gate.json new file mode 100644 index 000000000..f786a8839 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/or_gate.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:op_amp", + "d": "modern_industrialization:diode", + "w": "modern_industrialization:aluminum_wire" + }, + "pattern": [ + " A ", + "wdw", + " A " + ], + "result": { + "id": "modern_industrialization:or_gate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module.json new file mode 100644 index 000000000..f67b163f3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:electronic_circuit_board", + "d": "modern_industrialization:diode", + "t": "modern_industrialization:transistor", + "w": "modern_industrialization:electrum_fine_wire" + }, + "pattern": [ + "wdw", + "tbt", + "wdw" + ], + "result": { + "id": "modern_industrialization:overdrive_module" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/piston.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/piston.json new file mode 100644 index 000000000..72a5c5dc2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/piston.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": "modern_industrialization:tin_cable", + "g": "#c:gears/steel", + "m": "modern_industrialization:motor", + "p": "#c:plates/steel", + "r": "#c:rods/steel" + }, + "pattern": [ + "ppp", + "crr", + "cmg" + ], + "result": { + "id": "modern_industrialization:piston" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/pump.json new file mode 100644 index 000000000..1a15f7466 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/pump.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:tin_bolt", + "m": "modern_industrialization:motor", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:tin_rotor" + }, + "pattern": [ + "ppp", + "rmr", + "brb" + ], + "result": { + "id": "modern_industrialization:pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module.json new file mode 100644 index 000000000..fa01e6abd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:analog_circuit_board", + "c": "modern_industrialization:capacitor", + "d": "minecraft:redstone", + "i": "modern_industrialization:inductor", + "r": "modern_industrialization:resistor", + "t": "minecraft:redstone_torch" + }, + "pattern": [ + "dtd", + "rcr", + "ibi" + ], + "result": { + "id": "modern_industrialization:redstone_control_module" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/resistor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/resistor.json new file mode 100644 index 000000000..065fd8dcf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/resistor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "#c:dusts/coal", + "F": "modern_industrialization:copper_fine_wire", + "P": "minecraft:paper" + }, + "pattern": [ + " P ", + "FCF", + " P " + ], + "result": { + "count": 3, + "id": "modern_industrialization:resistor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/robot_arm.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/robot_arm.json new file mode 100644 index 000000000..1225be9e4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/robot_arm.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "c": "modern_industrialization:tin_cable", + "m": "modern_industrialization:motor", + "p": "modern_industrialization:piston", + "r": "#c:rods/steel" + }, + "pattern": [ + "ccc", + "mrm", + "pCr" + ], + "result": { + "id": "modern_industrialization:robot_arm" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger.json new file mode 100644 index 000000000..de0ab0402 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": "modern_industrialization:stainless_steel_large_plate", + "P": "#c:plates/invar", + "p": "modern_industrialization:advanced_pump" + }, + "pattern": [ + "pPp", + "PLP", + "pPp" + ], + "result": { + "id": "modern_industrialization:small_heat_exchanger" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json new file mode 100644 index 000000000..eae2d78c5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "R": "minecraft:redstone", + "r": "#c:rods/steel" + }, + "pattern": [ + " RR", + "RrR", + "RR " + ], + "result": { + "id": "modern_industrialization:steel_rod_magnetic" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor.json new file mode 100644 index 000000000..ec32b6387 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "#c:plates/steel", + "S": "#c:plates/silicon", + "e": "modern_industrialization:electrum_fine_wire" + }, + "pattern": [ + " e ", + "PPP", + "SSS" + ], + "result": { + "count": 2, + "id": "modern_industrialization:transistor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped.json new file mode 100644 index 000000000..33fbe2d45 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "#c:plates/steel", + "S": "modern_industrialization:silicon_p_doped_plate", + "e": "modern_industrialization:electrum_fine_wire", + "s": "modern_industrialization:silicon_n_doped_plate" + }, + "pattern": [ + " e ", + "PPP", + "SsS" + ], + "result": { + "count": 4, + "id": "modern_industrialization:transistor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball.json new file mode 100644 index 000000000..36caa849f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": "#c:plates/iridium", + "T": "modern_industrialization:tungsten_large_plate", + "l": "#c:plates/lead" + }, + "pattern": [ + "TlT", + "lIl", + "TlT" + ], + "result": { + "id": "modern_industrialization:ultradense_metal_ball" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json new file mode 100644 index 000000000..b5bbfdbc4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:cutting_machine", + "duration": 600, + "eu": 16, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:lubricant" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:monocrystalline_silicon" + } + ], + "item_outputs": [ + { + "amount": 32, + "id": "modern_industrialization:silicon_wafer" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json new file mode 100644 index 000000000..dd725af33 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:ultradense_metal_ball" + }, + { + "amount": 64, + "ingredient": "modern_industrialization:nuke" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:singularity" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json new file mode 100644 index 000000000..0a8695af2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:polarizer", + "duration": 400, + "eu": 16, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:rods/stainless_steel" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:neodymium_dust" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:stainless_steel_rod_magnetic" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull.json new file mode 100644 index 000000000..bb340c14e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:silicon_battery", + "C": "modern_industrialization:advanced_machine_casing", + "c": "modern_industrialization:electronic_circuit", + "p": "modern_industrialization:electrum_cable" + }, + "pattern": [ + " c ", + "BCB", + "ppp" + ], + "result": { + "id": "modern_industrialization:advanced_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull.json new file mode 100644 index 000000000..af4a555bc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:cadmium_battery", + "C": "modern_industrialization:highly_advanced_machine_casing", + "c": "modern_industrialization:processing_unit", + "p": "modern_industrialization:annealed_copper_cable" + }, + "pattern": [ + " c ", + "BCB", + "ppp" + ], + "result": { + "id": "modern_industrialization:highly_advanced_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull.json new file mode 100644 index 000000000..43c516389 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:analog_circuit", + "B": "modern_industrialization:redstone_battery", + "C": "modern_industrialization:steel_machine_casing", + "c": "modern_industrialization:tin_cable" + }, + "pattern": [ + " A ", + "BCB", + "ccc" + ], + "result": { + "id": "modern_industrialization:basic_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull.json new file mode 100644 index 000000000..fdadfcc96 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:plutonium_battery", + "C": "modern_industrialization:quantum_machine_casing", + "c": "modern_industrialization:quantum_circuit", + "p": "modern_industrialization:superconductor_cable" + }, + "pattern": [ + " c ", + "BCB", + "ppp" + ], + "result": { + "id": "modern_industrialization:quantum_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull.json new file mode 100644 index 000000000..568697680 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:sodium_battery", + "C": "modern_industrialization:turbo_machine_casing", + "c": "modern_industrialization:digital_circuit", + "p": "modern_industrialization:aluminum_cable" + }, + "pattern": [ + " c ", + "BCB", + "ppp" + ], + "result": { + "id": "modern_industrialization:turbo_machine_hull" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler.json new file mode 100644 index 000000000..368d36072 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:large_steam_boiler", + "L": "modern_industrialization:large_pump", + "P": "modern_industrialization:pump", + "c": "modern_industrialization:electronic_circuit" + }, + "pattern": [ + "PcP", + "LBL", + "PcP" + ], + "result": { + "id": "modern_industrialization:advanced_large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/assembler.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/assembler.json new file mode 100644 index 000000000..fc3266920 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/assembler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:robot_arm", + "C": "modern_industrialization:conveyor", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:analog_circuit" + }, + "pattern": [ + "AcA", + "CHC", + "AcA" + ], + "result": { + "id": "modern_industrialization:assembler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json new file mode 100644 index 000000000..b7c529e82 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 8000, + "eu": 32, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:uu_matter" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:quantum_machine_hull" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:quantum_upgrade" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:quantum_circuit" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:replicator" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/centrifuge.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/centrifuge.json new file mode 100644 index 000000000..a5026fc7f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/centrifuge.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "H": "modern_industrialization:basic_machine_hull", + "P": "modern_industrialization:large_pump", + "m": "modern_industrialization:large_motor", + "p": "modern_industrialization:electrum_cable" + }, + "pattern": [ + "mPm", + "pHp", + "mCm" + ], + "result": { + "id": "modern_industrialization:centrifuge" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/chemical_reactor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/chemical_reactor.json new file mode 100644 index 000000000..c51e3c47b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/chemical_reactor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "H": "modern_industrialization:basic_machine_hull", + "f": "modern_industrialization:aluminum_rotor", + "g": "#c:glass_blocks", + "m": "modern_industrialization:large_pump", + "p": "modern_industrialization:electrum_cable" + }, + "pattern": [ + "gmg", + "fHf", + "CpC" + ], + "result": { + "id": "modern_industrialization:chemical_reactor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/compressor.json new file mode 100644 index 000000000..5a6f5646e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/compressor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:tin_cable", + "p": "modern_industrialization:piston" + }, + "pattern": [ + "pCp", + "cHc", + "pCp" + ], + "result": { + "id": "modern_industrialization:electric_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_chest.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_chest.json new file mode 100644 index 000000000..882f2eb29 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_chest.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:steel_machine_casing", + "c": "modern_industrialization:analog_circuit", + "h": "minecraft:hopper", + "m": "modern_industrialization:motor" + }, + "pattern": [ + "chc", + "mCm", + "chc" + ], + "result": { + "count": 4, + "id": "modern_industrialization:configurable_chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_tank.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_tank.json new file mode 100644 index 000000000..787f6c663 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_tank.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:steel_machine_casing", + "c": "modern_industrialization:analog_circuit", + "p": "modern_industrialization:pump", + "t": "modern_industrialization:aluminum_tank" + }, + "pattern": [ + "ctc", + "pCp", + "ctc" + ], + "result": { + "count": 4, + "id": "modern_industrialization:configurable_tank" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/cutting_machine.json new file mode 100644 index 000000000..d94c9541a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/cutting_machine.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:conveyor", + "d": "modern_industrialization:invar_rotary_blade", + "g": "#c:glass_blocks", + "m": "modern_industrialization:motor" + }, + "pattern": [ + "gdg", + "mHm", + "CcC" + ], + "result": { + "id": "modern_industrialization:electric_cutting_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/distillation_tower.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/distillation_tower.json new file mode 100644 index 000000000..7ff05220d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/distillation_tower.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:digital_circuit", + "H": "modern_industrialization:turbo_machine_hull", + "d": "modern_industrialization:distillery", + "p": "modern_industrialization:advanced_pump" + }, + "pattern": [ + "pdp", + "CHC", + "pdp" + ], + "result": { + "id": "modern_industrialization:distillation_tower" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/distillery.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/distillery.json new file mode 100644 index 000000000..9d9a9f32b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/distillery.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "H": "modern_industrialization:basic_machine_hull", + "f": "#modern_industrialization:fluid_pipes", + "g": "#c:glass_blocks", + "m": "modern_industrialization:large_pump", + "p": "modern_industrialization:electrum_cable" + }, + "pattern": [ + "gfg", + "mHm", + "CpC" + ], + "result": { + "id": "modern_industrialization:distillery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace.json new file mode 100644 index 000000000..edd1d495f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:cupronickel_wire_magnetic", + "F": "minecraft:blast_furnace", + "H": "modern_industrialization:basic_machine_hull" + }, + "pattern": [ + "CCC", + "CHC", + "CFC" + ], + "result": { + "id": "modern_industrialization:electric_blast_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electric_quarry.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electric_quarry.json new file mode 100644 index 000000000..43b2b8589 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electric_quarry.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:robot_arm", + "C": "modern_industrialization:advanced_machine_hull", + "G": "modern_industrialization:electronic_circuit", + "L": "modern_industrialization:large_motor", + "P": "modern_industrialization:steam_quarry" + }, + "pattern": [ + "LAL", + "GCG", + "LPL" + ], + "result": { + "id": "modern_industrialization:electric_quarry" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electrolyzer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electrolyzer.json new file mode 100644 index 000000000..397addfa4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/electrolyzer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "H": "modern_industrialization:basic_machine_hull", + "P": "modern_industrialization:large_pump", + "c": "modern_industrialization:cupronickel_wire_magnetic", + "r": "#c:rods/aluminum" + }, + "pattern": [ + "cCc", + "rHr", + "cPc" + ], + "result": { + "id": "modern_industrialization:electrolyzer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/furnace.json new file mode 100644 index 000000000..cadcb8936 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/furnace.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:tin_cable", + "w": "modern_industrialization:cupronickel_wire_magnetic" + }, + "pattern": [ + "wCw", + "wHw", + "cCc" + ], + "result": { + "id": "modern_industrialization:electric_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/fusion_reactor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/fusion_reactor.json new file mode 100644 index 000000000..958853d1e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/fusion_reactor.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:fusion_chamber", + "H": "modern_industrialization:quantum_machine_hull", + "Q": "modern_industrialization:quantum_circuit" + }, + "pattern": [ + "CCC", + "QHQ", + "CCC" + ], + "result": { + "id": "modern_industrialization:fusion_reactor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/heat_exchanger.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/heat_exchanger.json new file mode 100644 index 000000000..e5e13e6d5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/heat_exchanger.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "F": "modern_industrialization:frostproof_machine_casing", + "H": "modern_industrialization:heatproof_machine_casing", + "P": "modern_industrialization:stainless_steel_machine_casing_pipe", + "h": "modern_industrialization:turbo_machine_hull", + "p": "modern_industrialization:small_heat_exchanger" + }, + "pattern": [ + "FpH", + "PhP", + "FpH" + ], + "result": { + "id": "modern_industrialization:heat_exchanger" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler.json new file mode 100644 index 000000000..bd0f0ac74 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:high_pressure_large_steam_boiler", + "L": "modern_industrialization:large_pump", + "c": "modern_industrialization:processing_unit", + "f": "modern_industrialization:large_advanced_pump" + }, + "pattern": [ + "LcL", + "fBf", + "LcL" + ], + "result": { + "id": "modern_industrialization:high_pressure_advanced_large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler.json new file mode 100644 index 000000000..00d8bd8c8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:advanced_large_steam_boiler", + "P": "modern_industrialization:clean_stainless_steel_machine_casing", + "c": "modern_industrialization:digital_circuit", + "f": "modern_industrialization:advanced_pump" + }, + "pattern": [ + "fcf", + "PBP", + "fcf" + ], + "result": { + "id": "modern_industrialization:high_pressure_large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator.json new file mode 100644 index 000000000..0b7065cf7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:digital_circuit", + "G": "#c:gears/stainless_steel", + "H": "modern_industrialization:turbo_machine_hull", + "P": "modern_industrialization:advanced_pump", + "c": "modern_industrialization:aluminum_cable" + }, + "pattern": [ + "PCP", + "GHG", + "ccc" + ], + "result": { + "id": "modern_industrialization:hv_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine.json new file mode 100644 index 000000000..fdf51f1c5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:digital_circuit", + "H": "modern_industrialization:turbo_machine_hull", + "c": "modern_industrialization:aluminum_cable", + "m": "modern_industrialization:advanced_motor", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:stainless_steel_rotor" + }, + "pattern": [ + "pCp", + "rHr", + "mcm" + ], + "result": { + "id": "modern_industrialization:hv_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/implosion_compressor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/implosion_compressor.json new file mode 100644 index 000000000..4dac06f9f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/implosion_compressor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:blastproof_alloy_large_plate", + "H": "modern_industrialization:turbo_machine_hull", + "T": "modern_industrialization:titanium_large_plate", + "m": "modern_industrialization:advanced_motor" + }, + "pattern": [ + "BmB", + "THT", + "BmB" + ], + "result": { + "id": "modern_industrialization:implosion_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator.json new file mode 100644 index 000000000..90da5d96b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "modern_industrialization:titanium_gear", + "H": "modern_industrialization:highly_advanced_machine_hull", + "c": "modern_industrialization:processing_unit", + "e": "modern_industrialization:hv_diesel_generator", + "m": "modern_industrialization:large_advanced_motor", + "p": "modern_industrialization:large_advanced_pump" + }, + "pattern": [ + "pcp", + "GHG", + "mem" + ], + "result": { + "id": "modern_industrialization:large_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler.json new file mode 100644 index 000000000..74eb28923 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:bronze_boiler", + "P": "modern_industrialization:bronze_plated_bricks", + "c": "modern_industrialization:analog_circuit", + "f": "modern_industrialization:bronze_curved_plate" + }, + "pattern": [ + "PcP", + "fBf", + "PcP" + ], + "result": { + "id": "modern_industrialization:large_steam_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine.json new file mode 100644 index 000000000..b41c71566 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:turbo_machine_hull", + "R": "modern_industrialization:stainless_steel_rotor", + "p": "modern_industrialization:advanced_pump", + "t": "modern_industrialization:hv_steam_turbine" + }, + "pattern": [ + "tpt", + "RHR", + "tpt" + ], + "result": { + "id": "modern_industrialization:large_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank.json new file mode 100644 index 000000000..39db7221f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "R": "modern_industrialization:tin_rotor", + "S": "modern_industrialization:steel_machine_casing", + "p": "modern_industrialization:pump", + "t": "modern_industrialization:steel_tank" + }, + "pattern": [ + "tpt", + "RSR", + "tpt" + ], + "result": { + "id": "modern_industrialization:large_tank" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch.json new file mode 100644 index 000000000..966446937 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "modern_industrialization:steel_machine_casing", + "p": "modern_industrialization:pump", + "t": "modern_industrialization:steel_tank" + }, + "pattern": [ + "t", + "p", + "S" + ], + "result": { + "id": "modern_industrialization:large_tank_hatch" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator.json new file mode 100644 index 000000000..7cc19ee41 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "G": "#c:gears/tin", + "H": "modern_industrialization:basic_machine_hull", + "P": "modern_industrialization:pump", + "c": "modern_industrialization:tin_cable" + }, + "pattern": [ + "PCP", + "GHG", + "ccc" + ], + "result": { + "id": "modern_industrialization:lv_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine.json new file mode 100644 index 000000000..4c5bd6342 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:tin_cable", + "m": "modern_industrialization:motor", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:tin_rotor" + }, + "pattern": [ + "pCp", + "rHr", + "mcm" + ], + "result": { + "id": "modern_industrialization:lv_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/macerator.json new file mode 100644 index 000000000..bc8c930b5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/macerator.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:tin_cable", + "d": "modern_industrialization:invar_rotary_blade", + "m": "modern_industrialization:motor", + "p": "modern_industrialization:piston" + }, + "pattern": [ + "pdp", + "mHm", + "CcC" + ], + "result": { + "id": "modern_industrialization:electric_macerator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mixer.json new file mode 100644 index 000000000..d2b884fdc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mixer.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "g": "#c:glass_blocks", + "m": "modern_industrialization:motor", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:tin_rotor" + }, + "pattern": [ + "gmg", + "rHr", + "CpC" + ], + "result": { + "id": "modern_industrialization:electric_mixer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator.json new file mode 100644 index 000000000..58548d6dc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "G": "#c:gears/aluminum", + "H": "modern_industrialization:advanced_machine_hull", + "P": "modern_industrialization:large_pump", + "c": "modern_industrialization:electrum_cable" + }, + "pattern": [ + "PCP", + "GHG", + "ccc" + ], + "result": { + "id": "modern_industrialization:mv_diesel_generator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine.json new file mode 100644 index 000000000..1029e1236 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:advanced_machine_hull", + "c": "modern_industrialization:electronic_circuit", + "e": "modern_industrialization:electrum_cable", + "m": "modern_industrialization:large_motor", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:aluminum_rotor" + }, + "pattern": [ + "pcp", + "rHr", + "mem" + ], + "result": { + "id": "modern_industrialization:mv_steam_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor.json new file mode 100644 index 000000000..6816edc5c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:nuclear_alloy_large_plate", + "C": "modern_industrialization:highly_advanced_machine_hull", + "R": "modern_industrialization:cadmium_control_rod", + "c": "modern_industrialization:processing_unit" + }, + "pattern": [ + "AcA", + "RCR", + "AcA" + ], + "result": { + "id": "modern_industrialization:nuclear_reactor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/packer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/packer.json new file mode 100644 index 000000000..073ab41b1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/packer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": "modern_industrialization:robot_arm", + "C": "modern_industrialization:conveyor", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:analog_circuit", + "p": "modern_industrialization:tin_cable" + }, + "pattern": [ + "AcA", + "CHC", + "pcp" + ], + "result": { + "id": "modern_industrialization:electric_packer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/plasma_turbine.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/plasma_turbine.json new file mode 100644 index 000000000..63b50f4af --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/plasma_turbine.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:quantum_machine_hull", + "R": "modern_industrialization:titanium_rotor", + "p": "modern_industrialization:quantum_circuit", + "t": "modern_industrialization:superconductor_coil" + }, + "pattern": [ + "tpt", + "RHR", + "tpt" + ], + "result": { + "id": "modern_industrialization:plasma_turbine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/polarizer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/polarizer.json new file mode 100644 index 000000000..a67f585b6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/polarizer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:basic_machine_hull", + "L": "modern_industrialization:inductor", + "p": "modern_industrialization:tin_cable", + "w": "modern_industrialization:tin_wire" + }, + "pattern": [ + "wLw", + "pHp", + "wLw" + ], + "result": { + "id": "modern_industrialization:polarizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/pressurizer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/pressurizer.json new file mode 100644 index 000000000..3664520d1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/pressurizer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:aluminum_cable", + "H": "modern_industrialization:turbo_machine_hull", + "P": "modern_industrialization:titanium_machine_casing_pipe", + "c": "modern_industrialization:digital_circuit", + "p": "modern_industrialization:advanced_pump" + }, + "pattern": [ + "pcp", + "PHP", + "pCp" + ], + "result": { + "id": "modern_industrialization:pressurizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/unpacker.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/unpacker.json new file mode 100644 index 000000000..e7c31e6f7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/unpacker.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:conveyor", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:analog_circuit", + "m": "modern_industrialization:motor", + "p": "modern_industrialization:tin_cable" + }, + "pattern": [ + "mcm", + "CHC", + "pcp" + ], + "result": { + "id": "modern_industrialization:electric_unpacker" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer.json new file mode 100644 index 000000000..73f931c58 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "H": "modern_industrialization:advanced_machine_hull", + "P": "modern_industrialization:large_pump", + "p": "modern_industrialization:aluminum_large_plate" + }, + "pattern": [ + "PPP", + "CHC", + "pCp" + ], + "result": { + "id": "modern_industrialization:vacuum_freezer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/water_pump.json new file mode 100644 index 000000000..c571096cc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/water_pump.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:basic_machine_hull", + "P": "modern_industrialization:pump", + "c": "modern_industrialization:analog_circuit", + "f": "#modern_industrialization:fluid_pipes", + "p": "modern_industrialization:tin_cable", + "r": "modern_industrialization:tin_rotor" + }, + "pattern": [ + "frf", + "PHP", + "pcp" + ], + "result": { + "id": "modern_industrialization:electric_water_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/wiremill.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/wiremill.json new file mode 100644 index 000000000..16f6d048c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/machine/wiremill.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "H": "modern_industrialization:basic_machine_hull", + "c": "modern_industrialization:tin_cable", + "m": "modern_industrialization:motor" + }, + "pattern": [ + "mcm", + "CHC", + "mcm" + ], + "result": { + "id": "modern_industrialization:electric_wiremill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit.json new file mode 100644 index 000000000..682dce3a3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:highly_advanced_machine_hull", + "L": "#c:plates/battery_alloy", + "b": "modern_industrialization:cadmium_battery" + }, + "pattern": [ + "bbb", + "LHL", + "bbb" + ], + "result": { + "id": "modern_industrialization:ev_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit.json new file mode 100644 index 000000000..34ae85fb1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:turbo_machine_hull", + "L": "#c:plates/battery_alloy", + "b": "modern_industrialization:sodium_battery" + }, + "pattern": [ + "bbb", + "LHL", + "bbb" + ], + "result": { + "id": "modern_industrialization:hv_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit.json new file mode 100644 index 000000000..fa64a9043 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:basic_machine_hull", + "L": "#c:plates/battery_alloy", + "b": "modern_industrialization:redstone_battery" + }, + "pattern": [ + "bbb", + "LHL", + "bbb" + ], + "result": { + "id": "modern_industrialization:lv_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit.json new file mode 100644 index 000000000..3315b6984 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:advanced_machine_hull", + "L": "#c:plates/battery_alloy", + "b": "modern_industrialization:silicon_battery" + }, + "pattern": [ + "bbb", + "LHL", + "bbb" + ], + "result": { + "id": "modern_industrialization:mv_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit.json new file mode 100644 index 000000000..4337779b5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:quantum_machine_hull", + "L": "#c:plates/battery_alloy", + "b": "modern_industrialization:plutonium_battery" + }, + "pattern": [ + "bbb", + "LHL", + "bbb" + ], + "result": { + "id": "modern_industrialization:superconductor_storage_unit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down.json new file mode 100644 index 000000000..b0e7cbf90 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:highly_advanced_machine_hull", + "I": "modern_industrialization:superconductor_cable", + "O": "modern_industrialization:annealed_copper_cable" + }, + "pattern": [ + " OO", + "IH ", + " OO" + ], + "result": { + "id": "modern_industrialization:superconductor_ev_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json new file mode 100644 index 000000000..b9cb28435 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:superconductor_ev_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:ev_superconductor_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up.json new file mode 100644 index 000000000..5440eb193 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:highly_advanced_machine_hull", + "I": "modern_industrialization:annealed_copper_cable", + "O": "modern_industrialization:superconductor_cable" + }, + "pattern": [ + "II ", + " HO", + "II " + ], + "result": { + "id": "modern_industrialization:ev_superconductor_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json new file mode 100644 index 000000000..1ec7928fa --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:ev_superconductor_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:superconductor_ev_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down.json new file mode 100644 index 000000000..b9b37191a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:turbo_machine_hull", + "I": "modern_industrialization:annealed_copper_cable", + "O": "modern_industrialization:aluminum_cable" + }, + "pattern": [ + " OO", + "IH ", + " OO" + ], + "result": { + "id": "modern_industrialization:ev_hv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json new file mode 100644 index 000000000..b9e61a925 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:ev_hv_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:hv_ev_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up.json new file mode 100644 index 000000000..ea5b45ddb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:turbo_machine_hull", + "I": "modern_industrialization:aluminum_cable", + "O": "modern_industrialization:annealed_copper_cable" + }, + "pattern": [ + "II ", + " HO", + "II " + ], + "result": { + "id": "modern_industrialization:hv_ev_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json new file mode 100644 index 000000000..6763e6c09 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:hv_ev_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:ev_hv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down.json new file mode 100644 index 000000000..853b3cac2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:basic_machine_hull", + "I": "modern_industrialization:electrum_cable", + "O": "modern_industrialization:tin_cable" + }, + "pattern": [ + " OO", + "IH ", + " OO" + ], + "result": { + "id": "modern_industrialization:mv_lv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json new file mode 100644 index 000000000..cb9a0f096 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:mv_lv_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:lv_mv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up.json new file mode 100644 index 000000000..ab884ad1b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:basic_machine_hull", + "I": "modern_industrialization:tin_cable", + "O": "modern_industrialization:electrum_cable" + }, + "pattern": [ + "II ", + " HO", + "II " + ], + "result": { + "id": "modern_industrialization:lv_mv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json new file mode 100644 index 000000000..bf066fa8e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:lv_mv_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:mv_lv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down.json new file mode 100644 index 000000000..5a7d5482c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:advanced_machine_hull", + "I": "modern_industrialization:aluminum_cable", + "O": "modern_industrialization:electrum_cable" + }, + "pattern": [ + " OO", + "IH ", + " OO" + ], + "result": { + "id": "modern_industrialization:hv_mv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json new file mode 100644 index 000000000..273303711 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:hv_mv_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:mv_hv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up.json new file mode 100644 index 000000000..5c3121c48 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:advanced_machine_hull", + "I": "modern_industrialization:electrum_cable", + "O": "modern_industrialization:aluminum_cable" + }, + "pattern": [ + "II ", + " HO", + "II " + ], + "result": { + "id": "modern_industrialization:mv_hv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json new file mode 100644 index 000000000..6ed25c4dd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "modern_industrialization:mv_hv_transformer" + }, + "pattern": [ + "X" + ], + "result": { + "id": "modern_industrialization:hv_mv_transformer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/advanced.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/advanced.json new file mode 100644 index 000000000..fbf822e86 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/advanced.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 400, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:polyethylene" + } + ], + "item_inputs": [ + { + "amount": 4, + "ingredient": "modern_industrialization:basic_upgrade" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:large_motor" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:large_pump" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:electronic_circuit_board" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:advanced_upgrade" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json new file mode 100644 index 000000000..f6ea008a7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 2, + "ingredient": "modern_industrialization:conveyor" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:motor" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:robot_arm" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:analog_circuit_board" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:basic_upgrade" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json new file mode 100644 index 000000000..006eabe57 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 400, + "eu": 32, + "fluid_inputs": [ + { + "amount": 2500, + "ingredient": "modern_industrialization:polyvinyl_chloride" + } + ], + "item_inputs": [ + { + "amount": 8, + "ingredient": "modern_industrialization:large_advanced_motor" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:large_advanced_pump" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:turbo_upgrade" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:processing_unit_board" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:highly_advanced_upgrade" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/quantum.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/quantum.json new file mode 100644 index 000000000..7938ae6cd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/quantum.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 1000, + "eu": 32, + "fluid_inputs": [ + { + "amount": 50, + "ingredient": "modern_industrialization:uu_matter" + } + ], + "item_inputs": [ + { + "amount": 32, + "ingredient": "modern_industrialization:highly_advanced_upgrade" + }, + { + "amount": 8, + "ingredient": "modern_industrialization:quantum_circuit" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:singularity" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:quantum_circuit_board" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:quantum_upgrade" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/turbo.json b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/turbo.json new file mode 100644 index 000000000..2183320c3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/electric_age/upgrades/turbo.json @@ -0,0 +1,35 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 400, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:polyvinyl_chloride" + } + ], + "item_inputs": [ + { + "amount": 16, + "ingredient": "modern_industrialization:advanced_motor" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:advanced_pump" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:advanced_upgrade" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:digital_circuit_board" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:turbo_upgrade" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json new file mode 100644 index 000000000..7d2ac6335 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:fusion_reactor", + "duration": 1200, + "eu": 16000, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:deuterium" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:deuterium" + } + ], + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:helium_plasma" + }, + { + "amount": 500, + "id": "modern_industrialization:tritium" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json new file mode 100644 index 000000000..b2a2c0434 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:fusion_reactor", + "duration": 900, + "eu": 16000, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:deuterium" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:tritium" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:helium_plasma" + }, + { + "amount": 1000, + "id": "modern_industrialization:hydrogen" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/helium_helium.json b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/helium_helium.json new file mode 100644 index 000000000..80f299a6f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/helium_helium.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:fusion_reactor", + "duration": 600, + "eu": 16000, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:helium_3" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:helium_3" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:helium_plasma" + }, + { + "amount": 2000, + "id": "modern_industrialization:hydrogen" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json new file mode 100644 index 000000000..72a4de9d6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:fusion_reactor", + "duration": 300, + "eu": 16000, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:helium_3" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:tritium" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:helium_plasma" + }, + { + "amount": 1000, + "id": "modern_industrialization:deuterium" + }, + { + "amount": 1000, + "id": "modern_industrialization:hydrogen" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_input_hatch.json index d29bab5fc..be29b16ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_energy_input_hatch" + "id": "modern_industrialization:mv_energy_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_output_hatch.json index 40ec88529..33ba028b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "ingredient": "modern_industrialization:electrum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:mv_energy_output_hatch" + "id": "modern_industrialization:mv_energy_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_input_hatch.json index 7d3035a65..1819a27cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_tank" + "ingredient": "modern_industrialization:aluminum_tank" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_fluid_input_hatch" + "id": "modern_industrialization:advanced_fluid_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_output_hatch.json index 6aa6b1640..c08bffed7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_tank" + "ingredient": "modern_industrialization:aluminum_tank" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_fluid_output_hatch" + "id": "modern_industrialization:advanced_fluid_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_input_hatch.json index ca8034848..970205b59 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" }, { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_item_input_hatch" + "id": "modern_industrialization:advanced_item_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_output_hatch.json index 3235e3e5d..bd9b36e97 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/assembler/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "ingredient": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_item_output_hatch" + "id": "modern_industrialization:advanced_item_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_from_output.json index c84b8208e..84725f5fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:mv_energy_output_hatch" - } + "U": "modern_industrialization:mv_energy_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:mv_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_hatch.json index 8c2afd0dd..0be9892c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:electrum_cable" - }, - "V": { - "item": "modern_industrialization:advanced_machine_hull" - } + "U": "modern_industrialization:electrum_cable", + "V": "modern_industrialization:advanced_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:mv_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_from_input.json index 1b19ca109..cbd471a7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:mv_energy_input_hatch" - } + "U": "modern_industrialization:mv_energy_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:mv_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_hatch.json index f4c5cedb5..3360abbeb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/energy_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "V": { - "item": "modern_industrialization:electrum_cable" - } + "U": "modern_industrialization:advanced_machine_hull", + "V": "modern_industrialization:electrum_cable" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:mv_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_from_output.json index c85614dc4..e1dcd28cd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_fluid_output_hatch" - } + "U": "modern_industrialization:advanced_fluid_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_hatch.json index 5f9e50914..5ab7c980a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:aluminum_tank" - }, - "V": { - "item": "modern_industrialization:advanced_machine_hull" - } + "U": "modern_industrialization:aluminum_tank", + "V": "modern_industrialization:advanced_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_from_input.json index ac7b61417..51b42e34c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_fluid_input_hatch" - } + "U": "modern_industrialization:advanced_fluid_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_hatch.json index 7bcd49685..ed0e47cc7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/fluid_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "V": { - "item": "modern_industrialization:aluminum_tank" - } + "U": "modern_industrialization:advanced_machine_hull", + "V": "modern_industrialization:aluminum_tank" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_from_output.json index c2c1c95be..612b38f0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_item_output_hatch" - } + "U": "modern_industrialization:advanced_item_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_hatch.json index 8502df438..b72896266 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "minecraft:hopper" - }, - "V": { - "item": "modern_industrialization:advanced_machine_hull" - } + "U": "minecraft:hopper", + "V": "modern_industrialization:advanced_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_from_input.json index d007ca177..62b038c1e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_item_input_hatch" - } + "U": "modern_industrialization:advanced_item_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_hatch.json index 1820f874c..636641da3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/item_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "V": { - "item": "minecraft:hopper" - } + "U": "modern_industrialization:advanced_machine_hull", + "V": "minecraft:hopper" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:advanced_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_input_hatch.json index 5f17ca8cb..64009465c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:mv_energy_input_hatch" + "ingredient": "modern_industrialization:mv_energy_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "id": "modern_industrialization:electrum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_output_hatch.json index b15766a7a..1d2ed5ed8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:mv_energy_output_hatch" + "ingredient": "modern_industrialization:mv_energy_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:electrum_cable" + "id": "modern_industrialization:electrum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_input_hatch.json index 7a64a4b96..735a71a10 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_fluid_input_hatch" + "ingredient": "modern_industrialization:advanced_fluid_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_tank" + "id": "modern_industrialization:aluminum_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_output_hatch.json index 09c75974c..c348ce8fc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_fluid_output_hatch" + "ingredient": "modern_industrialization:advanced_fluid_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_tank" + "id": "modern_industrialization:aluminum_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_input_hatch.json index 4956418fa..72582dbf4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_item_input_hatch" + "ingredient": "modern_industrialization:advanced_item_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_output_hatch.json index eec535fd9..90e02a122 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/advanced/unpacker/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_item_output_hatch" + "ingredient": "modern_industrialization:advanced_item_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:advanced_machine_hull" + "id": "modern_industrialization:advanced_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_input_hatch.json index 3c6b84bbb..2238ed32a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" }, { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lv_energy_input_hatch" + "id": "modern_industrialization:lv_energy_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_output_hatch.json index 329f3148d..bdc8199fa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/assembler/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "ingredient": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "ingredient": "modern_industrialization:tin_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lv_energy_output_hatch" + "id": "modern_industrialization:lv_energy_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_from_output.json index 39fa28275..f3242e2da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:lv_energy_output_hatch" - } + "U": "modern_industrialization:lv_energy_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:lv_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_hatch.json index 138b2aa65..7b1b5629c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:tin_cable" - }, - "V": { - "item": "modern_industrialization:basic_machine_hull" - } + "U": "modern_industrialization:tin_cable", + "V": "modern_industrialization:basic_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:lv_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_from_input.json index 5e1d39679..903316a51 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:lv_energy_input_hatch" - } + "U": "modern_industrialization:lv_energy_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:lv_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_hatch.json index 0ba220582..a8b7c8959 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/energy_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:basic_machine_hull" - }, - "V": { - "item": "modern_industrialization:tin_cable" - } + "U": "modern_industrialization:basic_machine_hull", + "V": "modern_industrialization:tin_cable" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:lv_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_input_hatch.json index da5e69ac6..6ae52e3f9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:lv_energy_input_hatch" + "ingredient": "modern_industrialization:lv_energy_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "id": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "id": "modern_industrialization:tin_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_output_hatch.json index 984fa6332..4237cfeab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/basic/unpacker/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:lv_energy_output_hatch" + "ingredient": "modern_industrialization:lv_energy_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:basic_machine_hull" + "id": "modern_industrialization:basic_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:tin_cable" + "id": "modern_industrialization:tin_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_input_hatch.json index d513d2727..bb20955ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "ingredient": "modern_industrialization:bronze_tank" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_fluid_input_hatch" + "id": "modern_industrialization:bronze_fluid_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_output_hatch.json index 6ba11069a..d55679a2c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "ingredient": "modern_industrialization:bronze_tank" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_fluid_output_hatch" + "id": "modern_industrialization:bronze_fluid_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_input_hatch.json index fe7216fd6..2495360bc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" }, { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_item_input_hatch" + "id": "modern_industrialization:bronze_item_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_output_hatch.json index 60c023924..dc8b7309c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/assembler/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "ingredient": "modern_industrialization:bronze_machine_casing" }, { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_item_output_hatch" + "id": "modern_industrialization:bronze_item_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_from_output.json index 7098f4ec0..e0902b8fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_fluid_output_hatch" - } + "U": "modern_industrialization:bronze_fluid_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_hatch.json index 356abcbe2..26fc3d48f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_tank" - }, - "V": { - "item": "modern_industrialization:bronze_machine_casing" - } + "U": "modern_industrialization:bronze_tank", + "V": "modern_industrialization:bronze_machine_casing" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_from_input.json index 21c783282..8c6ab52f8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_fluid_input_hatch" - } + "U": "modern_industrialization:bronze_fluid_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_hatch.json index 0829932ba..256ebf744 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/fluid_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "V": { - "item": "modern_industrialization:bronze_tank" - } + "U": "modern_industrialization:bronze_machine_casing", + "V": "modern_industrialization:bronze_tank" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_from_output.json index 61f7af58b..0dce015c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_item_output_hatch" - } + "U": "modern_industrialization:bronze_item_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_hatch.json index f904451b2..c0750cb28 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "minecraft:hopper" - }, - "V": { - "item": "modern_industrialization:bronze_machine_casing" - } + "U": "minecraft:hopper", + "V": "modern_industrialization:bronze_machine_casing" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_from_input.json index 7a5ae4e28..f0c66381b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_item_input_hatch" - } + "U": "modern_industrialization:bronze_item_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_hatch.json index 828ec1c9c..44779ac09 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/item_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "V": { - "item": "minecraft:hopper" - } + "U": "modern_industrialization:bronze_machine_casing", + "V": "minecraft:hopper" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_input_hatch.json index c5254b5ed..f74879e41 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_fluid_input_hatch" + "ingredient": "modern_industrialization:bronze_fluid_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "id": "modern_industrialization:bronze_machine_casing" }, { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "id": "modern_industrialization:bronze_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_output_hatch.json index 86a2a7cf9..3ed599cca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_fluid_output_hatch" + "ingredient": "modern_industrialization:bronze_fluid_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "id": "modern_industrialization:bronze_machine_casing" }, { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "id": "modern_industrialization:bronze_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_input_hatch.json index 4398ca642..2e838bbc9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_item_input_hatch" + "ingredient": "modern_industrialization:bronze_item_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "id": "modern_industrialization:bronze_machine_casing" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_output_hatch.json index 067414aff..9b90fde39 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/bronze/unpacker/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_item_output_hatch" + "ingredient": "modern_industrialization:bronze_item_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_machine_casing" + "id": "modern_industrialization:bronze_machine_casing" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_input_hatch.json index ac33c46d9..64cf5d31f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ev_energy_input_hatch" + "id": "modern_industrialization:ev_energy_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_output_hatch.json index 3a82bec78..10314b960 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "ingredient": "modern_industrialization:annealed_copper_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ev_energy_output_hatch" + "id": "modern_industrialization:ev_energy_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_input_hatch.json index cba6cb70d..15b33a0f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_tank" + "ingredient": "modern_industrialization:titanium_tank" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_fluid_input_hatch" + "id": "modern_industrialization:highly_advanced_fluid_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_output_hatch.json index 8b735a87f..204dc9271 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:titanium_tank" + "ingredient": "modern_industrialization:titanium_tank" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_fluid_output_hatch" + "id": "modern_industrialization:highly_advanced_fluid_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_input_hatch.json index 97971a9ea..afbbb2b7b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" }, { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_item_input_hatch" + "id": "modern_industrialization:highly_advanced_item_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_output_hatch.json index 269b4fe79..6a3fad6a8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/assembler/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "ingredient": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_item_output_hatch" + "id": "modern_industrialization:highly_advanced_item_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_from_output.json index 6bc9283b4..29bf66ed6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:ev_energy_output_hatch" - } + "U": "modern_industrialization:ev_energy_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:ev_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_hatch.json index 101518235..beaf13bdd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:annealed_copper_cable" - }, - "V": { - "item": "modern_industrialization:highly_advanced_machine_hull" - } + "U": "modern_industrialization:annealed_copper_cable", + "V": "modern_industrialization:highly_advanced_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:ev_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_from_input.json index 1ad15ad98..50a6aff67 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:ev_energy_input_hatch" - } + "U": "modern_industrialization:ev_energy_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:ev_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_hatch.json index 2a641374d..f81a0bf69 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/energy_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_machine_hull" - }, - "V": { - "item": "modern_industrialization:annealed_copper_cable" - } + "U": "modern_industrialization:highly_advanced_machine_hull", + "V": "modern_industrialization:annealed_copper_cable" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:ev_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_from_output.json index d1d97ace0..c8032f491 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_fluid_output_hatch" - } + "U": "modern_industrialization:highly_advanced_fluid_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_hatch.json index c560910eb..b9bbc5f2c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:titanium_tank" - }, - "V": { - "item": "modern_industrialization:highly_advanced_machine_hull" - } + "U": "modern_industrialization:titanium_tank", + "V": "modern_industrialization:highly_advanced_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_from_input.json index 434168411..08a6e892c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_fluid_input_hatch" - } + "U": "modern_industrialization:highly_advanced_fluid_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_hatch.json index 35f341cd4..f6fbb3b57 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/fluid_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_machine_hull" - }, - "V": { - "item": "modern_industrialization:titanium_tank" - } + "U": "modern_industrialization:highly_advanced_machine_hull", + "V": "modern_industrialization:titanium_tank" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_from_output.json index d6ae1c39f..e4b2fc6d6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_item_output_hatch" - } + "U": "modern_industrialization:highly_advanced_item_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_hatch.json index 65e38b840..9293e6576 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "minecraft:hopper" - }, - "V": { - "item": "modern_industrialization:highly_advanced_machine_hull" - } + "U": "minecraft:hopper", + "V": "modern_industrialization:highly_advanced_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_from_input.json index 109582bfe..ecb917357 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_item_input_hatch" - } + "U": "modern_industrialization:highly_advanced_item_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_hatch.json index 0b6494c40..7e111f0a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/item_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:highly_advanced_machine_hull" - }, - "V": { - "item": "minecraft:hopper" - } + "U": "modern_industrialization:highly_advanced_machine_hull", + "V": "minecraft:hopper" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:highly_advanced_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_input_hatch.json index 64881bc20..fc2c7743d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:ev_energy_input_hatch" + "ingredient": "modern_industrialization:ev_energy_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "id": "modern_industrialization:annealed_copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_output_hatch.json index aa11d6e04..b9081d76a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:ev_energy_output_hatch" + "ingredient": "modern_industrialization:ev_energy_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:annealed_copper_cable" + "id": "modern_industrialization:annealed_copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_input_hatch.json index 2050986eb..2fb75bbbe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_fluid_input_hatch" + "ingredient": "modern_industrialization:highly_advanced_fluid_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:titanium_tank" + "id": "modern_industrialization:titanium_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_output_hatch.json index 3610a517c..300938024 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_fluid_output_hatch" + "ingredient": "modern_industrialization:highly_advanced_fluid_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:titanium_tank" + "id": "modern_industrialization:titanium_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_input_hatch.json index 7bbbabcfe..7d773cabf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_item_input_hatch" + "ingredient": "modern_industrialization:highly_advanced_item_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_output_hatch.json index a7bf97a1a..09c21b791 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/highly_advanced/unpacker/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_item_output_hatch" + "ingredient": "modern_industrialization:highly_advanced_item_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:highly_advanced_machine_hull" + "id": "modern_industrialization:highly_advanced_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_input_hatch.json index 96179d3bd..a975ebee6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" }, { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "ingredient": "modern_industrialization:quantum_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_energy_input_hatch" + "id": "modern_industrialization:superconductor_energy_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_output_hatch.json index b94af3fff..05a46d7e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/assembler/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "ingredient": "modern_industrialization:quantum_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_energy_output_hatch" + "id": "modern_industrialization:superconductor_energy_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_from_output.json index 1b6cc65fb..9490a9a3a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:superconductor_energy_output_hatch" - } + "U": "modern_industrialization:superconductor_energy_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_hatch.json index d30063e26..df3c49558 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:superconductor_cable" - }, - "V": { - "item": "modern_industrialization:quantum_machine_hull" - } + "U": "modern_industrialization:superconductor_cable", + "V": "modern_industrialization:quantum_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_from_input.json index dac011487..f63b4fe15 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:superconductor_energy_input_hatch" - } + "U": "modern_industrialization:superconductor_energy_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_hatch.json index c2dfca2f0..cccbcaf9e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/energy_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:quantum_machine_hull" - }, - "V": { - "item": "modern_industrialization:superconductor_cable" - } + "U": "modern_industrialization:quantum_machine_hull", + "V": "modern_industrialization:superconductor_cable" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_input_hatch.json index b07fe6e8b..fce2c5383 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_energy_input_hatch" + "ingredient": "modern_industrialization:superconductor_energy_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "id": "modern_industrialization:quantum_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:superconductor_cable" + "id": "modern_industrialization:superconductor_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_output_hatch.json index 003132fa0..1a6785199 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/quantum/unpacker/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_energy_output_hatch" + "ingredient": "modern_industrialization:superconductor_energy_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_machine_hull" + "id": "modern_industrialization:quantum_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:superconductor_cable" + "id": "modern_industrialization:superconductor_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_input_hatch.json index 9cdf91e23..270b5faa0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_tank" + "ingredient": "modern_industrialization:steel_tank" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_fluid_input_hatch" + "id": "modern_industrialization:steel_fluid_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_output_hatch.json index ed6aef803..660a01cec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 1, - "item": "modern_industrialization:steel_tank" + "ingredient": "modern_industrialization:steel_tank" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_fluid_output_hatch" + "id": "modern_industrialization:steel_fluid_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_input_hatch.json index 8efdf2ec5..d6df045ad 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" }, { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_item_input_hatch" + "id": "modern_industrialization:steel_item_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_output_hatch.json index dbfa6843d..b320a2a16 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/assembler/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "ingredient": "modern_industrialization:steel_machine_casing" }, { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_item_output_hatch" + "id": "modern_industrialization:steel_item_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_from_output.json index be96c918a..1a235dcb3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_fluid_output_hatch" - } + "U": "modern_industrialization:steel_fluid_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:steel_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_hatch.json index 4a16fb8cd..1556d7a96 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_tank" - }, - "V": { - "item": "modern_industrialization:steel_machine_casing" - } + "U": "modern_industrialization:steel_tank", + "V": "modern_industrialization:steel_machine_casing" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:steel_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_from_input.json index 2bbdac593..a45bdee25 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_fluid_input_hatch" - } + "U": "modern_industrialization:steel_fluid_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:steel_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_hatch.json index 4c9acc29b..0626e241a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/fluid_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_machine_casing" - }, - "V": { - "item": "modern_industrialization:steel_tank" - } + "U": "modern_industrialization:steel_machine_casing", + "V": "modern_industrialization:steel_tank" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:steel_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_from_output.json index e396f9fc0..a25bf6c6d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_item_output_hatch" - } + "U": "modern_industrialization:steel_item_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:steel_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_hatch.json index 76ded4eee..e77bf0fe7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "minecraft:hopper" - }, - "V": { - "item": "modern_industrialization:steel_machine_casing" - } + "U": "minecraft:hopper", + "V": "modern_industrialization:steel_machine_casing" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:steel_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_from_input.json index 75ec8e66d..35ad6bb16 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_item_input_hatch" - } + "U": "modern_industrialization:steel_item_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:steel_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_hatch.json index c0977a0d4..49f69bc00 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/item_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:steel_machine_casing" - }, - "V": { - "item": "minecraft:hopper" - } + "U": "modern_industrialization:steel_machine_casing", + "V": "minecraft:hopper" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:steel_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_input_hatch.json index 1f7a8b0a7..47a25d89a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_fluid_input_hatch" + "ingredient": "modern_industrialization:steel_fluid_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "id": "modern_industrialization:steel_machine_casing" }, { "amount": 1, - "item": "modern_industrialization:steel_tank" + "id": "modern_industrialization:steel_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_output_hatch.json index 004133caf..21fbcb2a1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_fluid_output_hatch" + "ingredient": "modern_industrialization:steel_fluid_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "id": "modern_industrialization:steel_machine_casing" }, { "amount": 1, - "item": "modern_industrialization:steel_tank" + "id": "modern_industrialization:steel_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_input_hatch.json index 204502e87..b2dc46479 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_item_input_hatch" + "ingredient": "modern_industrialization:steel_item_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "id": "modern_industrialization:steel_machine_casing" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_output_hatch.json index 089258fe0..6277dc374 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/steel/unpacker/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_item_output_hatch" + "ingredient": "modern_industrialization:steel_item_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_machine_casing" + "id": "modern_industrialization:steel_machine_casing" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_input_hatch.json index cdd5cfb64..9cd2f3125 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_energy_input_hatch" + "id": "modern_industrialization:hv_energy_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_output_hatch.json index e3b740a49..86467802c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "ingredient": "modern_industrialization:aluminum_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:hv_energy_output_hatch" + "id": "modern_industrialization:hv_energy_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_input_hatch.json index 2f928cf0c..7d345e0b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_tank" + "ingredient": "modern_industrialization:stainless_steel_tank" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_fluid_input_hatch" + "id": "modern_industrialization:turbo_fluid_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_output_hatch.json index 3701b4632..f57ab9170 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_tank" + "ingredient": "modern_industrialization:stainless_steel_tank" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_fluid_output_hatch" + "id": "modern_industrialization:turbo_fluid_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_input_hatch.json index b5ee1eaf2..439a221c8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" }, { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_item_input_hatch" + "id": "modern_industrialization:turbo_item_input_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_output_hatch.json index c7b64da7b..a33585c40 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/assembler/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "ingredient": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "ingredient": "minecraft:hopper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_item_output_hatch" + "id": "modern_industrialization:turbo_item_output_hatch" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_from_output.json index a380acd4c..4af049a1c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:hv_energy_output_hatch" - } + "U": "modern_industrialization:hv_energy_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:hv_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_hatch.json index 383efa5ef..4baa9cc82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:aluminum_cable" - }, - "V": { - "item": "modern_industrialization:turbo_machine_hull" - } + "U": "modern_industrialization:aluminum_cable", + "V": "modern_industrialization:turbo_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:hv_energy_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_from_input.json index f4a455130..460ab8ff8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:hv_energy_input_hatch" - } + "U": "modern_industrialization:hv_energy_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:hv_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_hatch.json index 935d7524a..f4ca967cc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/energy_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_machine_hull" - }, - "V": { - "item": "modern_industrialization:aluminum_cable" - } + "U": "modern_industrialization:turbo_machine_hull", + "V": "modern_industrialization:aluminum_cable" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:hv_energy_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_from_output.json index a6fa83e90..6c495b1eb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_fluid_output_hatch" - } + "U": "modern_industrialization:turbo_fluid_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_hatch.json index 9c790d155..37b300169 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:stainless_steel_tank" - }, - "V": { - "item": "modern_industrialization:turbo_machine_hull" - } + "U": "modern_industrialization:stainless_steel_tank", + "V": "modern_industrialization:turbo_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_fluid_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_from_input.json index b2b61deef..c64b8982b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_fluid_input_hatch" - } + "U": "modern_industrialization:turbo_fluid_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_hatch.json index d77bf5664..06ad2e61d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/fluid_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_machine_hull" - }, - "V": { - "item": "modern_industrialization:stainless_steel_tank" - } + "U": "modern_industrialization:turbo_machine_hull", + "V": "modern_industrialization:stainless_steel_tank" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_fluid_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_from_output.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_from_output.json index 8a0eca5e0..7cf9f9199 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_from_output.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_from_output.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_item_output_hatch" - } + "U": "modern_industrialization:turbo_item_output_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_hatch.json index 111b38fc5..bccdff2f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_input_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "minecraft:hopper" - }, - "V": { - "item": "modern_industrialization:turbo_machine_hull" - } + "U": "minecraft:hopper", + "V": "modern_industrialization:turbo_machine_hull" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_item_input_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_from_input.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_from_input.json index 4db9f57c0..a76569472 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_from_input.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_from_input.json @@ -2,15 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_item_input_hatch" - } + "U": "modern_industrialization:turbo_item_input_hatch" }, "pattern": [ "U" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_hatch.json index 530c7082a..84e3242ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/item_output_hatch.json @@ -2,19 +2,14 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "U": { - "item": "modern_industrialization:turbo_machine_hull" - }, - "V": { - "item": "minecraft:hopper" - } + "U": "modern_industrialization:turbo_machine_hull", + "V": "minecraft:hopper" }, "pattern": [ "U", "V" ], "result": { - "count": 1, "id": "modern_industrialization:turbo_item_output_hatch" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_input_hatch.json index d6481dee5..3feb0e701 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:hv_energy_input_hatch" + "ingredient": "modern_industrialization:hv_energy_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "id": "modern_industrialization:aluminum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_output_hatch.json index 29ec6a3d4..df21c2df5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/energy_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:hv_energy_output_hatch" + "ingredient": "modern_industrialization:hv_energy_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:aluminum_cable" + "id": "modern_industrialization:aluminum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_input_hatch.json index fc00019f8..4fb4e3205 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_fluid_input_hatch" + "ingredient": "modern_industrialization:turbo_fluid_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_tank" + "id": "modern_industrialization:stainless_steel_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_output_hatch.json index abd7e24a4..e82cea157 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/fluid_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_fluid_output_hatch" + "ingredient": "modern_industrialization:turbo_fluid_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_tank" + "id": "modern_industrialization:stainless_steel_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_input_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_input_hatch.json index cb8cb0767..5358102fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_input_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_input_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_item_input_hatch" + "ingredient": "modern_industrialization:turbo_item_input_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_output_hatch.json b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_output_hatch.json index 44a31b4ed..632d12280 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_output_hatch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/hatches/turbo/unpacker/item_output_hatch.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_item_output_hatch" + "ingredient": "modern_industrialization:turbo_item_output_hatch" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:turbo_machine_hull" + "id": "modern_industrialization:turbo_machine_hull" }, { "amount": 1, - "item": "minecraft:hopper" + "id": "minecraft:hopper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_heavy_water.json index d9cfe9238..762ce7a2d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_heavy_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_heavy_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 16000, - "fluid": "modern_industrialization:heavy_water_steam" + "ingredient": "modern_industrialization:heavy_water_steam" }, { "amount": 125, - "fluid": "modern_industrialization:high_pressure_heavy_water" + "ingredient": "modern_industrialization:high_pressure_heavy_water" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "modern_industrialization:heavy_water" + "id": "modern_industrialization:heavy_water" }, { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_heavy_water_steam" + "id": "modern_industrialization:high_pressure_heavy_water_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_water.json index c28e7dce4..8108167d0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_high_pressure_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 16000, - "fluid": "modern_industrialization:heavy_water_steam" + "ingredient": "modern_industrialization:heavy_water_steam" }, { "amount": 125, - "fluid": "modern_industrialization:high_pressure_water" + "ingredient": "modern_industrialization:high_pressure_water" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "modern_industrialization:heavy_water" + "id": "modern_industrialization:heavy_water" }, { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_steam" + "id": "modern_industrialization:high_pressure_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_water.json index fd574376e..086ec28ed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/heavy_water_steam_with_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 16000, - "fluid": "modern_industrialization:heavy_water_steam" + "ingredient": "modern_industrialization:heavy_water_steam" }, { "amount": 1000, - "fluid": "minecraft:water" + "ingredient": "minecraft:water" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "modern_industrialization:heavy_water" + "id": "modern_industrialization:heavy_water" }, { "amount": 16000, - "fluid": "modern_industrialization:steam" + "id": "modern_industrialization:steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_heavy_water.json index f91edc2c5..7f70e7635 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_heavy_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_heavy_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_heavy_water_steam" + "ingredient": "modern_industrialization:high_pressure_heavy_water_steam" }, { "amount": 1000, - "fluid": "modern_industrialization:heavy_water" + "ingredient": "modern_industrialization:heavy_water" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:high_pressure_heavy_water" + "id": "modern_industrialization:high_pressure_heavy_water" }, { "amount": 16000, - "fluid": "modern_industrialization:heavy_water_steam" + "id": "modern_industrialization:heavy_water_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_high_pressure_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_high_pressure_water.json index 7fad3f69d..156c53408 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_high_pressure_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_high_pressure_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_heavy_water_steam" + "ingredient": "modern_industrialization:high_pressure_heavy_water_steam" }, { "amount": 125, - "fluid": "modern_industrialization:high_pressure_water" + "ingredient": "modern_industrialization:high_pressure_water" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:high_pressure_heavy_water" + "id": "modern_industrialization:high_pressure_heavy_water" }, { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_steam" + "id": "modern_industrialization:high_pressure_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_water.json index 4f5b12698..294c50283 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_heavy_water_steam_with_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_heavy_water_steam" + "ingredient": "modern_industrialization:high_pressure_heavy_water_steam" }, { "amount": 1000, - "fluid": "minecraft:water" + "ingredient": "minecraft:water" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:high_pressure_heavy_water" + "id": "modern_industrialization:high_pressure_heavy_water" }, { "amount": 16000, - "fluid": "modern_industrialization:steam" + "id": "modern_industrialization:steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_heavy_water.json index df956bfbb..88c6eafbc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_heavy_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_heavy_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_steam" + "ingredient": "modern_industrialization:high_pressure_steam" }, { "amount": 1000, - "fluid": "modern_industrialization:heavy_water" + "ingredient": "modern_industrialization:heavy_water" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:high_pressure_water" + "id": "modern_industrialization:high_pressure_water" }, { "amount": 16000, - "fluid": "modern_industrialization:heavy_water_steam" + "id": "modern_industrialization:heavy_water_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_high_pressure_heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_high_pressure_heavy_water.json index 324059579..ce09488b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_high_pressure_heavy_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_high_pressure_heavy_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_steam" + "ingredient": "modern_industrialization:high_pressure_steam" }, { "amount": 125, - "fluid": "modern_industrialization:high_pressure_heavy_water" + "ingredient": "modern_industrialization:high_pressure_heavy_water" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:high_pressure_water" + "id": "modern_industrialization:high_pressure_water" }, { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_heavy_water_steam" + "id": "modern_industrialization:high_pressure_heavy_water_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_water.json index 3f27bdfa1..f5dd23d08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/high_pressure_steam_with_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_steam" + "ingredient": "modern_industrialization:high_pressure_steam" }, { "amount": 1000, - "fluid": "minecraft:water" + "ingredient": "minecraft:water" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:high_pressure_water" + "id": "modern_industrialization:high_pressure_water" }, { "amount": 16000, - "fluid": "modern_industrialization:steam" + "id": "modern_industrialization:steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_heavy_water.json index 40cbe1ce5..5d8bdc735 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_heavy_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_heavy_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 16000, - "fluid": "modern_industrialization:steam" + "ingredient": "modern_industrialization:steam" }, { "amount": 1000, - "fluid": "modern_industrialization:heavy_water" + "ingredient": "modern_industrialization:heavy_water" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "minecraft:water" + "id": "minecraft:water" }, { "amount": 16000, - "fluid": "modern_industrialization:heavy_water_steam" + "id": "modern_industrialization:heavy_water_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_heavy_water.json index 38b826fbc..5edec3093 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_heavy_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_heavy_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 16000, - "fluid": "modern_industrialization:steam" + "ingredient": "modern_industrialization:steam" }, { "amount": 125, - "fluid": "modern_industrialization:high_pressure_heavy_water" + "ingredient": "modern_industrialization:high_pressure_heavy_water" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "minecraft:water" + "id": "minecraft:water" }, { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_heavy_water_steam" + "id": "modern_industrialization:high_pressure_heavy_water_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_water.json b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_water.json index 6bd3dc65c..19aa475d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_water.json +++ b/src/generated/resources/data/modern_industrialization/recipe/heat_exchanger/steam_with_high_pressure_water.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 16000, - "fluid": "modern_industrialization:steam" + "ingredient": "modern_industrialization:steam" }, { "amount": 125, - "fluid": "modern_industrialization:high_pressure_water" + "ingredient": "modern_industrialization:high_pressure_water" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "minecraft:water" + "id": "minecraft:water" }, { "amount": 2000, - "fluid": "modern_industrialization:high_pressure_steam" + "id": "modern_industrialization:high_pressure_steam" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/barrel.json index 2e412303b..53bdaac48 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/barrel.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:barrels/wooden" + "ingredient": "#c:barrels/wooden" }, { "amount": 8, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_barrel" + "id": "modern_industrialization:aluminum_barrel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json index c113fbf8c..0c84b9f6d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_cable" + "id": "modern_industrialization:aluminum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json index bc4d86306..41fff47a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_cable" + "id": "modern_industrialization:aluminum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/drill_head.json index d46d99d11..094f96120 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" }, { "amount": 2, - "item": "modern_industrialization:aluminum_curved_plate" + "ingredient": "modern_industrialization:aluminum_curved_plate" }, { "amount": 1, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" }, { "amount": 2, - "tag": "c:gears/aluminum" + "ingredient": "#c:gears/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_drill_head" + "id": "modern_industrialization:aluminum_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/gear.json index cbac3294e..f711d10ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" }, { "amount": 1, - "item": "modern_industrialization:aluminum_ring" + "ingredient": "modern_industrialization:aluminum_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_gear" + "id": "modern_industrialization:aluminum_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/rotor.json index 8c55a9e26..95298d92a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/rotor.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_blade" + "ingredient": "modern_industrialization:aluminum_blade" }, { "amount": 1, - "item": "modern_industrialization:aluminum_ring" + "ingredient": "modern_industrialization:aluminum_ring" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_rotor" + "id": "modern_industrialization:aluminum_rotor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/tank.json index 05228787a..61a05d654 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/assembler/tank.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" }, { "amount": 1, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_tank" + "id": "modern_industrialization:aluminum_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/dust.json index ec04fad0f..587c1a298 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/aluminum" + "ingredient": "#c:dusts/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_ingot" + "id": "modern_industrialization:aluminum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/tiny_dust.json index 1e6033ce0..3e9b66f40 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/aluminum" + "ingredient": "#c:tiny_dusts/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_nugget" + "id": "modern_industrialization:aluminum_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/double_ingot.json index 2384761ae..a768b8984 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_double_ingot" + "ingredient": "modern_industrialization:aluminum_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_plate" + "id": "modern_industrialization:aluminum_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/main.json index 565719b21..39c8517f9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/aluminum" + "ingredient": "#c:ingots/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_plate" + "id": "modern_industrialization:aluminum_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/plate.json index d4e48048a..5a4f249fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_curved_plate" + "id": "modern_industrialization:aluminum_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/ring.json index 7a5a8f0eb..fe82c7672 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_ring" + "id": "modern_industrialization:aluminum_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/barrel.json index 0da3eb5a8..9d55f7f29 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/barrel.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/aluminum" - }, - "b": { - "tag": "c:barrels/wooden" - } + "#": "#c:plates/aluminum", + "b": "#c:barrels/wooden" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_barrel" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/blade.json index e0cd60bc7..69b5e7da8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "tag": "c:rods/aluminum" - }, - "P": { - "item": "modern_industrialization:aluminum_curved_plate" - } + "I": "#c:rods/aluminum", + "P": "modern_industrialization:aluminum_curved_plate" }, "pattern": [ "P", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/block_from_ingot.json index 5ad018730..23e0b8e82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/aluminum" - }, - "y": { - "item": "modern_industrialization:aluminum_ingot" - } + "x": "#c:ingots/aluminum", + "y": "modern_industrialization:aluminum_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json index 1378a757b..a15480cdc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:aluminum_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:aluminum_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/drill_head.json index c161a694b..d62f9940a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/aluminum" - }, - "R": { - "tag": "c:rods/aluminum" - }, - "b": { - "item": "modern_industrialization:aluminum_bolt" - }, - "c": { - "item": "modern_industrialization:aluminum_curved_plate" - }, - "p": { - "tag": "c:plates/aluminum" - } + "G": "#c:gears/aluminum", + "R": "#c:rods/aluminum", + "b": "modern_industrialization:aluminum_bolt", + "c": "modern_industrialization:aluminum_curved_plate", + "p": "#c:plates/aluminum" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/dust_from_tiny_dust.json index b2a416bda..623c26712 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/aluminum" - }, - "y": { - "item": "modern_industrialization:aluminum_tiny_dust" - } + "x": "#c:tiny_dusts/aluminum", + "y": "modern_industrialization:aluminum_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/gear.json index 6c77f9b37..fffc6312a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/aluminum" - }, - "R": { - "item": "modern_industrialization:aluminum_ring" - }, - "b": { - "item": "modern_industrialization:aluminum_bolt" - } + "P": "#c:plates/aluminum", + "R": "modern_industrialization:aluminum_ring", + "b": "modern_industrialization:aluminum_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_block.json index 75d3de4cc..32e988ade 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:aluminum_block" - } + "modern_industrialization:aluminum_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_nugget.json index d004a7a19..f77a4da4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/aluminum" - }, - "y": { - "item": "modern_industrialization:aluminum_nugget" - } + "x": "#c:nuggets/aluminum", + "y": "modern_industrialization:aluminum_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/large_plate.json index 1bcabb6cd..b305f1156 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/aluminum" - } + "x": "#c:plates/aluminum" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/nugget_from_ingot.json index 1b2c43740..95721978f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:aluminum_ingot" - } + "modern_industrialization:aluminum_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ring.json index 788ad749f..282be922d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/aluminum" - }, - "b": { - "item": "modern_industrialization:aluminum_bolt" - } + "R": "#c:rods/aluminum", + "b": "modern_industrialization:aluminum_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/rotor.json index 3d24eb377..8f0c895a7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/rotor.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "B": { - "item": "modern_industrialization:aluminum_blade" - }, - "R": { - "item": "modern_industrialization:aluminum_ring" - }, - "b": { - "item": "modern_industrialization:aluminum_bolt" - } + "B": "modern_industrialization:aluminum_blade", + "R": "modern_industrialization:aluminum_ring", + "b": "modern_industrialization:aluminum_bolt" }, "pattern": [ "bBb", @@ -18,7 +12,6 @@ "bBb" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_rotor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tank.json index 878bab7fc..6bbc740ab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tank.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/aluminum" - }, - "G": { - "tag": "c:glass_blocks" - } + "#": "#c:plates/aluminum", + "G": "#c:glass_blocks" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:aluminum_tank" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tiny_dust_from_dust.json index 3fc64a470..3b5d634f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:aluminum_dust" - } + "modern_industrialization:aluminum_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/double_ingot.json index fafcc88ff..ec2b09b0b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_double_ingot" + "ingredient": "modern_industrialization:aluminum_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_rod" + "id": "modern_industrialization:aluminum_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/main.json index de622cfac..3427527d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/aluminum" + "ingredient": "#c:ingots/aluminum" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_rod" + "id": "modern_industrialization:aluminum_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/rod.json index 89e9ee1ce..e6e8079bb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_bolt" + "id": "modern_industrialization:aluminum_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/blade.json index 72d6d7b18..d82a1dc73 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/blade.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_blade" + "ingredient": "modern_industrialization:aluminum_blade" } ], "item_outputs": [ { "amount": 5, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/bolt.json index c9124cf41..633fdd5d6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_bolt" + "ingredient": "modern_industrialization:aluminum_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/curved_plate.json index 36ead72fc..603ebd7ae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_curved_plate" + "ingredient": "modern_industrialization:aluminum_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/double_ingot.json index 21bb204f1..836ce017c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_double_ingot" + "ingredient": "modern_industrialization:aluminum_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/drill_head.json index e4de4f6f7..23f8c9ea6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_drill_head" + "ingredient": "modern_industrialization:aluminum_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/gear.json index 767c2437f..89624f8da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/aluminum" + "ingredient": "#c:gears/aluminum" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ingot.json index b5c43b3e0..84510f3f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/aluminum" + "ingredient": "#c:ingots/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/large_plate.json index 2762b086c..33d15154a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_large_plate" + "ingredient": "modern_industrialization:aluminum_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/nugget.json index 77c08a89c..0daaafccc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/aluminum" + "ingredient": "#c:nuggets/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/plate.json index 3175ffd33..bd9e9518f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ring.json index 5838a4946..688dcd52e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_ring" + "ingredient": "modern_industrialization:aluminum_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rod.json index 974c75857..4bd22185d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rotor.json index ce690dec8..221e1a803 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/rotor.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_rotor" + "ingredient": "modern_industrialization:aluminum_rotor" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json index 0b83564b4..d92eb49b8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/blade.json index e630dfd03..8ec915700 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_curved_plate" + "ingredient": "modern_industrialization:aluminum_curved_plate" }, { "amount": 1, - "tag": "c:rods/aluminum" + "ingredient": "#c:rods/aluminum" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:aluminum_blade" + "id": "modern_industrialization:aluminum_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/block.json index b90b76d6e..091bf7bae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/aluminum" + "ingredient": "#c:ingots/aluminum" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_block" + "id": "modern_industrialization:aluminum_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json index cfc0407b2..da92cabe1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:aluminum_wire" + "ingredient": "modern_industrialization:aluminum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:aluminum_cable" + "id": "modern_industrialization:aluminum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/double_ingot.json index a0f12c619..f717f2031 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/aluminum" + "ingredient": "#c:ingots/aluminum" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_double_ingot" + "id": "modern_industrialization:aluminum_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/dust.json index 7757cb549..44544d5e1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/aluminum" + "ingredient": "#c:tiny_dusts/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_dust" + "id": "modern_industrialization:aluminum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/ingot.json index 94b2847ec..c233a1e0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/aluminum" + "ingredient": "#c:nuggets/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_ingot" + "id": "modern_industrialization:aluminum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/large_plate.json index 9333bd075..c21307237 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:aluminum_large_plate" + "id": "modern_industrialization:aluminum_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/ingot.json index 6c3833cf8..3c0a7b737 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/aluminum" + "ingredient": "#c:storage_blocks/aluminum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:aluminum_ingot" + "id": "modern_industrialization:aluminum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/nugget.json index d8534411d..4f9426c4c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/aluminum" + "ingredient": "#c:ingots/aluminum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:aluminum_nugget" + "id": "modern_industrialization:aluminum_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/tiny_dust.json index ec0fa3695..83c1783ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/aluminum" + "ingredient": "#c:dusts/aluminum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:aluminum_tiny_dust" + "id": "modern_industrialization:aluminum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/wiremill/wire.json index f158f6101..e993274f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/aluminum/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/aluminum" + "ingredient": "#c:plates/aluminum" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:aluminum_wire" + "id": "modern_industrialization:aluminum_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json index a8e168d74..2b8ea4d5e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_wire" + "ingredient": "modern_industrialization:annealed_copper_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_cable" + "id": "modern_industrialization:annealed_copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json index 9ecda3dff..c031acbec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_wire" + "ingredient": "modern_industrialization:annealed_copper_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_cable" + "id": "modern_industrialization:annealed_copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/dust.json index 1626bf729..f4b69ecb4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/annealed_copper" + "ingredient": "#c:dusts/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_ingot" + "id": "modern_industrialization:annealed_copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/tiny_dust.json index 9cbae7d53..8800b3b9e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/annealed_copper" + "ingredient": "#c:tiny_dusts/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_nugget" + "id": "modern_industrialization:annealed_copper_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/double_ingot.json index e10b6c464..9856e1318 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_double_ingot" + "ingredient": "modern_industrialization:annealed_copper_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:annealed_copper_plate" + "id": "modern_industrialization:annealed_copper_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/main.json index 8dbb86a3c..f0ad6b7b9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/annealed_copper" + "ingredient": "#c:ingots/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_plate" + "id": "modern_industrialization:annealed_copper_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/block_from_ingot.json index bce6f3028..0019906c8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/annealed_copper" - }, - "y": { - "item": "modern_industrialization:annealed_copper_ingot" - } + "x": "#c:ingots/annealed_copper", + "y": "modern_industrialization:annealed_copper_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:annealed_copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json index afb6c1050..2db5e017d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:annealed_copper_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:annealed_copper_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/dust_from_tiny_dust.json index d6f41a3cf..f5258a38c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/annealed_copper" - }, - "y": { - "item": "modern_industrialization:annealed_copper_tiny_dust" - } + "x": "#c:tiny_dusts/annealed_copper", + "y": "modern_industrialization:annealed_copper_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:annealed_copper_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_block.json index 17bc5e32e..7b08624ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:annealed_copper_block" - } + "modern_industrialization:annealed_copper_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_nugget.json index 7b547959c..1b3aa1335 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/annealed_copper" - }, - "y": { - "item": "modern_industrialization:annealed_copper_nugget" - } + "x": "#c:nuggets/annealed_copper", + "y": "modern_industrialization:annealed_copper_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:annealed_copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/nugget_from_ingot.json index 1874edb42..5de831f67 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:annealed_copper_ingot" - } + "modern_industrialization:annealed_copper_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/tiny_dust_from_dust.json index 36fe08ce5..9a67d6ac9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:annealed_copper_dust" - } + "modern_industrialization:annealed_copper_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json index b2aee2d4b..f6ad43605 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_hot_ingot" + "ingredient": "modern_industrialization:annealed_copper_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_ingot" + "id": "modern_industrialization:annealed_copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/double_ingot.json index bc62bc13a..2abb52ef2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_double_ingot" + "ingredient": "modern_industrialization:annealed_copper_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:annealed_copper_dust" + "id": "modern_industrialization:annealed_copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/ingot.json index b13d4d854..f1056efd6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/annealed_copper" + "ingredient": "#c:ingots/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_dust" + "id": "modern_industrialization:annealed_copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/nugget.json index e3e2ddbb7..e8f014e8c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/annealed_copper" + "ingredient": "#c:nuggets/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_tiny_dust" + "id": "modern_industrialization:annealed_copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/plate.json index 74b48df8c..3d35f2b34 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/annealed_copper" + "ingredient": "#c:plates/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_dust" + "id": "modern_industrialization:annealed_copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json index 11196f57c..d035524b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_wire" + "ingredient": "modern_industrialization:annealed_copper_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:annealed_copper_tiny_dust" + "id": "modern_industrialization:annealed_copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/block.json index 86d06d097..ad80122a0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/annealed_copper" + "ingredient": "#c:ingots/annealed_copper" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_block" + "id": "modern_industrialization:annealed_copper_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json index fdf1d4052..165f9815e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:annealed_copper_wire" + "ingredient": "modern_industrialization:annealed_copper_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:annealed_copper_cable" + "id": "modern_industrialization:annealed_copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/double_ingot.json index 3c69264d2..f4e06769e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/annealed_copper" + "ingredient": "#c:ingots/annealed_copper" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_double_ingot" + "id": "modern_industrialization:annealed_copper_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/dust.json index 3301103d7..b2dd2d068 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/annealed_copper" + "ingredient": "#c:tiny_dusts/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_dust" + "id": "modern_industrialization:annealed_copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/ingot.json index 27c900175..577ae7c5e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/annealed_copper" + "ingredient": "#c:nuggets/annealed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_ingot" + "id": "modern_industrialization:annealed_copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/ingot.json index 4e25b62a3..deaf76706 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/annealed_copper" + "ingredient": "#c:storage_blocks/annealed_copper" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:annealed_copper_ingot" + "id": "modern_industrialization:annealed_copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/nugget.json index 93fcd74ba..627b20781 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/annealed_copper" + "ingredient": "#c:ingots/annealed_copper" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:annealed_copper_nugget" + "id": "modern_industrialization:annealed_copper_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/tiny_dust.json index 0b0cb2724..b6950f496 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/annealed_copper" + "ingredient": "#c:dusts/annealed_copper" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:annealed_copper_tiny_dust" + "id": "modern_industrialization:annealed_copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/vacuum_freezer/hot_ingot.json index b1babd514..cc7ed091b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_hot_ingot" + "ingredient": "modern_industrialization:annealed_copper_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:annealed_copper_ingot" + "id": "modern_industrialization:annealed_copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/wiremill/wire.json index ef7247af6..8b2a440e1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/annealed_copper" + "ingredient": "#c:plates/annealed_copper" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:annealed_copper_wire" + "id": "modern_industrialization:annealed_copper_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/block_from_ingot.json index 40e027751..4b13f6441 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/antimony" - }, - "y": { - "item": "modern_industrialization:antimony_ingot" - } + "x": "#c:ingots/antimony", + "y": "modern_industrialization:antimony_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:antimony_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/deepslate_to_ore.json index 57659c78f..270214222 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_antimony_ore" - } + "modern_industrialization:deepslate_antimony_ore" ], "result": { - "count": 1, "id": "modern_industrialization:antimony_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/dust_from_tiny_dust.json index 714fde5c9..17200f4c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/antimony" - }, - "y": { - "item": "modern_industrialization:antimony_tiny_dust" - } + "x": "#c:tiny_dusts/antimony", + "y": "modern_industrialization:antimony_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:antimony_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_block.json index acb1d74d0..938847dbd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:antimony_block" - } + "modern_industrialization:antimony_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_nugget.json index 9dfc93080..38b3c5df3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/antimony" - }, - "y": { - "item": "modern_industrialization:antimony_nugget" - } + "x": "#c:nuggets/antimony", + "y": "modern_industrialization:antimony_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/nugget_from_ingot.json index a76294837..a4cf9ed55 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:antimony_ingot" - } + "modern_industrialization:antimony_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_block_from_raw_metal.json index 0c8f40e68..bce51178e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/antimony" - }, - "y": { - "item": "modern_industrialization:raw_antimony" - } + "x": "#c:raw_materials/antimony", + "y": "modern_industrialization:raw_antimony" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_antimony_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_from_raw_metal_block.json index e20e38d79..6a22289e3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_antimony_block" - } + "modern_industrialization:raw_antimony_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/tiny_dust_from_dust.json index a746feb30..5f1140f1a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:antimony_dust" - } + "modern_industrialization:antimony_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ingot.json index 61294af90..1da3a3047 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/antimony" + "ingredient": "#c:ingots/antimony" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:antimony_dust" + "id": "modern_industrialization:antimony_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/nugget.json index 30b3778b3..b49753fdf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/antimony" + "ingredient": "#c:nuggets/antimony" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:antimony_tiny_dust" + "id": "modern_industrialization:antimony_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ore_to_raw.json index a185a3dd0..49aa4d071 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/antimony" + "ingredient": "#c:ores/antimony" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_antimony" + "id": "modern_industrialization:raw_antimony" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/raw_metal.json index 20203fe56..533b75374 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/antimony" + "ingredient": "#c:raw_materials/antimony" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:antimony_dust" + "id": "modern_industrialization:antimony_dust" }, { "amount": 1, - "item": "modern_industrialization:antimony_dust", + "id": "modern_industrialization:antimony_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/block.json index 273916d9e..934137c5f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/antimony" + "ingredient": "#c:ingots/antimony" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:antimony_block" + "id": "modern_industrialization:antimony_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/dust.json index 5115c7c76..dcf2e860c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/antimony" + "ingredient": "#c:tiny_dusts/antimony" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:antimony_dust" + "id": "modern_industrialization:antimony_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/ingot.json index e0b8bced5..89768ecc8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/antimony" + "ingredient": "#c:nuggets/antimony" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:antimony_ingot" + "id": "modern_industrialization:antimony_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/raw_metal_block.json index 0c4dd96cb..08f473116 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/antimony" + "ingredient": "#c:raw_materials/antimony" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_antimony_block" + "id": "modern_industrialization:raw_antimony_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_blasting.json index ae30ed2c8..8b68a7dac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:antimony_dust" - }, + "ingredient": "modern_industrialization:antimony_dust", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_smelting.json index 20312aa07..e848839dc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:antimony_dust" - }, + "ingredient": "modern_industrialization:antimony_dust", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_blasting.json index 1901cc25e..42e84b128 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_antimony_ore" - }, + "ingredient": "modern_industrialization:deepslate_antimony_ore", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_smelting.json index 20f076ea8..f37765722 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_deepslate_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_antimony_ore" - }, + "ingredient": "modern_industrialization:deepslate_antimony_ore", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_blasting.json index 5e0bd297f..de366cf35 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:antimony_ore" - }, + "ingredient": "modern_industrialization:antimony_ore", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_smelting.json index 5f5a0443f..407468a9a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/ore_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:antimony_ore" - }, + "ingredient": "modern_industrialization:antimony_ore", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_blasting.json index 3625cb595..19bb62ab7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_antimony" - }, + "ingredient": "modern_industrialization:raw_antimony", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_smelting.json index 0774519ac..979acbfda 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/raw_metal_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_antimony" - }, + "ingredient": "modern_industrialization:raw_antimony", "result": { - "count": 1, "id": "modern_industrialization:antimony_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_blasting.json index 1dabcbb6b..43cca9b38 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:antimony_tiny_dust" - }, + "ingredient": "modern_industrialization:antimony_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_smelting.json index e02de7d5f..2f3d6840a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:antimony_tiny_dust" - }, + "ingredient": "modern_industrialization:antimony_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:antimony_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/ingot.json index 121c3bbad..b64bc9345 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/antimony" + "ingredient": "#c:storage_blocks/antimony" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:antimony_ingot" + "id": "modern_industrialization:antimony_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/nugget.json index 81b6ba67a..f3b34213f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/antimony" + "ingredient": "#c:ingots/antimony" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:antimony_nugget" + "id": "modern_industrialization:antimony_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/raw_metal.json index ff89ba006..4b42192ed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_antimony" + "ingredient": "#c:storage_blocks/raw_antimony" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_antimony" + "id": "modern_industrialization:raw_antimony" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/tiny_dust.json index f68a0b903..e4e38fe43 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/antimony/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/antimony" + "ingredient": "#c:dusts/antimony" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:antimony_tiny_dust" + "id": "modern_industrialization:antimony_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/assembler/nuke.json b/src/generated/resources/data/modern_industrialization/recipe/materials/assembler/nuke.json new file mode 100644 index 000000000..9e92a8dd7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/assembler/nuke.json @@ -0,0 +1,39 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 600, + "eu": 32, + "fluid_inputs": [ + { + "amount": 50, + "ingredient": "modern_industrialization:tritium" + }, + { + "amount": 100, + "ingredient": "modern_industrialization:deuterium" + } + ], + "item_inputs": [ + { + "amount": 6, + "ingredient": "modern_industrialization:industrial_tnt" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:plutonium_ingot" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:processing_unit" + }, + { + "amount": 4, + "ingredient": "modern_industrialization:nuclear_alloy_plate" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "modern_industrialization:nuke" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json new file mode 100644 index 000000000..235e4824f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 600, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:polyvinyl_chloride" + } + ], + "item_inputs": [ + { + "amount": 3, + "ingredient": "modern_industrialization:superconductor_wire" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:cooling_cell" + } + ], + "item_outputs": [ + { + "amount": 6, + "id": "modern_industrialization:superconductor_cable" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/double_ingot.json index d0f682ac3..191663abb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_double_ingot" + "ingredient": "modern_industrialization:battery_alloy_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:battery_alloy_plate" + "id": "modern_industrialization:battery_alloy_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/main.json index 9b98767a6..b96c454cd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/battery_alloy" + "ingredient": "#c:ingots/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_plate" + "id": "modern_industrialization:battery_alloy_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/plate.json index 8a2419deb..cbb2a9f28 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_curved_plate" + "id": "modern_industrialization:battery_alloy_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/block_from_ingot.json index b47c6210f..15fb6e090 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/battery_alloy" - }, - "y": { - "item": "modern_industrialization:battery_alloy_ingot" - } + "x": "#c:ingots/battery_alloy", + "y": "modern_industrialization:battery_alloy_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/dust_from_tiny_dust.json index 44795a3f9..f8d693bac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/battery_alloy" - }, - "y": { - "item": "modern_industrialization:battery_alloy_tiny_dust" - } + "x": "#c:tiny_dusts/battery_alloy", + "y": "modern_industrialization:battery_alloy_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_block.json index 9a2654227..4908ffe1f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:battery_alloy_block" - } + "modern_industrialization:battery_alloy_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_nugget.json index 465c3ae6f..40ed35d06 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/battery_alloy" - }, - "y": { - "item": "modern_industrialization:battery_alloy_nugget" - } + "x": "#c:nuggets/battery_alloy", + "y": "modern_industrialization:battery_alloy_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/nugget_from_ingot.json index 874526992..345400cba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:battery_alloy_ingot" - } + "modern_industrialization:battery_alloy_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/tiny_dust_from_dust.json index 33ebf9155..a9f83b89d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:battery_alloy_dust" - } + "modern_industrialization:battery_alloy_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/curved_plate.json index 67fd789e2..989af29e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_curved_plate" + "ingredient": "modern_industrialization:battery_alloy_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_dust" + "id": "modern_industrialization:battery_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/double_ingot.json index 5624ef2a2..ce4f13e9f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_double_ingot" + "ingredient": "modern_industrialization:battery_alloy_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:battery_alloy_dust" + "id": "modern_industrialization:battery_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/ingot.json index 167840b43..068f1ed60 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/battery_alloy" + "ingredient": "#c:ingots/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_dust" + "id": "modern_industrialization:battery_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/nugget.json index 282592528..3c1ceb682 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/battery_alloy" + "ingredient": "#c:nuggets/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_tiny_dust" + "id": "modern_industrialization:battery_alloy_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/plate.json index 0afd0d2a8..94e3af177 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/battery_alloy" + "ingredient": "#c:plates/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_dust" + "id": "modern_industrialization:battery_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/block.json index 63359a353..5236a9bd5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/battery_alloy" + "ingredient": "#c:ingots/battery_alloy" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_block" + "id": "modern_industrialization:battery_alloy_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/double_ingot.json index 69fe50c28..b02c09faa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/battery_alloy" + "ingredient": "#c:ingots/battery_alloy" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_double_ingot" + "id": "modern_industrialization:battery_alloy_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/dust.json index a9781dcfe..1158d8e13 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/battery_alloy" + "ingredient": "#c:tiny_dusts/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_dust" + "id": "modern_industrialization:battery_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/ingot.json index e0880c946..0acd4f7c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/battery_alloy" + "ingredient": "#c:nuggets/battery_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:battery_alloy_ingot" + "id": "modern_industrialization:battery_alloy_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_blasting.json index 64c88d3db..ca3a93e22 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:battery_alloy_dust" - }, + "ingredient": "modern_industrialization:battery_alloy_dust", "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_smelting.json index cc3623f24..4de89ec84 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:battery_alloy_dust" - }, + "ingredient": "modern_industrialization:battery_alloy_dust", "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_blasting.json index 82c708150..9a5c11d96 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:battery_alloy_tiny_dust" - }, + "ingredient": "modern_industrialization:battery_alloy_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_smelting.json index a1a982409..aae1d91f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:battery_alloy_tiny_dust" - }, + "ingredient": "modern_industrialization:battery_alloy_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:battery_alloy_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/ingot.json index d5b916b2e..0cd5a750e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/battery_alloy" + "ingredient": "#c:storage_blocks/battery_alloy" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:battery_alloy_ingot" + "id": "modern_industrialization:battery_alloy_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/nugget.json index 0ce0f8def..9156ec070 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/battery_alloy" + "ingredient": "#c:ingots/battery_alloy" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:battery_alloy_nugget" + "id": "modern_industrialization:battery_alloy_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/tiny_dust.json index e30608774..a77678028 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/battery_alloy/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/battery_alloy" + "ingredient": "#c:dusts/battery_alloy" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:battery_alloy_tiny_dust" + "id": "modern_industrialization:battery_alloy_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/block_from_dust.json index caa819ca7..cab4e65d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/bauxite" - }, - "y": { - "item": "modern_industrialization:bauxite_dust" - } + "x": "#c:dusts/bauxite", + "y": "modern_industrialization:bauxite_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:bauxite_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/deepslate_to_ore.json index 7a99f03c9..7e2ea457a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_bauxite_ore" - } + "modern_industrialization:deepslate_bauxite_ore" ], "result": { - "count": 1, "id": "modern_industrialization:bauxite_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_block.json index 5ebe0c682..5e4ea9ab2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bauxite_block" - } + "modern_industrialization:bauxite_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_tiny_dust.json index cab8ea1f1..e599a1e0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/bauxite" - }, - "y": { - "item": "modern_industrialization:bauxite_tiny_dust" - } + "x": "#c:tiny_dusts/bauxite", + "y": "modern_industrialization:bauxite_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:bauxite_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/tiny_dust_from_dust.json index 8b8ac57c5..5b2f627b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bauxite_dust" - } + "modern_industrialization:bauxite_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/crushed_dust.json index 0d6528754..69b1f2b21 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bauxite_crushed_dust" + "ingredient": "modern_industrialization:bauxite_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bauxite_dust" + "id": "modern_industrialization:bauxite_dust" }, { "amount": 1, - "item": "modern_industrialization:bauxite_dust", + "id": "modern_industrialization:bauxite_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/ore_to_crushed.json index 8338404e5..72e50aa4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/bauxite" + "ingredient": "#c:ores/bauxite" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:bauxite_crushed_dust" + "id": "modern_industrialization:bauxite_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/block.json index 795dcf45c..8f2365f5a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/bauxite" + "ingredient": "#c:dusts/bauxite" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bauxite_block" + "id": "modern_industrialization:bauxite_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/dust.json index 0017f4ea9..a8d9b98a1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/bauxite" + "ingredient": "#c:tiny_dusts/bauxite" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bauxite_dust" + "id": "modern_industrialization:bauxite_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/dust.json index c2735cfb6..b529f6076 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/bauxite" + "ingredient": "#c:storage_blocks/bauxite" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:bauxite_dust" + "id": "modern_industrialization:bauxite_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/tiny_dust.json index 870ae7948..7617dfe1e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bauxite/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/bauxite" + "ingredient": "#c:dusts/bauxite" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:bauxite_tiny_dust" + "id": "modern_industrialization:bauxite_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/double_ingot.json index e1477e493..aa4d577ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_double_ingot" + "ingredient": "modern_industrialization:beryllium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:beryllium_plate" + "id": "modern_industrialization:beryllium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/main.json index 02edb12d0..6adc5c717 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/beryllium" + "ingredient": "#c:ingots/beryllium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_plate" + "id": "modern_industrialization:beryllium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/block_from_ingot.json index 687399a19..c21eeca7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/beryllium" - }, - "y": { - "item": "modern_industrialization:beryllium_ingot" - } + "x": "#c:ingots/beryllium", + "y": "modern_industrialization:beryllium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:beryllium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/dust_from_tiny_dust.json index efd4b0ff4..5bb3a408f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/beryllium" - }, - "y": { - "item": "modern_industrialization:beryllium_tiny_dust" - } + "x": "#c:tiny_dusts/beryllium", + "y": "modern_industrialization:beryllium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:beryllium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_block.json index 6fca81ecb..403d8ba13 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:beryllium_block" - } + "modern_industrialization:beryllium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_nugget.json index 31e3aeca2..091a53f36 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/beryllium" - }, - "y": { - "item": "modern_industrialization:beryllium_nugget" - } + "x": "#c:nuggets/beryllium", + "y": "modern_industrialization:beryllium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:beryllium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/nugget_from_ingot.json index 8a02023da..dff823968 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:beryllium_ingot" - } + "modern_industrialization:beryllium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/tiny_dust_from_dust.json index 7ef9a4b4c..468d5f9e4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:beryllium_dust" - } + "modern_industrialization:beryllium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/double_ingot.json index 17509af50..ad5ba7018 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_double_ingot" + "ingredient": "modern_industrialization:beryllium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:beryllium_dust" + "id": "modern_industrialization:beryllium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/ingot.json index e7aaec298..1a4ca0a54 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/beryllium" + "ingredient": "#c:ingots/beryllium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_dust" + "id": "modern_industrialization:beryllium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/nugget.json index f41e5ddbf..38f13c2f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/beryllium" + "ingredient": "#c:nuggets/beryllium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_tiny_dust" + "id": "modern_industrialization:beryllium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/plate.json index 3dea7873b..c71a9380d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/beryllium" + "ingredient": "#c:plates/beryllium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_dust" + "id": "modern_industrialization:beryllium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/block.json index 25a68ea13..fc821dcd0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/beryllium" + "ingredient": "#c:ingots/beryllium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_block" + "id": "modern_industrialization:beryllium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/double_ingot.json index 8e644bd50..211680bea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/beryllium" + "ingredient": "#c:ingots/beryllium" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_double_ingot" + "id": "modern_industrialization:beryllium_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/dust.json index b15bd72e9..23cd278ea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/beryllium" + "ingredient": "#c:tiny_dusts/beryllium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_dust" + "id": "modern_industrialization:beryllium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/ingot.json index 0ad103670..b667486cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/beryllium" + "ingredient": "#c:nuggets/beryllium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:beryllium_ingot" + "id": "modern_industrialization:beryllium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/ingot.json index 739ddd707..5312ba238 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/beryllium" + "ingredient": "#c:storage_blocks/beryllium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:beryllium_ingot" + "id": "modern_industrialization:beryllium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/nugget.json index b729ffed4..84f02a564 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/beryllium" + "ingredient": "#c:ingots/beryllium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:beryllium_nugget" + "id": "modern_industrialization:beryllium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/tiny_dust.json index 461281514..4b62c10bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/beryllium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/beryllium" + "ingredient": "#c:dusts/beryllium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:beryllium_tiny_dust" + "id": "modern_industrialization:beryllium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json new file mode 100644 index 000000000..a618c7837 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 600, + "eu": 64, + "fluid_inputs": [ + { + "amount": 250, + "ingredient": "modern_industrialization:oxygen" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/copper" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:annealed_copper_hot_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json new file mode 100644 index 000000000..5509a2bb7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 2000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:storage_blocks/bauxite" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:aluminum_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json new file mode 100644 index 000000000..f8c86e854 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 200, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/bauxite" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:aluminum_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json new file mode 100644 index 000000000..816084b77 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 100, + "eu": 4, + "fluid_outputs": [ + { + "amount": 90, + "id": "modern_industrialization:molten_redstone" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:redstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json new file mode 100644 index 000000000..c907b6c8a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 200, + "eu": 2, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:raw_synthetic_oil" + } + ], + "fluid_outputs": [ + { + "amount": 100, + "id": "modern_industrialization:synthetic_oil" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json new file mode 100644 index 000000000..217a8d806 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 400, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/quartz" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:coke_dust" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:silicon_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json new file mode 100644 index 000000000..0d5648b44 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 400, + "eu": 32, + "item_inputs": [ + { + "amount": 2, + "ingredient": "#c:dusts/quartz" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:carbon_dust" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "modern_industrialization:silicon_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json new file mode 100644 index 000000000..df7c26a09 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 300, + "eu": 4, + "fluid_outputs": [ + { + "amount": 90, + "id": "modern_industrialization:soldering_alloy" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/soldering_alloy" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json new file mode 100644 index 000000000..cf5078adf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 60, + "eu": 4, + "fluid_outputs": [ + { + "amount": 10, + "id": "modern_industrialization:soldering_alloy" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:tiny_dusts/soldering_alloy" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel.json new file mode 100644 index 000000000..6a01a96a0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 600, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:uncooked_steel_dust" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:steel_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json new file mode 100644 index 000000000..f3ef88ed5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 400, + "eu": 16, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:carbon_dust" + }, + { + "amount": 4, + "ingredient": "#c:dusts/iron" + } + ], + "item_outputs": [ + { + "amount": 5, + "id": "modern_industrialization:steel_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json new file mode 100644 index 000000000..66257b3e4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 1200, + "eu": 128, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/superconductor" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:superconductor_hot_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json new file mode 100644 index 000000000..8943cdc8b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 400, + "eu": 128, + "fluid_inputs": [ + { + "amount": 3000, + "ingredient": "modern_industrialization:manganese_sulfuric_solution" + } + ], + "fluid_outputs": [ + { + "amount": 2500, + "id": "modern_industrialization:manganese_sulfuric_solution" + } + ], + "item_inputs": [ + { + "amount": 3, + "ingredient": "#c:raw_materials/titanium" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:titanium_hot_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/main.json index 72b56dd94..cb7f4bd55 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/blastproof_alloy" + "ingredient": "#c:ingots/blastproof_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:blastproof_alloy_plate" + "id": "modern_industrialization:blastproof_alloy_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/plate.json index 06511d44d..004a36937 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/blastproof_alloy" + "ingredient": "#c:plates/blastproof_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "id": "modern_industrialization:blastproof_alloy_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/craft/large_plate.json index bd0205659..22fce325c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/blastproof_alloy" - } + "x": "#c:plates/blastproof_alloy" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:blastproof_alloy_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/packer/large_plate.json index 2a8f4b342..428f25cd1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/blastproof_alloy/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/blastproof_alloy" + "ingredient": "#c:plates/blastproof_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:blastproof_alloy_large_plate" + "id": "modern_industrialization:blastproof_alloy_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/dust_from_tiny_dust.json index dc3dc42a9..f2ec790bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/brick" - }, - "y": { - "item": "modern_industrialization:brick_tiny_dust" - } + "x": "#c:tiny_dusts/brick", + "y": "modern_industrialization:brick_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:brick_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/tiny_dust_from_dust.json index b77c7279f..f7aa3954d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:brick_dust" - } + "modern_industrialization:brick_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/macerator/ingot.json index 253dbcd50..6c9ac2114 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:brick" + "ingredient": "minecraft:brick" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:brick_dust" + "id": "modern_industrialization:brick_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/packer/dust.json index e6bb7f7c0..17364bd2b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/brick" + "ingredient": "#c:tiny_dusts/brick" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:brick_dust" + "id": "modern_industrialization:brick_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_blasting.json index 438050616..ca9076eb0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:brick_dust" - }, + "ingredient": "modern_industrialization:brick_dust", "result": { - "count": 1, "id": "minecraft:brick" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_smelting.json index d3b6f2a8b..ff9f9afb0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:brick_dust" - }, + "ingredient": "modern_industrialization:brick_dust", "result": { - "count": 1, "id": "minecraft:brick" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/unpacker/tiny_dust.json index 9748e61b1..cbc629ed9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/brick/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/brick/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/brick" + "ingredient": "#c:dusts/brick" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:brick_tiny_dust" + "id": "modern_industrialization:brick_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/barrel.json index 30a64ab40..84f645e4d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/barrel.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:barrels/wooden" + "ingredient": "#c:barrels/wooden" }, { "amount": 8, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_barrel" + "id": "modern_industrialization:bronze_barrel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/drill_head.json index ef10e7bbb..a5d4fb69c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" }, { "amount": 2, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_drill_head" + "id": "modern_industrialization:bronze_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/gear.json index a34c58f2a..eb2f7539d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 1, - "item": "modern_industrialization:bronze_ring" + "ingredient": "modern_industrialization:bronze_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_gear" + "id": "modern_industrialization:bronze_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/rotor.json index 5e05927ca..c0725936e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/rotor.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_blade" + "ingredient": "modern_industrialization:bronze_blade" }, { "amount": 1, - "item": "modern_industrialization:bronze_ring" + "ingredient": "modern_industrialization:bronze_ring" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_rotor" + "id": "modern_industrialization:bronze_rotor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/tank.json index 8c064e21a..05afe8558 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/assembler/tank.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" }, { "amount": 1, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_tank" + "id": "modern_industrialization:bronze_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/double_ingot.json index 26d78cd67..9abb058c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_double_ingot" + "ingredient": "modern_industrialization:bronze_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_plate" + "id": "modern_industrialization:bronze_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/main.json index 9db547421..f8fb7b6bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/bronze" + "ingredient": "#c:ingots/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_plate" + "id": "modern_industrialization:bronze_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/plate.json index 91e553126..60aa46f8c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_curved_plate" + "id": "modern_industrialization:bronze_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/ring.json index d43db0b02..dc99cb26b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_ring" + "id": "modern_industrialization:bronze_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/barrel.json index 6a70381df..59efd6b72 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/barrel.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/bronze" - }, - "b": { - "tag": "c:barrels/wooden" - } + "#": "#c:plates/bronze", + "b": "#c:barrels/wooden" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_barrel" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/blade.json index 81bd203ff..c713f55d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "tag": "c:rods/bronze" - }, - "P": { - "item": "modern_industrialization:bronze_curved_plate" - } + "I": "#c:rods/bronze", + "P": "modern_industrialization:bronze_curved_plate" }, "pattern": [ "P", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/block_from_ingot.json index 2179920ec..81c35d888 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/bronze" - }, - "y": { - "item": "modern_industrialization:bronze_ingot" - } + "x": "#c:ingots/bronze", + "y": "modern_industrialization:bronze_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/drill_head.json index 3cb3ac132..2f9476922 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/bronze" - }, - "R": { - "tag": "c:rods/bronze" - }, - "b": { - "item": "modern_industrialization:bronze_bolt" - }, - "c": { - "item": "modern_industrialization:bronze_curved_plate" - }, - "p": { - "tag": "c:plates/bronze" - } + "G": "#c:gears/bronze", + "R": "#c:rods/bronze", + "b": "modern_industrialization:bronze_bolt", + "c": "modern_industrialization:bronze_curved_plate", + "p": "#c:plates/bronze" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/dust_from_tiny_dust.json index 0fa02b077..0bd17a369 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/bronze" - }, - "y": { - "item": "modern_industrialization:bronze_tiny_dust" - } + "x": "#c:tiny_dusts/bronze", + "y": "modern_industrialization:bronze_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/gear.json index 872f10669..07f5b379e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/bronze" - }, - "R": { - "item": "modern_industrialization:bronze_ring" - }, - "b": { - "item": "modern_industrialization:bronze_bolt" - } + "P": "#c:plates/bronze", + "R": "modern_industrialization:bronze_ring", + "b": "modern_industrialization:bronze_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_block.json index e293eaf8c..46d1f4441 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_block" - } + "modern_industrialization:bronze_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_nugget.json index 248326adb..472dc31b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/bronze" - }, - "y": { - "item": "modern_industrialization:bronze_nugget" - } + "x": "#c:nuggets/bronze", + "y": "modern_industrialization:bronze_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/nugget_from_ingot.json index d32da1854..619cc60b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_ingot" - } + "modern_industrialization:bronze_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ring.json index c8f8080a7..1965897bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/bronze" - }, - "b": { - "item": "modern_industrialization:bronze_bolt" - } + "R": "#c:rods/bronze", + "b": "modern_industrialization:bronze_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/rotor.json index 6df7c9e5a..6d0f46fe1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/rotor.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "B": { - "item": "modern_industrialization:bronze_blade" - }, - "R": { - "item": "modern_industrialization:bronze_ring" - }, - "b": { - "item": "modern_industrialization:bronze_bolt" - } + "B": "modern_industrialization:bronze_blade", + "R": "modern_industrialization:bronze_ring", + "b": "modern_industrialization:bronze_bolt" }, "pattern": [ "bBb", @@ -18,7 +12,6 @@ "bBb" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_rotor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tank.json index ee1bbc868..34f765783 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tank.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/bronze" - }, - "G": { - "tag": "c:glass_blocks" - } + "#": "#c:plates/bronze", + "G": "#c:glass_blocks" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:bronze_tank" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tiny_dust_from_dust.json index 7c257b917..713e5bac8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_dust" - } + "modern_industrialization:bronze_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/double_ingot.json index bfad9c781..8a4a976db 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_double_ingot" + "ingredient": "modern_industrialization:bronze_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_rod" + "id": "modern_industrialization:bronze_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/main.json index fd6e89fad..e3b6cf1ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/bronze" + "ingredient": "#c:ingots/bronze" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_rod" + "id": "modern_industrialization:bronze_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/rod.json index 7ac7d37e1..a61600ca3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_bolt" + "id": "modern_industrialization:bronze_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt.json index 9eaf29eb8..6a6a4ba31 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 4, "id": "modern_industrialization:bronze_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt_with_tool.json index b0e18bfa1..669d6c35d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 8, "id": "modern_industrialization:bronze_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate.json index aa8f08250..d872d244e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:bronze_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate_with_tool.json index 79e3b372a..50da140dc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_curved_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 2, "id": "modern_industrialization:bronze_curved_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate.json index 1aa365dab..9fe7b30a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:bronze_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate_with_tool.json index 02c1cc6f9..fc3772734 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 2, "id": "modern_industrialization:bronze_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring.json index 85c52f6a9..396513264 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 2, "id": "modern_industrialization:bronze_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring_with_tool.json index 4208cd9ee..c183d6962 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 4, "id": "modern_industrialization:bronze_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod.json index 236fc88fb..178fae6c9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 2, "id": "modern_industrialization:bronze_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod_with_tool.json index a75d70b4e..c7cdc0dbe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/double_ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:bronze_double_ingot" - }, + "ingredient": "modern_industrialization:bronze_double_ingot", "result": { "count": 4, "id": "modern_industrialization:bronze_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt.json index cfcd8967d..6ce43920b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { "count": 2, "id": "modern_industrialization:bronze_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt_with_tool.json index 91a1f9bb0..251481635 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { "count": 4, "id": "modern_industrialization:bronze_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate.json index 0a98dd082..5e6ea7ce1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate_with_tool.json index 21ddeafd2..b4184f2a5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 40, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_double_ingot.json index b97a07e02..5f4812522 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_double_ingot.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_double_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_dust.json index 70578b8e2..5e7222174 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate.json index 9e74975b1..566f0b17b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate_with_tool.json index 47ab3224b..f43fdf5f5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring.json index 1efbd652e..5a8004572 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring_with_tool.json index 9c42a92fe..86dead2bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { "count": 2, "id": "modern_industrialization:bronze_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod.json index 1e51e3b69..f8c98409a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod_with_tool.json index eee5aa40e..43b0738ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/bronze" - }, + "ingredient": "#c:ingots/bronze", "result": { "count": 2, "id": "modern_industrialization:bronze_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/nugget_to_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/nugget_to_tiny_dust.json index 8b81f22c9..e8b8a7125 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/nugget_to_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/nugget_to_tiny_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:nuggets/bronze" - }, + "ingredient": "#c:nuggets/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_tiny_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/plate_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/plate_to_curved_plate_with_tool.json index 5b6ff95f1..8564de9ae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/plate_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/plate_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:plates/bronze" - }, + "ingredient": "#c:plates/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_bolt_with_tool.json index 02b4baba5..0c4a2446b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/bronze" - }, + "ingredient": "#c:rods/bronze", "result": { "count": 2, "id": "modern_industrialization:bronze_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_ring_with_tool.json index c843d9286..43ddc722e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/forge_hammer/rod_to_ring_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/bronze" - }, + "ingredient": "#c:rods/bronze", "result": { - "count": 1, "id": "modern_industrialization:bronze_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/blade.json index e2d80531e..ad4af6707 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/blade.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_blade" + "ingredient": "modern_industrialization:bronze_blade" } ], "item_outputs": [ { "amount": 5, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/bolt.json index fde17658e..c43f97bd1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_bolt" + "ingredient": "modern_industrialization:bronze_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/curved_plate.json index a403609c0..89558ccf7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/double_ingot.json index 70a7cd6ff..943272ba8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_double_ingot" + "ingredient": "modern_industrialization:bronze_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/drill_head.json index c51f92693..28118c3d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_drill_head" + "ingredient": "modern_industrialization:bronze_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/gear.json index d4ad7b746..f54478881 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/bronze" + "ingredient": "#c:gears/bronze" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ingot.json index 4b03a6926..08c73cb3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/bronze" + "ingredient": "#c:ingots/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/nugget.json index 7a4bfe683..3419bc278 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/bronze" + "ingredient": "#c:nuggets/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/plate.json index 4b15e2c1d..c83564dd9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/bronze" + "ingredient": "#c:plates/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ring.json index e3e725192..436f36ba0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_ring" + "ingredient": "modern_industrialization:bronze_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rod.json index e053dcf14..484651448 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rotor.json index 1d3434871..e43aa1fa7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/macerator/rotor.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_rotor" + "ingredient": "modern_industrialization:bronze_rotor" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/blade.json index 0f652326b..10c838837 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:bronze_curved_plate" + "ingredient": "modern_industrialization:bronze_curved_plate" }, { "amount": 1, - "tag": "c:rods/bronze" + "ingredient": "#c:rods/bronze" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:bronze_blade" + "id": "modern_industrialization:bronze_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/block.json index 2fdded22b..69bd6a47d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/bronze" + "ingredient": "#c:ingots/bronze" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_block" + "id": "modern_industrialization:bronze_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/double_ingot.json index 9d1fcce02..8554909c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/bronze" + "ingredient": "#c:ingots/bronze" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_double_ingot" + "id": "modern_industrialization:bronze_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/dust.json index 0c74f9c98..076525f05 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/bronze" + "ingredient": "#c:tiny_dusts/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_dust" + "id": "modern_industrialization:bronze_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/ingot.json index 940224cb2..97a836be5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/bronze" + "ingredient": "#c:nuggets/bronze" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_ingot" + "id": "modern_industrialization:bronze_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_blasting.json index 9c5735dd8..bee6f7747 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:bronze_dust" - }, + "ingredient": "modern_industrialization:bronze_dust", "result": { - "count": 1, "id": "modern_industrialization:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_smelting.json index 63b39e77a..c09ada592 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:bronze_dust" - }, + "ingredient": "modern_industrialization:bronze_dust", "result": { - "count": 1, "id": "modern_industrialization:bronze_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_blasting.json index 185bf9555..498292a3a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:bronze_tiny_dust" - }, + "ingredient": "modern_industrialization:bronze_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_smelting.json index 6184da973..ef280cdc5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:bronze_tiny_dust" - }, + "ingredient": "modern_industrialization:bronze_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:bronze_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/ingot.json index 9e65f35f0..562050ad2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/bronze" + "ingredient": "#c:storage_blocks/bronze" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:bronze_ingot" + "id": "modern_industrialization:bronze_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/nugget.json index d41c892cb..a4b948ea4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/bronze" + "ingredient": "#c:ingots/bronze" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:bronze_nugget" + "id": "modern_industrialization:bronze_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/tiny_dust.json index 5f28b49ae..7ccab1008 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/bronze" + "ingredient": "#c:dusts/bronze" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:bronze_tiny_dust" + "id": "modern_industrialization:bronze_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze_dust.json new file mode 100644 index 000000000..587d67c72 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze_dust.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "#c:dusts/copper", + "#c:dusts/copper", + "#c:dusts/copper", + "#c:dusts/tin" + ], + "result": { + "count": 3, + "id": "modern_industrialization:bronze_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/bronze_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze_tiny_dust.json new file mode 100644 index 000000000..eba5f9584 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/bronze_tiny_dust.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "#c:tiny_dusts/copper", + "#c:tiny_dusts/copper", + "#c:tiny_dusts/copper", + "#c:tiny_dusts/tin" + ], + "result": { + "count": 3, + "id": "modern_industrialization:bronze_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/assembler/fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/assembler/fuel_rod.json index ae646946d..3b1dc810c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/assembler/fuel_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/assembler/fuel_rod.json @@ -5,35 +5,35 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" }, { "amount": 100, - "fluid": "modern_industrialization:helium" + "ingredient": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 18, - "tag": "c:rods/cadmium" + "ingredient": "#c:rods/cadmium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_control_rod" + "id": "modern_industrialization:cadmium_control_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/double_ingot.json index 812a67bc5..e3dd4cb44 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_double_ingot" + "ingredient": "modern_industrialization:cadmium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cadmium_plate" + "id": "modern_industrialization:cadmium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/main.json index dc9eb4c9a..dfb508099 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/cadmium" + "ingredient": "#c:ingots/cadmium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_plate" + "id": "modern_industrialization:cadmium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/dust_from_tiny_dust.json index 6168a1562..127d71898 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/cadmium" - }, - "y": { - "item": "modern_industrialization:cadmium_tiny_dust" - } + "x": "#c:tiny_dusts/cadmium", + "y": "modern_industrialization:cadmium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:cadmium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/tiny_dust_from_dust.json index 29d7d5906..e650f0900 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:cadmium_dust" - } + "modern_industrialization:cadmium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/double_ingot.json index e512f55fa..69eac8271 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_double_ingot" + "ingredient": "modern_industrialization:cadmium_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:cadmium_rod" + "id": "modern_industrialization:cadmium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/main.json index 0b459586b..e445b69fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/cadmium" + "ingredient": "#c:ingots/cadmium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cadmium_rod" + "id": "modern_industrialization:cadmium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/double_ingot.json index 490f81145..6eacc09c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_double_ingot" + "ingredient": "modern_industrialization:cadmium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cadmium_dust" + "id": "modern_industrialization:cadmium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/ingot.json index f09f6aa67..6d8744450 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/cadmium" + "ingredient": "#c:ingots/cadmium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_dust" + "id": "modern_industrialization:cadmium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/plate.json index feb5bd46c..5132302de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/cadmium" + "ingredient": "#c:plates/cadmium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_dust" + "id": "modern_industrialization:cadmium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/rod.json index 956911f47..8fd0d600d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/cadmium" + "ingredient": "#c:rods/cadmium" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:cadmium_tiny_dust" + "id": "modern_industrialization:cadmium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/double_ingot.json index 37a3c8f52..c9bcc3e12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/cadmium" + "ingredient": "#c:ingots/cadmium" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_double_ingot" + "id": "modern_industrialization:cadmium_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/dust.json index 219544e21..34a40975a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/cadmium" + "ingredient": "#c:tiny_dusts/cadmium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cadmium_dust" + "id": "modern_industrialization:cadmium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_blasting.json index c235341b1..ef71eb9a5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:cadmium_dust" - }, + "ingredient": "modern_industrialization:cadmium_dust", "result": { - "count": 1, "id": "modern_industrialization:cadmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_smelting.json index d5c4e5137..63e14f40d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:cadmium_dust" - }, + "ingredient": "modern_industrialization:cadmium_dust", "result": { - "count": 1, "id": "modern_industrialization:cadmium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/unpacker/tiny_dust.json index db23668c4..d9d2dfe8e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cadmium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/cadmium" + "ingredient": "#c:dusts/cadmium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:cadmium_tiny_dust" + "id": "modern_industrialization:cadmium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/compressor/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/compressor/dust.json index 68d1173ba..bcd0a6fc5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/compressor/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/compressor/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/carbon" + "ingredient": "#c:dusts/carbon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:carbon_plate" + "id": "modern_industrialization:carbon_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/dust_from_tiny_dust.json index c49748b6b..2ef924ef7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/carbon" - }, - "y": { - "item": "modern_industrialization:carbon_tiny_dust" - } + "x": "#c:tiny_dusts/carbon", + "y": "modern_industrialization:carbon_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:carbon_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/large_plate.json index 174a1229a..03f24a19b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/carbon" - } + "x": "#c:plates/carbon" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:carbon_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/tiny_dust_from_dust.json index 32c14acf4..6fec942d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:carbon_dust" - } + "modern_industrialization:carbon_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/large_plate.json index 20efd2494..641896564 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:carbon_large_plate" + "ingredient": "modern_industrialization:carbon_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:carbon_dust" + "id": "modern_industrialization:carbon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/plate.json index 4dedbf1b9..31b1302f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/carbon" + "ingredient": "#c:plates/carbon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:carbon_dust" + "id": "modern_industrialization:carbon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/dust.json index a4ebb7b84..b51f396a2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/carbon" + "ingredient": "#c:tiny_dusts/carbon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:carbon_dust" + "id": "modern_industrialization:carbon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/large_plate.json index b6c8f9298..4a0a3f23f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/carbon" + "ingredient": "#c:plates/carbon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:carbon_large_plate" + "id": "modern_industrialization:carbon_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/unpacker/tiny_dust.json index 82b574e33..fdceae1b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/carbon/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/carbon" + "ingredient": "#c:dusts/carbon" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:carbon_tiny_dust" + "id": "modern_industrialization:carbon_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/carbon.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/carbon.json new file mode 100644 index 000000000..8bc275414 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/carbon.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 400, + "eu": 16, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/coal" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:carbon_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json new file mode 100644 index 000000000..7de745655 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 2400, + "eu": 16, + "item_inputs": [ + { + "amount": 6, + "ingredient": "#c:dusts/ruby" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:chromium_crushed_dust" + }, + { + "amount": 2, + "id": "modern_industrialization:aluminum_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/deuterium.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/deuterium.json new file mode 100644 index 000000000..a4e9a8a72 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/deuterium.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 1200, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:hydrogen" + } + ], + "fluid_outputs": [ + { + "amount": 20, + "id": "modern_industrialization:deuterium" + }, + { + "amount": 1, + "id": "modern_industrialization:tritium" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/flint.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/flint.json new file mode 100644 index 000000000..1eb907f08 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/flint.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 300, + "eu": 8, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:gravel" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:flint" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json new file mode 100644 index 000000000..6eeb9e32e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 1200, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 20, + "id": "modern_industrialization:heavy_water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/helium_3.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/helium_3.json new file mode 100644 index 000000000..9ac5185bf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/helium_3.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 2000, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:helium" + } + ], + "fluid_outputs": [ + { + "amount": 5, + "id": "modern_industrialization:helium_3" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json new file mode 100644 index 000000000..c78a896b4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 100, + "eu": 32, + "item_inputs": [ + { + "amount": 27, + "ingredient": "#c:dusts/lignite_coal" + } + ], + "item_outputs": [ + { + "amount": 10, + "id": "modern_industrialization:coal_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json new file mode 100644 index 000000000..7e66f783c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 600, + "eu": 24, + "fluid_inputs": [ + { + "amount": 3000, + "ingredient": "modern_industrialization:liquid_air" + } + ], + "fluid_outputs": [ + { + "amount": 650, + "id": "modern_industrialization:oxygen" + }, + { + "amount": 2315, + "id": "modern_industrialization:nitrogen" + }, + { + "amount": 35, + "id": "modern_industrialization:argon" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json new file mode 100644 index 000000000..d5d26eb79 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 1200, + "eu": 8, + "item_inputs": [ + { + "amount": 6, + "ingredient": "minecraft:raw_iron" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "modern_industrialization:iron_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:manganese_crushed_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json new file mode 100644 index 000000000..259d9dc5c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 2400, + "eu": 10, + "fluid_outputs": [ + { + "amount": 300, + "id": "modern_industrialization:helium" + } + ], + "item_inputs": [ + { + "amount": 9, + "ingredient": "#c:dusts/monazite" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:neodymium_dust" + }, + { + "amount": 3, + "id": "modern_industrialization:yttrium_dust" + }, + { + "amount": 3, + "id": "modern_industrialization:cadmium_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json new file mode 100644 index 000000000..0a05d762f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 240, + "eu": 10, + "item_inputs": [ + { + "amount": 9, + "ingredient": "#c:tiny_dusts/monazite" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:neodymium_tiny_dust" + }, + { + "amount": 3, + "id": "modern_industrialization:yttrium_tiny_dust" + }, + { + "amount": 3, + "id": "modern_industrialization:cadmium_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json new file mode 100644 index 000000000..6a77f1f2d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 6000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:he_mox_fuel_rod_depleted" + } + ], + "item_outputs": [ + { + "amount": 36, + "id": "modern_industrialization:uranium_238_tiny_dust" + }, + { + "amount": 36, + "id": "modern_industrialization:plutonium_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json new file mode 100644 index 000000000..4ea85283c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 6000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:he_uranium_fuel_rod_depleted" + } + ], + "item_outputs": [ + { + "amount": 36, + "id": "modern_industrialization:uranium_238_tiny_dust" + }, + { + "amount": 18, + "id": "modern_industrialization:plutonium_tiny_dust" + }, + { + "amount": 18, + "id": "modern_industrialization:uranium_235_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json new file mode 100644 index 000000000..b14437eeb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 6000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:le_mox_fuel_rod_depleted" + } + ], + "item_outputs": [ + { + "amount": 48, + "id": "modern_industrialization:uranium_238_tiny_dust" + }, + { + "amount": 30, + "id": "modern_industrialization:plutonium_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json new file mode 100644 index 000000000..30c6a1ef3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 6000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:le_uranium_fuel_rod_depleted" + } + ], + "item_outputs": [ + { + "amount": 48, + "id": "modern_industrialization:uranium_238_tiny_dust" + }, + { + "amount": 24, + "id": "modern_industrialization:plutonium_tiny_dust" + }, + { + "amount": 6, + "id": "modern_industrialization:uranium_235_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json new file mode 100644 index 000000000..a3eec02b4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json @@ -0,0 +1,26 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 6000, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:uranium_fuel_rod_depleted" + } + ], + "item_outputs": [ + { + "amount": 53, + "id": "modern_industrialization:uranium_238_tiny_dust" + }, + { + "amount": 27, + "id": "modern_industrialization:plutonium_tiny_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:uranium_235_tiny_dust", + "probability": 0.66 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json new file mode 100644 index 000000000..f6aee3b84 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json @@ -0,0 +1,24 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 1200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:platinum_sulfuric_solution" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:purified_platinum_sulfuric_solution" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:iridium_tiny_dust", + "probability": 0.05 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json new file mode 100644 index 000000000..da2038f79 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json @@ -0,0 +1,30 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 1200, + "eu": 8, + "item_inputs": [ + { + "amount": 10, + "ingredient": "minecraft:redstone" + } + ], + "item_outputs": [ + { + "amount": 5, + "id": "modern_industrialization:iron_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:ruby_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:quartz_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:neodymium_tiny_dust", + "probability": 0.5 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/uranium.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/uranium.json new file mode 100644 index 000000000..bce6c9753 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/uranium.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 6000, + "eu": 64, + "fluid_outputs": [ + { + "amount": 150, + "id": "modern_industrialization:helium" + } + ], + "item_inputs": [ + { + "amount": 9, + "ingredient": "#c:dusts/uranium" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:uranium_235_tiny_dust" + }, + { + "amount": 64, + "id": "modern_industrialization:uranium_238_tiny_dust" + }, + { + "amount": 16, + "id": "modern_industrialization:uranium_238_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/wax.json b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/wax.json new file mode 100644 index 000000000..4eada2f19 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/centrifuge/wax.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 200, + "ingredient": "modern_industrialization:naphtha" + } + ], + "fluid_outputs": [ + { + "amount": 150, + "id": "modern_industrialization:lubricant" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:wax" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json new file mode 100644 index 000000000..ef8099f7e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "modern_industrialization:hydrochloric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 9000, + "id": "modern_industrialization:chromium_hydrochloric_solution" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:chromium_crushed_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json new file mode 100644 index 000000000..192d476e9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:oxygen" + }, + { + "amount": 2000, + "ingredient": "modern_industrialization:deuterium" + } + ], + "fluid_outputs": [ + { + "amount": 3000, + "id": "modern_industrialization:heavy_water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json new file mode 100644 index 000000000..4cf5e9aa3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 100, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:hydrogen" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:chlorine" + } + ], + "fluid_outputs": [ + { + "amount": 2000, + "id": "modern_industrialization:hydrochloric_acid" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json new file mode 100644 index 000000000..57c9f0a1f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "modern_industrialization:sulfuric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 9000, + "id": "modern_industrialization:manganese_sulfuric_solution" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:manganese_crushed_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json new file mode 100644 index 000000000..cb0802dbd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "modern_industrialization:sulfuric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 9000, + "id": "modern_industrialization:platinum_sulfuric_solution" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:raw_materials/platinum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json new file mode 100644 index 000000000..18ee4a040 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:oxygen" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:hydrogen" + } + ], + "fluid_outputs": [ + { + "amount": 2000, + "id": "modern_industrialization:sodium_hydroxide" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/sodium" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json new file mode 100644 index 000000000..5e96d6013 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 16, + "fluid_inputs": [ + { + "amount": 200, + "ingredient": "modern_industrialization:oxygen" + }, + { + "amount": 200, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:sulfuric_acid" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/sulfur" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/water.json new file mode 100644 index 000000000..a45e8248e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chemical_reactor/water.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:oxygen" + }, + { + "amount": 2000, + "ingredient": "modern_industrialization:hydrogen" + } + ], + "fluid_outputs": [ + { + "amount": 3000, + "id": "minecraft:water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/blast_furnace/dust.json index 2ee94ac86..d818f9bcb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/chromium" + "ingredient": "#c:dusts/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_hot_ingot" + "id": "modern_industrialization:chromium_hot_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/double_ingot.json index 9a41918e1..85576f067 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_double_ingot" + "ingredient": "modern_industrialization:chromium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:chromium_plate" + "id": "modern_industrialization:chromium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/main.json index d4580be29..cc39147d0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/chromium" + "ingredient": "#c:ingots/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_plate" + "id": "modern_industrialization:chromium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/block_from_ingot.json index ede805607..d607c735d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/chromium" - }, - "y": { - "item": "modern_industrialization:chromium_ingot" - } + "x": "#c:ingots/chromium", + "y": "modern_industrialization:chromium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:chromium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/dust_from_tiny_dust.json index 2c4191793..693aeed18 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/chromium" - }, - "y": { - "item": "modern_industrialization:chromium_tiny_dust" - } + "x": "#c:tiny_dusts/chromium", + "y": "modern_industrialization:chromium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:chromium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_block.json index 1f9f407e6..6cef42644 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:chromium_block" - } + "modern_industrialization:chromium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_nugget.json index 5316ba0f6..b3a7c9ab8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/chromium" - }, - "y": { - "item": "modern_industrialization:chromium_nugget" - } + "x": "#c:nuggets/chromium", + "y": "modern_industrialization:chromium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:chromium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/nugget_from_ingot.json index 57d8ecbb8..64f32563d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:chromium_ingot" - } + "modern_industrialization:chromium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/tiny_dust_from_dust.json index 85db070ae..0b1e42e2a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:chromium_dust" - } + "modern_industrialization:chromium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json index 3cefd3344..524dba785 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_hot_ingot" + "ingredient": "modern_industrialization:chromium_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_ingot" + "id": "modern_industrialization:chromium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/double_ingot.json index d28953339..109e98682 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_double_ingot" + "ingredient": "modern_industrialization:chromium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:chromium_dust" + "id": "modern_industrialization:chromium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/ingot.json index bc55d0295..e7dbe20bb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/chromium" + "ingredient": "#c:ingots/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_dust" + "id": "modern_industrialization:chromium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/nugget.json index 534a0a7cb..b666f476b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/chromium" + "ingredient": "#c:nuggets/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_tiny_dust" + "id": "modern_industrialization:chromium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/plate.json index 6ff943c59..e3cd19d64 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/chromium" + "ingredient": "#c:plates/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_dust" + "id": "modern_industrialization:chromium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/block.json index 454d272b8..14675d7ff 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/chromium" + "ingredient": "#c:ingots/chromium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_block" + "id": "modern_industrialization:chromium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/double_ingot.json index 2c31cc9fb..5f72dd19b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/chromium" + "ingredient": "#c:ingots/chromium" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_double_ingot" + "id": "modern_industrialization:chromium_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/dust.json index 27eb3cc9b..445cf477a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_dust" + "id": "modern_industrialization:chromium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/ingot.json index e994f3147..d9a4c548e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/chromium" + "ingredient": "#c:nuggets/chromium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_ingot" + "id": "modern_industrialization:chromium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/ingot.json index e5c2ed0f0..e8ab3b8d7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/chromium" + "ingredient": "#c:storage_blocks/chromium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:chromium_ingot" + "id": "modern_industrialization:chromium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/nugget.json index 976cf08f4..0a8e8c8c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/chromium" + "ingredient": "#c:ingots/chromium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:chromium_nugget" + "id": "modern_industrialization:chromium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/tiny_dust.json index de7d3fb9c..c0cce89ab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/chromium" + "ingredient": "#c:dusts/chromium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:chromium_tiny_dust" + "id": "modern_industrialization:chromium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/vacuum_freezer/hot_ingot.json index 9620d5a53..05a5bfe20 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_hot_ingot" + "ingredient": "modern_industrialization:chromium_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:chromium_ingot" + "id": "modern_industrialization:chromium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/compressor/coal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/compressor/coal.json index 34dfe22f5..f8e1ff756 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/compressor/coal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/compressor/coal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/coal" + "ingredient": "#c:dusts/coal" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:coal" + "id": "minecraft:coal" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/deepslate_to_ore.json index 9268e2c63..c4924bacf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_coal_ore" - } + "minecraft:deepslate_coal_ore" ], "result": { - "count": 1, "id": "minecraft:coal_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/dust_from_tiny_dust.json index dac901159..55633a112 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/coal" - }, - "y": { - "item": "modern_industrialization:coal_tiny_dust" - } + "x": "#c:tiny_dusts/coal", + "y": "modern_industrialization:coal_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:coal_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/tiny_dust_from_dust.json index adf6f77fd..85a40412d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:coal_dust" - } + "modern_industrialization:coal_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/crushed_dust_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/crushed_dust_to_dust_with_tool.json index babb697e2..6519c2c81 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/crushed_dust_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/crushed_dust_to_dust_with_tool.json @@ -2,9 +2,7 @@ "type": "modern_industrialization:forge_hammer", "count": 3, "damage": 30, - "ingredient": { - "item": "modern_industrialization:coal_crushed_dust" - }, + "ingredient": "modern_industrialization:coal_crushed_dust", "result": { "count": 4, "id": "modern_industrialization:coal_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust.json index 93b0c73c2..08bb23dcd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ores/coal" - }, + "ingredient": "#c:ores/coal", "result": { "count": 2, "id": "modern_industrialization:coal_crushed_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust_with_tool.json index 28221664b..d69c1dac6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_crushed_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ores/coal" - }, + "ingredient": "#c:ores/coal", "result": { "count": 3, "id": "modern_industrialization:coal_crushed_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_dust_with_tool.json index d2060fcd7..4e38a74a8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/forge_hammer/ore_to_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 50, - "ingredient": { - "tag": "c:ores/coal" - }, + "ingredient": "#c:ores/coal", "result": { "count": 4, "id": "modern_industrialization:coal_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/crushed_dust.json index 15ce2f36b..8b40d440b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:coal_crushed_dust" + "ingredient": "modern_industrialization:coal_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:coal_dust" + "id": "modern_industrialization:coal_dust" }, { "amount": 1, - "item": "modern_industrialization:coal_dust", + "id": "modern_industrialization:coal_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/gem.json index 1806e2aa0..a8ed38f64 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:coal" + "ingredient": "minecraft:coal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:coal_dust" + "id": "modern_industrialization:coal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/ore_to_crushed.json index 72a5efffd..17d0f5008 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/coal" + "ingredient": "#c:ores/coal" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:coal_crushed_dust" + "id": "modern_industrialization:coal_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/block.json index 0538006f0..93e4d0f82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "minecraft:coal" + "ingredient": "minecraft:coal" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:coal_block" + "id": "minecraft:coal_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/dust.json index c5980f080..85142e110 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/coal" + "ingredient": "#c:tiny_dusts/coal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:coal_dust" + "id": "modern_industrialization:coal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/gem.json index 8075d569d..5f17aefaa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/coal" + "ingredient": "#c:storage_blocks/coal" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:coal" + "id": "minecraft:coal" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/tiny_dust.json index 487ffd9b8..cf1abcc7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coal/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/coal" + "ingredient": "#c:dusts/coal" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:coal_tiny_dust" + "id": "modern_industrialization:coal_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/compressor/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/compressor/dust.json index 7438525ca..d7c488d6d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/compressor/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/compressor/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/coke" + "ingredient": "#c:dusts/coke" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:coke" + "id": "modern_industrialization:coke" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/block_from_gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/block_from_gem.json index 521ff6b0e..86770108e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/block_from_gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/block_from_gem.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "item": "modern_industrialization:coke" - }, - "y": { - "item": "modern_industrialization:coke" - } + "x": "modern_industrialization:coke", + "y": "modern_industrialization:coke" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:coke_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/gem_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/gem_from_block.json index 0d11be54c..a7522f017 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/gem_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/craft/gem_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:coke_block" - } + "modern_industrialization:coke_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/macerator/gem.json index 7593a4086..e0a44cfec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:coke" + "ingredient": "modern_industrialization:coke" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:coke_dust" + "id": "modern_industrialization:coke_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/packer/block.json index 5c9a61144..81c929059 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "modern_industrialization:coke" + "ingredient": "modern_industrialization:coke" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:coke_block" + "id": "modern_industrialization:coke_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/unpacker/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/unpacker/gem.json index a6f66c92c..6e37442f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/coke/unpacker/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke/unpacker/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/coke" + "ingredient": "#c:storage_blocks/coke" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:coke" + "id": "modern_industrialization:coke" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke_oven/coke.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke_oven/coke.json new file mode 100644 index 000000000..e52aa4e5d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke_oven/coke.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:coke_oven", + "duration": 600, + "eu": 2, + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:creosote" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:coal" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:coke" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json new file mode 100644 index 000000000..9f78630e9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:coke_oven", + "duration": 600, + "eu": 2, + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:creosote" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/coal" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:coke_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json new file mode 100644 index 000000000..cc6e7b350 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:compressor", + "duration": 600, + "eu": 32, + "item_inputs": [ + { + "amount": 2, + "ingredient": "modern_industrialization:mixed_ingot_blastproof" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:blastproof_alloy_plate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json new file mode 100644 index 000000000..3e76e9846 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:compressor", + "duration": 2400, + "eu": 32, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:tiny_dusts/tungsten" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:tungsten_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json index 31e95a409..8bbbcf7a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:copper_cable" + "id": "modern_industrialization:copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json index 58d4a4ea7..1cfe4d322 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:copper_cable" + "id": "modern_industrialization:copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/drill_head.json index 549a0163a..bb1cd75bc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/copper" + "ingredient": "#c:plates/copper" }, { "amount": 2, - "item": "modern_industrialization:copper_curved_plate" + "ingredient": "modern_industrialization:copper_curved_plate" }, { "amount": 1, - "tag": "c:rods/copper" + "ingredient": "#c:rods/copper" }, { "amount": 2, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_drill_head" + "id": "modern_industrialization:copper_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/gear.json index d77ce785c..ec31fb374 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/copper" + "ingredient": "#c:plates/copper" }, { "amount": 1, - "item": "modern_industrialization:copper_ring" + "ingredient": "modern_industrialization:copper_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_gear" + "id": "modern_industrialization:copper_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/rotor.json index 9bef56c88..5879b85a1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/assembler/rotor.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:copper_blade" + "ingredient": "modern_industrialization:copper_blade" }, { "amount": 1, - "item": "modern_industrialization:copper_ring" + "ingredient": "modern_industrialization:copper_ring" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_rotor" + "id": "modern_industrialization:copper_rotor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/double_ingot.json index 46ba201c5..f63d7e75a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_double_ingot" + "ingredient": "modern_industrialization:copper_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_plate" + "id": "modern_industrialization:copper_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/main.json index 4c7904f61..933775554 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/copper" + "ingredient": "#c:ingots/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_plate" + "id": "modern_industrialization:copper_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/plate.json index b0bdba9ec..151ff7692 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/copper" + "ingredient": "#c:plates/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_curved_plate" + "id": "modern_industrialization:copper_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/ring.json index 199ed19e9..862f37c95 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/copper" + "ingredient": "#c:rods/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_ring" + "id": "modern_industrialization:copper_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/blade.json index 2c1f6b1d5..26e99af4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "tag": "c:rods/copper" - }, - "P": { - "item": "modern_industrialization:copper_curved_plate" - } + "I": "#c:rods/copper", + "P": "modern_industrialization:copper_curved_plate" }, "pattern": [ "P", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json index 33698b776..0ab8b5bd4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:copper_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:copper_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/deepslate_to_ore.json index 2cceaf2b7..1786e43a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_copper_ore" - } + "minecraft:deepslate_copper_ore" ], "result": { - "count": 1, "id": "minecraft:copper_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/drill_head.json index 64da65a26..84f87bef7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/copper" - }, - "R": { - "tag": "c:rods/copper" - }, - "b": { - "item": "modern_industrialization:copper_bolt" - }, - "c": { - "item": "modern_industrialization:copper_curved_plate" - }, - "p": { - "tag": "c:plates/copper" - } + "G": "#c:gears/copper", + "R": "#c:rods/copper", + "b": "modern_industrialization:copper_bolt", + "c": "modern_industrialization:copper_curved_plate", + "p": "#c:plates/copper" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:copper_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/dust_from_tiny_dust.json index c2f67be31..d471df902 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/copper" - }, - "y": { - "item": "modern_industrialization:copper_tiny_dust" - } + "x": "#c:tiny_dusts/copper", + "y": "modern_industrialization:copper_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:copper_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/gear.json index 4280428fa..d4dd88f4a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/copper" - }, - "R": { - "item": "modern_industrialization:copper_ring" - }, - "b": { - "item": "modern_industrialization:copper_bolt" - } + "P": "#c:plates/copper", + "R": "modern_industrialization:copper_ring", + "b": "modern_industrialization:copper_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:copper_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ingot_from_nugget.json index 7f6d3c92e..79c55a840 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/copper" - }, - "y": { - "item": "modern_industrialization:copper_nugget" - } + "x": "#c:nuggets/copper", + "y": "modern_industrialization:copper_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/nugget_from_ingot.json index 83128f364..7fe0070f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:copper_ingot" - } + "minecraft:copper_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ring.json index 106353348..ee0d15ed3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/copper" - }, - "b": { - "item": "modern_industrialization:copper_bolt" - } + "R": "#c:rods/copper", + "b": "modern_industrialization:copper_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/rotor.json index 0b1cb8ad1..177981879 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/rotor.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "B": { - "item": "modern_industrialization:copper_blade" - }, - "R": { - "item": "modern_industrialization:copper_ring" - }, - "b": { - "item": "modern_industrialization:copper_bolt" - } + "B": "modern_industrialization:copper_blade", + "R": "modern_industrialization:copper_ring", + "b": "modern_industrialization:copper_bolt" }, "pattern": [ "bBb", @@ -18,7 +12,6 @@ "bBb" ], "result": { - "count": 1, "id": "modern_industrialization:copper_rotor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/tiny_dust_from_dust.json index 5868cc859..4df160531 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:copper_dust" - } + "modern_industrialization:copper_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/double_ingot.json index c69229feb..cbde72cfe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_double_ingot" + "ingredient": "modern_industrialization:copper_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_rod" + "id": "modern_industrialization:copper_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/main.json index 8a9fd97e4..bd9d24e03 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/copper" + "ingredient": "#c:ingots/copper" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_rod" + "id": "modern_industrialization:copper_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/rod.json index 9b7681ebf..d8257218e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/copper" + "ingredient": "#c:rods/copper" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_bolt" + "id": "modern_industrialization:copper_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt.json index 86c3e0f84..045519b95 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 4, "id": "modern_industrialization:copper_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt_with_tool.json index 45fe67a5e..de9f69845 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 8, "id": "modern_industrialization:copper_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate.json index 65ae0e2f8..11d88ac83 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:copper_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate_with_tool.json index f04beb523..0568b22af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_curved_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 2, "id": "modern_industrialization:copper_curved_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate.json index 62e94a90f..8cc05acd2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:copper_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate_with_tool.json index 8f6c277bf..c40a4e5c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 2, "id": "modern_industrialization:copper_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring.json index 45a01a191..4ed52871c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 2, "id": "modern_industrialization:copper_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring_with_tool.json index e0feac37a..65288be0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 4, "id": "modern_industrialization:copper_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod.json index 0359094f6..5959fbf82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 2, "id": "modern_industrialization:copper_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod_with_tool.json index 5c45c2d24..16afdd144 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/double_ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:copper_double_ingot" - }, + "ingredient": "modern_industrialization:copper_double_ingot", "result": { "count": 4, "id": "modern_industrialization:copper_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt.json index 0bbcc985c..76002420a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { "count": 2, "id": "modern_industrialization:copper_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt_with_tool.json index a6b37857b..54192f1ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { "count": 4, "id": "modern_industrialization:copper_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate.json index e29f99e20..d44580949 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate_with_tool.json index 50b6f0fb7..38ca403ff 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 40, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_double_ingot.json index 8c891eff9..06f67857a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_double_ingot.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_double_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_dust.json index 2612a6a2b..70e7c367f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate.json index 2d9b12dae..81c18ca9b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate_with_tool.json index b938a33e5..e006e5592 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring.json index 26eedd5d4..ea365b1fa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring_with_tool.json index ba5bbad1e..1b0feb30e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { "count": 2, "id": "modern_industrialization:copper_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod.json index fc68254af..595a5a24d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod_with_tool.json index 32a65be4f..cfc26405b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/copper" - }, + "ingredient": "#c:ingots/copper", "result": { "count": 2, "id": "modern_industrialization:copper_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/nugget_to_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/nugget_to_tiny_dust.json index 5814ee9d9..8b244ef2b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/nugget_to_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/nugget_to_tiny_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:nuggets/copper" - }, + "ingredient": "#c:nuggets/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_tiny_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/plate_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/plate_to_curved_plate_with_tool.json index 12813c376..dc57d4187 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/plate_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/plate_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:plates/copper" - }, + "ingredient": "#c:plates/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/raw_metal_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/raw_metal_to_dust_with_tool.json index 51740a702..8934e0788 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/raw_metal_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/raw_metal_to_dust_with_tool.json @@ -2,9 +2,7 @@ "type": "modern_industrialization:forge_hammer", "count": 3, "damage": 30, - "ingredient": { - "tag": "c:raw_materials/copper" - }, + "ingredient": "#c:raw_materials/copper", "result": { "count": 4, "id": "modern_industrialization:copper_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_bolt_with_tool.json index 79ad9d078..ceaa33b4f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/copper" - }, + "ingredient": "#c:rods/copper", "result": { "count": 2, "id": "modern_industrialization:copper_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_ring_with_tool.json index 2105787ea..106fea42a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/forge_hammer/rod_to_ring_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/copper" - }, + "ingredient": "#c:rods/copper", "result": { - "count": 1, "id": "modern_industrialization:copper_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/blade.json index 223bf5ca0..dafd7db6a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/blade.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_blade" + "ingredient": "modern_industrialization:copper_blade" } ], "item_outputs": [ { "amount": 5, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/bolt.json index c6448a8a4..129a537ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_bolt" + "ingredient": "modern_industrialization:copper_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/curved_plate.json index f06005bb3..fef050642 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_curved_plate" + "ingredient": "modern_industrialization:copper_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/double_ingot.json index 9ca482ff9..5e08cca8e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_double_ingot" + "ingredient": "modern_industrialization:copper_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/drill_head.json index 8d5215a28..30a86a97a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_drill_head" + "ingredient": "modern_industrialization:copper_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/gear.json index 226160769..b068db602 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/copper" + "ingredient": "#c:gears/copper" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ingot.json index eb01af18f..c66b0e5d3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/copper" + "ingredient": "#c:ingots/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/nugget.json index 8b864c457..8d898f9e3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/copper" + "ingredient": "#c:nuggets/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/plate.json index e5bb06860..fbefe5a1a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/copper" + "ingredient": "#c:plates/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/raw_metal.json index 1dcf270dc..fb3b509e9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/copper" + "ingredient": "#c:raw_materials/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" }, { "amount": 1, - "item": "modern_industrialization:copper_dust", + "id": "modern_industrialization:copper_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ring.json index c3fe590ac..8d45a7a12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_ring" + "ingredient": "modern_industrialization:copper_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rod.json index d73b41c09..fccc31069 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/copper" + "ingredient": "#c:rods/copper" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rotor.json index b03614bf7..35f117667 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/rotor.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_rotor" + "ingredient": "modern_industrialization:copper_rotor" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json index 55ae6bb93..51fda70ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/blade.json index 20e5577b1..dea9931c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:copper_curved_plate" + "ingredient": "modern_industrialization:copper_curved_plate" }, { "amount": 1, - "tag": "c:rods/copper" + "ingredient": "#c:rods/copper" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_blade" + "id": "modern_industrialization:copper_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/block.json index 8c97b978a..5b106b066 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/copper" + "ingredient": "#c:ingots/copper" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:copper_block" + "id": "minecraft:copper_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json index 95108c222..f7bc6d36a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:copper_cable" + "id": "modern_industrialization:copper_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/double_ingot.json index d5cfde604..4c1f78411 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/copper" + "ingredient": "#c:ingots/copper" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_double_ingot" + "id": "modern_industrialization:copper_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/dust.json index 99d65f30a..a300c7b54 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/copper" + "ingredient": "#c:tiny_dusts/copper" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:copper_dust" + "id": "modern_industrialization:copper_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/ingot.json index fbc8521a0..82b5c1ba4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/copper" + "ingredient": "#c:nuggets/copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:copper_ingot" + "id": "minecraft:copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/raw_metal_block.json index 7f09329f4..113e67b91 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/copper" + "ingredient": "#c:raw_materials/copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:raw_copper_block" + "id": "minecraft:raw_copper_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_blasting.json index 60c2de66a..465af0b07 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:copper_dust" - }, + "ingredient": "modern_industrialization:copper_dust", "result": { - "count": 1, "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_smelting.json index 8d9c7df63..6f213412e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:copper_dust" - }, + "ingredient": "modern_industrialization:copper_dust", "result": { - "count": 1, "id": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_blasting.json index 926e819dd..11b631516 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:copper_tiny_dust" - }, + "ingredient": "modern_industrialization:copper_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_smelting.json index 21c632dd0..9da22bc68 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:copper_tiny_dust" - }, + "ingredient": "modern_industrialization:copper_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:copper_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/ingot.json index a60815909..463e8bec1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/copper" + "ingredient": "#c:storage_blocks/copper" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:copper_ingot" + "id": "minecraft:copper_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/nugget.json index 19edec2e0..7d2e91f66 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/copper" + "ingredient": "#c:ingots/copper" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:copper_nugget" + "id": "modern_industrialization:copper_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/raw_metal.json index 8f7607b05..fc62a8a55 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_copper" + "ingredient": "#c:storage_blocks/raw_copper" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:raw_copper" + "id": "minecraft:raw_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/tiny_dust.json index f2941bbf4..741ae64ae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/copper" + "ingredient": "#c:dusts/copper" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:copper_tiny_dust" + "id": "modern_industrialization:copper_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json index ba116c5f0..91b676b16 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/fine_wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:copper_wire" + "ingredient": "modern_industrialization:copper_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:copper_fine_wire" + "id": "modern_industrialization:copper_fine_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/wire.json index 94db56133..16f6f1859 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/copper/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/copper" + "ingredient": "#c:plates/copper" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:copper_wire" + "id": "modern_industrialization:copper_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json index 978dcb3aa..2833b672d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_wire" + "ingredient": "modern_industrialization:cupronickel_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_cable" + "id": "modern_industrialization:cupronickel_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json index c2b3a29d9..860547211 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_wire" + "ingredient": "modern_industrialization:cupronickel_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_cable" + "id": "modern_industrialization:cupronickel_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/coil.json index 910e8b59e..2c54bca2e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/assembler/coil.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 8, - "item": "modern_industrialization:cupronickel_cable" + "ingredient": "modern_industrialization:cupronickel_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_coil" + "id": "modern_industrialization:cupronickel_coil" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/double_ingot.json index b793d865e..c78196519 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_double_ingot" + "ingredient": "modern_industrialization:cupronickel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cupronickel_plate" + "id": "modern_industrialization:cupronickel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/main.json index defca5474..f9b4276e4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/cupronickel" + "ingredient": "#c:ingots/cupronickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_plate" + "id": "modern_industrialization:cupronickel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/block_from_ingot.json index 715924c58..f94745889 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/cupronickel" - }, - "y": { - "item": "modern_industrialization:cupronickel_ingot" - } + "x": "#c:ingots/cupronickel", + "y": "modern_industrialization:cupronickel_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:cupronickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json index 8efa58aee..c2c81df69 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:cupronickel_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:cupronickel_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/coil.json index 35756fa66..678112d0f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/coil.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "item": "modern_industrialization:cupronickel_cable" - } + "x": "modern_industrialization:cupronickel_cable" }, "pattern": [ "xxx", @@ -12,7 +10,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:cupronickel_coil" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/dust_from_tiny_dust.json index e0bc4aab7..3308c1c6c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/cupronickel" - }, - "y": { - "item": "modern_industrialization:cupronickel_tiny_dust" - } + "x": "#c:tiny_dusts/cupronickel", + "y": "modern_industrialization:cupronickel_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:cupronickel_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_block.json index 2c7d80310..ec3198ede 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:cupronickel_block" - } + "modern_industrialization:cupronickel_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_nugget.json index 6fc43eaed..f0bea6712 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/cupronickel" - }, - "y": { - "item": "modern_industrialization:cupronickel_nugget" - } + "x": "#c:nuggets/cupronickel", + "y": "modern_industrialization:cupronickel_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/nugget_from_ingot.json index 51d4f6fab..21c62e2e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:cupronickel_ingot" - } + "modern_industrialization:cupronickel_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/tiny_dust_from_dust.json index 775d32ece..1fe83506a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:cupronickel_dust" - } + "modern_industrialization:cupronickel_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/double_ingot.json index ea2270b67..d29dcaec8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_double_ingot" + "ingredient": "modern_industrialization:cupronickel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cupronickel_dust" + "id": "modern_industrialization:cupronickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/ingot.json index 5c22e02b3..af4f07c43 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/cupronickel" + "ingredient": "#c:ingots/cupronickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_dust" + "id": "modern_industrialization:cupronickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/nugget.json index b31393baa..03c28723c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/cupronickel" + "ingredient": "#c:nuggets/cupronickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_tiny_dust" + "id": "modern_industrialization:cupronickel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/plate.json index 7cf252ad9..35d8a36e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/cupronickel" + "ingredient": "#c:plates/cupronickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_dust" + "id": "modern_industrialization:cupronickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json index 78a56d9ee..264b13ee5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_wire" + "ingredient": "modern_industrialization:cupronickel_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:cupronickel_tiny_dust" + "id": "modern_industrialization:cupronickel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/block.json index 17af9609b..e6e1b8691 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/cupronickel" + "ingredient": "#c:ingots/cupronickel" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_block" + "id": "modern_industrialization:cupronickel_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json index f7e74726c..08474f2c9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:cupronickel_wire" + "ingredient": "modern_industrialization:cupronickel_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:cupronickel_cable" + "id": "modern_industrialization:cupronickel_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/double_ingot.json index a0149c332..5e56fa739 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/cupronickel" + "ingredient": "#c:ingots/cupronickel" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_double_ingot" + "id": "modern_industrialization:cupronickel_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/dust.json index c769c72c0..24946df1f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/cupronickel" + "ingredient": "#c:tiny_dusts/cupronickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_dust" + "id": "modern_industrialization:cupronickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/ingot.json index 526d5434d..045a55f9b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/cupronickel" + "ingredient": "#c:nuggets/cupronickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_ingot" + "id": "modern_industrialization:cupronickel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json index 353cf9ef0..c5674d7ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/polarizer/wire_magnetic.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_wire" + "ingredient": "modern_industrialization:cupronickel_wire" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_wire_magnetic" + "id": "modern_industrialization:cupronickel_wire_magnetic" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_blasting.json index 6019e9ca6..e32e37067 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:cupronickel_dust" - }, + "ingredient": "modern_industrialization:cupronickel_dust", "result": { - "count": 1, "id": "modern_industrialization:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_smelting.json index e15b8f1ee..ef87a1684 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:cupronickel_dust" - }, + "ingredient": "modern_industrialization:cupronickel_dust", "result": { - "count": 1, "id": "modern_industrialization:cupronickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_blasting.json index 3940830fa..d80631dcd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:cupronickel_tiny_dust" - }, + "ingredient": "modern_industrialization:cupronickel_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_smelting.json index 7801e7fcc..7d1746e73 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:cupronickel_tiny_dust" - }, + "ingredient": "modern_industrialization:cupronickel_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:cupronickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/wire_magnetic_to_wire_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/wire_magnetic_to_wire_smelting.json index 29f0961c6..faee39669 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/wire_magnetic_to_wire_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/smelting/wire_magnetic_to_wire_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "modern_industrialization:cupronickel_wire_magnetic" - }, + "ingredient": "modern_industrialization:cupronickel_wire_magnetic", "result": { - "count": 1, "id": "modern_industrialization:cupronickel_wire" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/coil.json index b8141454f..885931a74 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/coil.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:cupronickel_coil" + "ingredient": "modern_industrialization:cupronickel_coil" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:cupronickel_cable" + "id": "modern_industrialization:cupronickel_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/ingot.json index 56fc57cef..1d1cbe828 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/cupronickel" + "ingredient": "#c:storage_blocks/cupronickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:cupronickel_ingot" + "id": "modern_industrialization:cupronickel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/nugget.json index 6ab529e98..651e39738 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/cupronickel" + "ingredient": "#c:ingots/cupronickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:cupronickel_nugget" + "id": "modern_industrialization:cupronickel_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/tiny_dust.json index fafb1d72d..0f4cb1cba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/cupronickel" + "ingredient": "#c:dusts/cupronickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:cupronickel_tiny_dust" + "id": "modern_industrialization:cupronickel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/wiremill/wire.json index ea38acb19..4c61527b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/cupronickel/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/cupronickel" + "ingredient": "#c:plates/cupronickel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:cupronickel_wire" + "id": "modern_industrialization:cupronickel_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/compressor/main.json index ad618bfd1..890e22e20 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:diamond" + "ingredient": "minecraft:diamond" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_plate" + "id": "modern_industrialization:diamond_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/deepslate_to_ore.json index 527ce5337..81a175c4b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_diamond_ore" - } + "minecraft:deepslate_diamond_ore" ], "result": { - "count": 1, "id": "minecraft:diamond_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/dust_from_tiny_dust.json index b35f3f847..e8ad2a438 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/diamond" - }, - "y": { - "item": "modern_industrialization:diamond_tiny_dust" - } + "x": "#c:tiny_dusts/diamond", + "y": "modern_industrialization:diamond_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:diamond_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/hammer.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/hammer.json index 186333ded..814f8847f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/hammer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/hammer.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "p": { - "item": "modern_industrialization:diamond_large_plate" - }, - "s": { - "item": "minecraft:stick" - } + "p": "modern_industrialization:diamond_large_plate", + "s": "minecraft:stick" }, "pattern": [ "ppp", @@ -15,7 +11,6 @@ " s " ], "result": { - "count": 1, "id": "modern_industrialization:diamond_hammer" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/large_plate.json index 6ed2af267..a910ff2ad 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/diamond" - } + "x": "#c:plates/diamond" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:diamond_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/tiny_dust_from_dust.json index 1c0a9c288..12acc2fe6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:diamond_dust" - } + "modern_industrialization:diamond_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/crushed_dust.json index 5eda151cf..3235ac786 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_crushed_dust" + "ingredient": "modern_industrialization:diamond_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_dust" + "id": "modern_industrialization:diamond_dust" }, { "amount": 1, - "item": "modern_industrialization:diamond_dust", + "id": "modern_industrialization:diamond_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/gem.json index ad57e038d..68b9a42f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:diamond" + "ingredient": "minecraft:diamond" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_dust" + "id": "modern_industrialization:diamond_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/large_plate.json index 78277f701..f9ef0c27d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_large_plate" + "ingredient": "modern_industrialization:diamond_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:diamond_dust" + "id": "modern_industrialization:diamond_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/ore_to_crushed.json index f1a36ef85..3d4c1bb29 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/diamond" + "ingredient": "#c:ores/diamond" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:diamond_crushed_dust" + "id": "modern_industrialization:diamond_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/plate.json index 192ba23cc..804017cdc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/diamond" + "ingredient": "#c:plates/diamond" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_dust" + "id": "modern_industrialization:diamond_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/block.json index 378cd9b7b..89afe30e9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "minecraft:diamond" + "ingredient": "minecraft:diamond" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:diamond_block" + "id": "minecraft:diamond_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/dust.json index 25e9183b2..d3b39a733 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/diamond" + "ingredient": "#c:tiny_dusts/diamond" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_dust" + "id": "modern_industrialization:diamond_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/large_plate.json index e0300f593..f4d7f94d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/diamond" + "ingredient": "#c:plates/diamond" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:diamond_large_plate" + "id": "modern_industrialization:diamond_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/gem.json index a4792a1c5..5efc97389 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/diamond" + "ingredient": "#c:storage_blocks/diamond" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:diamond" + "id": "minecraft:diamond" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/tiny_dust.json index bbd81d342..d7ad91eee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/diamond/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/diamond" + "ingredient": "#c:dusts/diamond" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:diamond_tiny_dust" + "id": "modern_industrialization:diamond_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json new file mode 100644 index 000000000..8bfd3b7b6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 1200, + "eu": 32, + "fluid_outputs": [ + { + "amount": 2000, + "id": "modern_industrialization:oxygen" + } + ], + "item_inputs": [ + { + "amount": 10, + "ingredient": "#c:dusts/bauxite" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:aluminum_dust" + }, + { + "amount": 3, + "id": "modern_industrialization:titanium_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json new file mode 100644 index 000000000..974cf65ee --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 400, + "eu": 32, + "fluid_outputs": [ + { + "amount": 3000, + "id": "modern_industrialization:oxygen" + } + ], + "item_inputs": [ + { + "amount": 23, + "ingredient": "#c:dusts/emerald" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:beryllium_dust" + }, + { + "amount": 2, + "id": "modern_industrialization:aluminum_dust" + }, + { + "amount": 6, + "id": "modern_industrialization:silicon_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json new file mode 100644 index 000000000..7c14ac98b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 400, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:chromium_hydrochloric_solution" + } + ], + "fluid_outputs": [ + { + "amount": 450, + "id": "modern_industrialization:hydrogen" + }, + { + "amount": 450, + "id": "modern_industrialization:chlorine" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:chromium_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json new file mode 100644 index 000000000..020a16039 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 600, + "eu": 8, + "fluid_inputs": [ + { + "amount": 3000, + "ingredient": "modern_industrialization:heavy_water" + } + ], + "fluid_outputs": [ + { + "amount": 2000, + "id": "modern_industrialization:deuterium" + }, + { + "amount": 1000, + "id": "modern_industrialization:oxygen" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/lapis.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/lapis.json new file mode 100644 index 000000000..193deacaa --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/lapis.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 2400, + "eu": 32, + "fluid_outputs": [ + { + "amount": 2500, + "id": "modern_industrialization:oxygen" + } + ], + "item_inputs": [ + { + "amount": 18, + "ingredient": "#c:dusts/lapis" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:aluminum_dust" + }, + { + "amount": 2, + "id": "modern_industrialization:sodium_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:silicon_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json new file mode 100644 index 000000000..df6278ed4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 400, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:manganese_sulfuric_solution" + } + ], + "fluid_outputs": [ + { + "amount": 900, + "id": "modern_industrialization:sulfuric_acid" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:manganese_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json new file mode 100644 index 000000000..59cdfc91a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 600, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:purified_platinum_sulfuric_solution" + } + ], + "fluid_outputs": [ + { + "amount": 900, + "id": "modern_industrialization:sulfuric_acid" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:platinum_tiny_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json new file mode 100644 index 000000000..bef19e331 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 400, + "eu": 8, + "fluid_outputs": [ + { + "amount": 125, + "id": "modern_industrialization:chlorine" + } + ], + "item_inputs": [ + { + "amount": 2, + "ingredient": "#c:dusts/salt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:sodium_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json new file mode 100644 index 000000000..cc73f896e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 300, + "eu": 32, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:sulfuric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 200, + "id": "modern_industrialization:oxygen" + }, + { + "amount": 200, + "id": "minecraft:water" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:sulfur_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json new file mode 100644 index 000000000..67f22b925 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json @@ -0,0 +1,18 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 2500, + "eu": 40, + "fluid_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:uu_matter" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:singularity", + "probability": 0.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/water.json new file mode 100644 index 000000000..795520ab4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrolyzer/water.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:electrolyzer", + "duration": 600, + "eu": 8, + "fluid_inputs": [ + { + "amount": 3000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 2000, + "id": "modern_industrialization:hydrogen" + }, + { + "amount": 1000, + "id": "modern_industrialization:oxygen" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json index e7fb86515..f81b0a81b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_wire" + "ingredient": "modern_industrialization:electrum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_cable" + "id": "modern_industrialization:electrum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json index 1d8aeec3f..c0cd0a4d2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_wire" + "ingredient": "modern_industrialization:electrum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_cable" + "id": "modern_industrialization:electrum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/double_ingot.json index 3a5236b72..21f1e9260 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_double_ingot" + "ingredient": "modern_industrialization:electrum_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:electrum_plate" + "id": "modern_industrialization:electrum_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/main.json index d6efa31c4..05ed8719d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/electrum" + "ingredient": "#c:ingots/electrum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_plate" + "id": "modern_industrialization:electrum_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/block_from_ingot.json index 23cca318d..6c1552c81 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/electrum" - }, - "y": { - "item": "modern_industrialization:electrum_ingot" - } + "x": "#c:ingots/electrum", + "y": "modern_industrialization:electrum_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:electrum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json index 39c5f3514..8626a7afd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:electrum_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:electrum_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/dust_from_tiny_dust.json index 9818f8909..011daefdc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/electrum" - }, - "y": { - "item": "modern_industrialization:electrum_tiny_dust" - } + "x": "#c:tiny_dusts/electrum", + "y": "modern_industrialization:electrum_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:electrum_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_block.json index 810d65f52..e7c31f975 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:electrum_block" - } + "modern_industrialization:electrum_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_nugget.json index 2da68c38c..a6a9bfba5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/electrum" - }, - "y": { - "item": "modern_industrialization:electrum_nugget" - } + "x": "#c:nuggets/electrum", + "y": "modern_industrialization:electrum_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/nugget_from_ingot.json index 29165c7d7..5b1d44588 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:electrum_ingot" - } + "modern_industrialization:electrum_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/tiny_dust_from_dust.json index 956bad503..d1a7a1943 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:electrum_dust" - } + "modern_industrialization:electrum_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/double_ingot.json index 017d09c30..2ed60d04e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_double_ingot" + "ingredient": "modern_industrialization:electrum_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:electrum_dust" + "id": "modern_industrialization:electrum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/ingot.json index a49b436be..3e68bb74a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/electrum" + "ingredient": "#c:ingots/electrum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_dust" + "id": "modern_industrialization:electrum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/nugget.json index bf397ae8e..fb681c79a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/electrum" + "ingredient": "#c:nuggets/electrum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_tiny_dust" + "id": "modern_industrialization:electrum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/plate.json index 735a5e61e..71c396a35 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/electrum" + "ingredient": "#c:plates/electrum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_dust" + "id": "modern_industrialization:electrum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json index 5807f2d80..ef34dccc2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_wire" + "ingredient": "modern_industrialization:electrum_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:electrum_tiny_dust" + "id": "modern_industrialization:electrum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/block.json index 14e3b7704..d5a200fd0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/electrum" + "ingredient": "#c:ingots/electrum" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_block" + "id": "modern_industrialization:electrum_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json index c4c8dd9f9..50ba475bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:electrum_wire" + "ingredient": "modern_industrialization:electrum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:electrum_cable" + "id": "modern_industrialization:electrum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/double_ingot.json index 6bd8ec180..b6d1a7f95 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/electrum" + "ingredient": "#c:ingots/electrum" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_double_ingot" + "id": "modern_industrialization:electrum_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/dust.json index 864e44e7f..a80ac4f2d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/electrum" + "ingredient": "#c:tiny_dusts/electrum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_dust" + "id": "modern_industrialization:electrum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/ingot.json index 395a6a74b..f76e7fcb9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/electrum" + "ingredient": "#c:nuggets/electrum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_ingot" + "id": "modern_industrialization:electrum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_blasting.json index b1c9a194c..d05d5a91f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:electrum_dust" - }, + "ingredient": "modern_industrialization:electrum_dust", "result": { - "count": 1, "id": "modern_industrialization:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_smelting.json index 706299b98..c49558d2d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:electrum_dust" - }, + "ingredient": "modern_industrialization:electrum_dust", "result": { - "count": 1, "id": "modern_industrialization:electrum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_blasting.json index c0de0dc90..5dedf963f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:electrum_tiny_dust" - }, + "ingredient": "modern_industrialization:electrum_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_smelting.json index dcbbcf916..874b9c916 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:electrum_tiny_dust" - }, + "ingredient": "modern_industrialization:electrum_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:electrum_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/ingot.json index 04ada19f7..9874e2643 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/electrum" + "ingredient": "#c:storage_blocks/electrum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:electrum_ingot" + "id": "modern_industrialization:electrum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/nugget.json index e61e5e552..8678ad52a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/electrum" + "ingredient": "#c:ingots/electrum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:electrum_nugget" + "id": "modern_industrialization:electrum_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/tiny_dust.json index 4536693ee..1ca38bcbe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/electrum" + "ingredient": "#c:dusts/electrum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:electrum_tiny_dust" + "id": "modern_industrialization:electrum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json index dade5c2cf..c166ea83e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/fine_wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:electrum_wire" + "ingredient": "modern_industrialization:electrum_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:electrum_fine_wire" + "id": "modern_industrialization:electrum_fine_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/wire.json index d468e13d1..1a09aeda0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/electrum/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/electrum" + "ingredient": "#c:plates/electrum" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:electrum_wire" + "id": "modern_industrialization:electrum_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/compressor/main.json index f413addb0..b47ef4b93 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:emerald" + "ingredient": "minecraft:emerald" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:emerald_plate" + "id": "modern_industrialization:emerald_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/deepslate_to_ore.json index 556cb28f0..2270bd544 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_emerald_ore" - } + "minecraft:deepslate_emerald_ore" ], "result": { - "count": 1, "id": "minecraft:emerald_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/dust_from_tiny_dust.json index 7c1ea851c..124400372 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/emerald" - }, - "y": { - "item": "modern_industrialization:emerald_tiny_dust" - } + "x": "#c:tiny_dusts/emerald", + "y": "modern_industrialization:emerald_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:emerald_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/tiny_dust_from_dust.json index 539611e03..54a7f07ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:emerald_dust" - } + "modern_industrialization:emerald_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/crushed_dust.json index 08795934b..cd4aee9c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:emerald_crushed_dust" + "ingredient": "modern_industrialization:emerald_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:emerald_dust" + "id": "modern_industrialization:emerald_dust" }, { "amount": 1, - "item": "modern_industrialization:emerald_dust", + "id": "modern_industrialization:emerald_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/gem.json index a8567cd18..5479c2bc4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:emerald" + "ingredient": "minecraft:emerald" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:emerald_dust" + "id": "modern_industrialization:emerald_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/ore_to_crushed.json index e7a38846d..1b4ad79c6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/emerald" + "ingredient": "#c:ores/emerald" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:emerald_crushed_dust" + "id": "modern_industrialization:emerald_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/plate.json index 3ab9d1cef..645148a26 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/emerald" + "ingredient": "#c:plates/emerald" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:emerald_dust" + "id": "modern_industrialization:emerald_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/block.json index c9865808d..065cd0b0e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "minecraft:emerald" + "ingredient": "minecraft:emerald" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:emerald_block" + "id": "minecraft:emerald_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/dust.json index e9cf66a85..f92472aa3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/emerald" + "ingredient": "#c:tiny_dusts/emerald" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:emerald_dust" + "id": "modern_industrialization:emerald_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/gem.json index 5af640e72..b81f345ea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/emerald" + "ingredient": "#c:storage_blocks/emerald" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:emerald" + "id": "minecraft:emerald" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/tiny_dust.json index 4b327de4c..12c050b1e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/emerald/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/emerald" + "ingredient": "#c:dusts/emerald" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:emerald_tiny_dust" + "id": "modern_industrialization:emerald_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_blasting.json index b35155d5a..6b2bb00d2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:fire_clay_dust" - }, + "ingredient": "modern_industrialization:fire_clay_dust", "result": { - "count": 1, "id": "modern_industrialization:fire_clay_brick" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_smelting.json index a8d764c69..0d04fa00a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:fire_clay_dust" - }, + "ingredient": "modern_industrialization:fire_clay_dust", "result": { - "count": 1, "id": "modern_industrialization:fire_clay_brick" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay_bricks.json new file mode 100644 index 000000000..c77a3af28 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay_bricks.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "T": "modern_industrialization:fire_clay_brick" + }, + "pattern": [ + "TT", + "TT" + ], + "result": { + "id": "modern_industrialization:fire_clay_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay_dust.json new file mode 100644 index 000000000..84f1cf220 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/fire_clay_dust.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:brick_dust", + "T": "minecraft:clay_ball" + }, + "pattern": [ + "TC", + "TC" + ], + "result": { + "count": 3, + "id": "modern_industrialization:fire_clay_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json new file mode 100644 index 000000000..964ac769f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json @@ -0,0 +1,8 @@ +{ + "type": "modern_industrialization:forge_hammer", + "ingredient": "minecraft:brick", + "result": { + "count": 3, + "id": "modern_industrialization:brick_tiny_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json new file mode 100644 index 000000000..d2cb4cd4a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json @@ -0,0 +1,8 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 20, + "ingredient": "minecraft:brick", + "result": { + "id": "modern_industrialization:brick_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json new file mode 100644 index 000000000..ef6b8ae48 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json @@ -0,0 +1,9 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 60, + "ingredient": "#c:ores/copper", + "result": { + "count": 12, + "id": "modern_industrialization:copper_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json new file mode 100644 index 000000000..29716b5a8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json @@ -0,0 +1,8 @@ +{ + "type": "modern_industrialization:forge_hammer", + "ingredient": "#c:ores/copper", + "result": { + "count": 5, + "id": "minecraft:raw_copper" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json new file mode 100644 index 000000000..56163b6bd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json @@ -0,0 +1,9 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 20, + "ingredient": "#c:ores/copper", + "result": { + "count": 8, + "id": "minecraft:raw_copper" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/drill_head.json index d259f135e..a9d41d0e9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/gold" + "ingredient": "#c:plates/gold" }, { "amount": 2, - "item": "modern_industrialization:gold_curved_plate" + "ingredient": "modern_industrialization:gold_curved_plate" }, { "amount": 1, - "tag": "c:rods/gold" + "ingredient": "#c:rods/gold" }, { "amount": 2, - "tag": "c:gears/gold" + "ingredient": "#c:gears/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_drill_head" + "id": "modern_industrialization:gold_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/gear.json index 02cf05668..a8efe95a7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/gold" + "ingredient": "#c:plates/gold" }, { "amount": 1, - "item": "modern_industrialization:gold_ring" + "ingredient": "modern_industrialization:gold_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_gear" + "id": "modern_industrialization:gold_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/double_ingot.json index 983753efa..5de1a305d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_double_ingot" + "ingredient": "modern_industrialization:gold_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_plate" + "id": "modern_industrialization:gold_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/main.json index 752e16d1e..48ae26d35 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/gold" + "ingredient": "#c:ingots/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_plate" + "id": "modern_industrialization:gold_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/plate.json index 71148b812..49cc20a99 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/gold" + "ingredient": "#c:plates/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_curved_plate" + "id": "modern_industrialization:gold_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/ring.json index 4c38eb11b..080fbad8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/gold" + "ingredient": "#c:rods/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_ring" + "id": "modern_industrialization:gold_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/deepslate_to_ore.json index 918be1de3..91c6e076a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_gold_ore" - } + "minecraft:deepslate_gold_ore" ], "result": { - "count": 1, "id": "minecraft:gold_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/drill_head.json index 8786dbaef..7f49d65b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/gold" - }, - "R": { - "tag": "c:rods/gold" - }, - "b": { - "item": "modern_industrialization:gold_bolt" - }, - "c": { - "item": "modern_industrialization:gold_curved_plate" - }, - "p": { - "tag": "c:plates/gold" - } + "G": "#c:gears/gold", + "R": "#c:rods/gold", + "b": "modern_industrialization:gold_bolt", + "c": "modern_industrialization:gold_curved_plate", + "p": "#c:plates/gold" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:gold_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/dust_from_tiny_dust.json index 790ba34a4..1b8193328 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/gold" - }, - "y": { - "item": "modern_industrialization:gold_tiny_dust" - } + "x": "#c:tiny_dusts/gold", + "y": "modern_industrialization:gold_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:gold_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/gear.json index c830e9961..2e42f438a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/gold" - }, - "R": { - "item": "modern_industrialization:gold_ring" - }, - "b": { - "item": "modern_industrialization:gold_bolt" - } + "P": "#c:plates/gold", + "R": "modern_industrialization:gold_ring", + "b": "modern_industrialization:gold_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:gold_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/ring.json index cfc8ccaf1..fcb92e6a5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/gold" - }, - "b": { - "item": "modern_industrialization:gold_bolt" - } + "R": "#c:rods/gold", + "b": "modern_industrialization:gold_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/tiny_dust_from_dust.json index ccf78bb56..5652fe9b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:gold_dust" - } + "modern_industrialization:gold_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/double_ingot.json index 628e4fc50..1587ac4f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_double_ingot" + "ingredient": "modern_industrialization:gold_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:gold_rod" + "id": "modern_industrialization:gold_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/main.json index ea6b515d8..da9b48c66 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/gold" + "ingredient": "#c:ingots/gold" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_rod" + "id": "modern_industrialization:gold_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/rod.json index 63cd97ee4..4d679ccb3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/gold" + "ingredient": "#c:rods/gold" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_bolt" + "id": "modern_industrialization:gold_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt.json index b055eaf4b..310922272 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 4, "id": "modern_industrialization:gold_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt_with_tool.json index 2d7892c39..052072885 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 8, "id": "modern_industrialization:gold_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate.json index 0780854a6..6b38d4037 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:gold_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate_with_tool.json index 44cf0509e..044800fb2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_curved_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 2, "id": "modern_industrialization:gold_curved_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate.json index a32e4d0e9..fe9e20f01 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:gold_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate_with_tool.json index d6879cfe0..7ef267995 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 2, "id": "modern_industrialization:gold_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring.json index d54c27363..b52853718 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 2, "id": "modern_industrialization:gold_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring_with_tool.json index 4aebbc1d6..5263b31a3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 4, "id": "modern_industrialization:gold_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod.json index dc4621763..f99d6a02f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 2, "id": "modern_industrialization:gold_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod_with_tool.json index 93a51290f..7039235f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/double_ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:gold_double_ingot" - }, + "ingredient": "modern_industrialization:gold_double_ingot", "result": { "count": 4, "id": "modern_industrialization:gold_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt.json index 04125f9d5..6a5a6e021 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { "count": 2, "id": "modern_industrialization:gold_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt_with_tool.json index 26bb187df..3d00a6866 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { "count": 4, "id": "modern_industrialization:gold_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate.json index 783893864..4ff906d0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate_with_tool.json index 56c8bb5b4..35b042102 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 40, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_double_ingot.json index 2d12ac215..1830cb47b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_double_ingot.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_double_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_dust.json index be435b133..4c729ddc3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate.json index fb10d1137..a6a51c27c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate_with_tool.json index 1629fd70d..b4cad9d84 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring.json index d42af9195..a5ab3fa4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring_with_tool.json index e8cf74062..051cafce1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { "count": 2, "id": "modern_industrialization:gold_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod.json index 84dade854..6242bff2f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod_with_tool.json index 331e72dd6..80942023a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/gold" - }, + "ingredient": "#c:ingots/gold", "result": { "count": 2, "id": "modern_industrialization:gold_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/nugget_to_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/nugget_to_tiny_dust.json index 87d0dd6f8..d3b3af90e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/nugget_to_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/nugget_to_tiny_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:nuggets/gold" - }, + "ingredient": "#c:nuggets/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_tiny_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_dust_with_tool.json index 7191cb203..ee70cb127 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 50, - "ingredient": { - "tag": "c:ores/gold" - }, + "ingredient": "#c:ores/gold", "result": { "count": 4, "id": "modern_industrialization:gold_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal.json index ecaf29f6f..aaeb82e7a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ores/gold" - }, + "ingredient": "#c:ores/gold", "result": { "count": 2, "id": "minecraft:raw_gold" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal_with_tool.json index df3f48afa..fe6e03588 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/ore_to_raw_metal_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ores/gold" - }, + "ingredient": "#c:ores/gold", "result": { "count": 3, "id": "minecraft:raw_gold" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/plate_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/plate_to_curved_plate_with_tool.json index bcb1c1d7a..62324fae8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/plate_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/plate_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:plates/gold" - }, + "ingredient": "#c:plates/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/raw_metal_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/raw_metal_to_dust_with_tool.json index 0bb593d3b..14e1f950b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/raw_metal_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/raw_metal_to_dust_with_tool.json @@ -2,9 +2,7 @@ "type": "modern_industrialization:forge_hammer", "count": 3, "damage": 30, - "ingredient": { - "tag": "c:raw_materials/gold" - }, + "ingredient": "#c:raw_materials/gold", "result": { "count": 4, "id": "modern_industrialization:gold_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_bolt_with_tool.json index 6a070cca2..8161023de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/gold" - }, + "ingredient": "#c:rods/gold", "result": { "count": 2, "id": "modern_industrialization:gold_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_ring_with_tool.json index 3fb5a6380..843274617 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/forge_hammer/rod_to_ring_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/gold" - }, + "ingredient": "#c:rods/gold", "result": { - "count": 1, "id": "modern_industrialization:gold_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/bolt.json index f00cfb5c6..a1f1dcba9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_bolt" + "ingredient": "modern_industrialization:gold_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/curved_plate.json index 31b7ea27a..fe98c6727 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_curved_plate" + "ingredient": "modern_industrialization:gold_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/double_ingot.json index 274d608bf..a24b36bc5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_double_ingot" + "ingredient": "modern_industrialization:gold_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/drill_head.json index 466322ce5..c3ee17c4d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_drill_head" + "ingredient": "modern_industrialization:gold_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/gear.json index 8f6d80e50..b1c623874 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/gold" + "ingredient": "#c:gears/gold" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ingot.json index 0b2969270..f289f5690 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/gold" + "ingredient": "#c:ingots/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/nugget.json index e3d49f6fc..25782f4ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/gold" + "ingredient": "#c:nuggets/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ore_to_raw.json index 877ab7a21..f458bd1f8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/gold" + "ingredient": "#c:ores/gold" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:raw_gold" + "id": "minecraft:raw_gold" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/plate.json index 2430c4060..e175a3a4b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/gold" + "ingredient": "#c:plates/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/raw_metal.json index 64d073070..9836533ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/gold" + "ingredient": "#c:raw_materials/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" }, { "amount": 1, - "item": "modern_industrialization:gold_dust", + "id": "modern_industrialization:gold_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ring.json index a3e6085de..2e6080c71 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:gold_ring" + "ingredient": "modern_industrialization:gold_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/rod.json index 3977117c4..834b5a85a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/gold" + "ingredient": "#c:rods/gold" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/block.json index 8a98d1ff4..15a0e6d33 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/gold" + "ingredient": "#c:ingots/gold" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gold_block" + "id": "minecraft:gold_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/double_ingot.json index 2397b0705..90d79b5fc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/gold" + "ingredient": "#c:ingots/gold" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_double_ingot" + "id": "modern_industrialization:gold_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/dust.json index e983d7918..173935efa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/gold" + "ingredient": "#c:tiny_dusts/gold" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:gold_dust" + "id": "modern_industrialization:gold_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/ingot.json index 07fb3e668..b2074a3bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/gold" + "ingredient": "#c:nuggets/gold" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/raw_metal_block.json index 86f3a7ac3..2adbf7ff2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/gold" + "ingredient": "#c:raw_materials/gold" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:raw_gold_block" + "id": "minecraft:raw_gold_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_blasting.json index 647bd1d94..a0a679739 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:gold_dust" - }, + "ingredient": "modern_industrialization:gold_dust", "result": { - "count": 1, "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_smelting.json index 2ad1a8f91..c94af854c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:gold_dust" - }, + "ingredient": "modern_industrialization:gold_dust", "result": { - "count": 1, "id": "minecraft:gold_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_blasting.json index e756bfbd7..29e65643d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:gold_tiny_dust" - }, + "ingredient": "modern_industrialization:gold_tiny_dust", "result": { - "count": 1, "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_smelting.json index f7ad8593b..ac934a4f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:gold_tiny_dust" - }, + "ingredient": "modern_industrialization:gold_tiny_dust", "result": { - "count": 1, "id": "minecraft:gold_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/ingot.json index e5daae12b..dcc31925f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/gold" + "ingredient": "#c:storage_blocks/gold" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:gold_ingot" + "id": "minecraft:gold_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/nugget.json index 89c8fd8d2..ab442849a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/gold" + "ingredient": "#c:ingots/gold" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:gold_nugget" + "id": "minecraft:gold_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/raw_metal.json index f7133a4ef..a3751ff14 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_gold" + "ingredient": "#c:storage_blocks/raw_gold" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:raw_gold" + "id": "minecraft:raw_gold" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/tiny_dust.json index 9a207efb4..171f83d40 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/gold/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/gold" + "ingredient": "#c:dusts/gold" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:gold_tiny_dust" + "id": "modern_industrialization:gold_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/assembler/fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/assembler/fuel_rod.json index 05e2ca18a..84bf4f758 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/assembler/fuel_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/assembler/fuel_rod.json @@ -5,35 +5,35 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" }, { "amount": 100, - "fluid": "modern_industrialization:helium" + "ingredient": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 18, - "tag": "c:rods/he_mox" + "ingredient": "#c:rods/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_fuel_rod" + "id": "modern_industrialization:he_mox_fuel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/dust.json index d77467624..541ad3056 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/he_mox" + "ingredient": "#c:dusts/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_ingot" + "id": "modern_industrialization:he_mox_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/tiny_dust.json index 9500d51b2..c0790d55e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/he_mox" + "ingredient": "#c:tiny_dusts/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_nugget" + "id": "modern_industrialization:he_mox_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/block_from_ingot.json index 253d4e6f6..aeebf84a2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/he_mox" - }, - "y": { - "item": "modern_industrialization:he_mox_ingot" - } + "x": "#c:ingots/he_mox", + "y": "modern_industrialization:he_mox_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:he_mox_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/dust_from_tiny_dust.json index 0c7eb0c46..112b15d27 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/he_mox" - }, - "y": { - "item": "modern_industrialization:he_mox_tiny_dust" - } + "x": "#c:tiny_dusts/he_mox", + "y": "modern_industrialization:he_mox_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:he_mox_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_block.json index 1085f2399..ee25a8a08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:he_mox_block" - } + "modern_industrialization:he_mox_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_nugget.json index 27f58a8d1..51b29c1b8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/he_mox" - }, - "y": { - "item": "modern_industrialization:he_mox_nugget" - } + "x": "#c:nuggets/he_mox", + "y": "modern_industrialization:he_mox_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:he_mox_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/nugget_from_ingot.json index 9fbc6682b..d498c3674 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:he_mox_ingot" - } + "modern_industrialization:he_mox_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/tiny_dust_from_dust.json index c14215c20..1842c252e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:he_mox_dust" - } + "modern_industrialization:he_mox_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/cutting_machine/main.json index 089708b3a..b2bbbc89c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/he_mox" + "ingredient": "#c:ingots/he_mox" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:he_mox_rod" + "id": "modern_industrialization:he_mox_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/ingot.json index 855b53083..ec53d210a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/he_mox" + "ingredient": "#c:ingots/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_dust" + "id": "modern_industrialization:he_mox_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/nugget.json index 6084e8d43..50848a0e4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/he_mox" + "ingredient": "#c:nuggets/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_tiny_dust" + "id": "modern_industrialization:he_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/rod.json index 4ea49207b..c1f18e04c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/he_mox" + "ingredient": "#c:rods/he_mox" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:he_mox_tiny_dust" + "id": "modern_industrialization:he_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/block.json index 0179c5a3d..ddb91491b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/he_mox" + "ingredient": "#c:ingots/he_mox" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_block" + "id": "modern_industrialization:he_mox_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/dust.json index 8f00fad34..d15e9f895 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/he_mox" + "ingredient": "#c:tiny_dusts/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_dust" + "id": "modern_industrialization:he_mox_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_double.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_double.json index d2428750a..58f2f4fe3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_double.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_double.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:he_mox_fuel_rod" + "ingredient": "modern_industrialization:he_mox_fuel_rod" }, { "amount": 1, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_fuel_rod_double" + "id": "modern_industrialization:he_mox_fuel_rod_double" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_quad.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_quad.json index 441a32772..061194af6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_quad.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/fuel_rod_quad.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 2, - "item": "modern_industrialization:he_mox_fuel_rod_double" + "ingredient": "modern_industrialization:he_mox_fuel_rod_double" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_fuel_rod_quad" + "id": "modern_industrialization:he_mox_fuel_rod_quad" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/ingot.json index da9914ba5..1f30a36e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/he_mox" + "ingredient": "#c:nuggets/he_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_mox_ingot" + "id": "modern_industrialization:he_mox_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/ingot.json index 06bb96e87..b897cde58 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/he_mox" + "ingredient": "#c:storage_blocks/he_mox" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_mox_ingot" + "id": "modern_industrialization:he_mox_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/nugget.json index 9d443c4bb..076bd98a0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/he_mox" + "ingredient": "#c:ingots/he_mox" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_mox_nugget" + "id": "modern_industrialization:he_mox_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/tiny_dust.json index c5823f089..52340351d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_mox/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/he_mox" + "ingredient": "#c:dusts/he_mox" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_mox_tiny_dust" + "id": "modern_industrialization:he_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/assembler/fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/assembler/fuel_rod.json index 5cebb4235..7385bd7af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/assembler/fuel_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/assembler/fuel_rod.json @@ -5,35 +5,35 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" }, { "amount": 100, - "fluid": "modern_industrialization:helium" + "ingredient": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 18, - "tag": "c:rods/he_uranium" + "ingredient": "#c:rods/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_fuel_rod" + "id": "modern_industrialization:he_uranium_fuel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/dust.json index 5e3856c7a..96b3945e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/he_uranium" + "ingredient": "#c:dusts/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_ingot" + "id": "modern_industrialization:he_uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/tiny_dust.json index 063b211a1..35a84d5c9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/he_uranium" + "ingredient": "#c:tiny_dusts/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_nugget" + "id": "modern_industrialization:he_uranium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/block_from_ingot.json index 33ef10215..c57263f2a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/he_uranium" - }, - "y": { - "item": "modern_industrialization:he_uranium_ingot" - } + "x": "#c:ingots/he_uranium", + "y": "modern_industrialization:he_uranium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:he_uranium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/dust_from_tiny_dust.json index 86424f4db..9abe4782f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/he_uranium" - }, - "y": { - "item": "modern_industrialization:he_uranium_tiny_dust" - } + "x": "#c:tiny_dusts/he_uranium", + "y": "modern_industrialization:he_uranium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:he_uranium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_block.json index 523b95d22..a28ee986b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:he_uranium_block" - } + "modern_industrialization:he_uranium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_nugget.json index 2b23e778d..e6381b115 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/he_uranium" - }, - "y": { - "item": "modern_industrialization:he_uranium_nugget" - } + "x": "#c:nuggets/he_uranium", + "y": "modern_industrialization:he_uranium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:he_uranium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/nugget_from_ingot.json index eb1c4089b..8db24c85b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:he_uranium_ingot" - } + "modern_industrialization:he_uranium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/tiny_dust_from_dust.json index 5f4c39092..9caec03fa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:he_uranium_dust" - } + "modern_industrialization:he_uranium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/cutting_machine/main.json index af5943e13..c325bdd52 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/he_uranium" + "ingredient": "#c:ingots/he_uranium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:he_uranium_rod" + "id": "modern_industrialization:he_uranium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/ingot.json index de42e92be..e009b4c02 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/he_uranium" + "ingredient": "#c:ingots/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_dust" + "id": "modern_industrialization:he_uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/nugget.json index 7df7cd8f7..69bfe85f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/he_uranium" + "ingredient": "#c:nuggets/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_tiny_dust" + "id": "modern_industrialization:he_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/rod.json index d777f2400..cb0628919 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/he_uranium" + "ingredient": "#c:rods/he_uranium" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:he_uranium_tiny_dust" + "id": "modern_industrialization:he_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/block.json index 067026b21..e08c93656 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/he_uranium" + "ingredient": "#c:ingots/he_uranium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_block" + "id": "modern_industrialization:he_uranium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/dust.json index da248b755..ca56eba63 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/he_uranium" + "ingredient": "#c:tiny_dusts/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_dust" + "id": "modern_industrialization:he_uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_double.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_double.json index 1b88c61d4..1c4c41669 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_double.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_double.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:he_uranium_fuel_rod" + "ingredient": "modern_industrialization:he_uranium_fuel_rod" }, { "amount": 1, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_fuel_rod_double" + "id": "modern_industrialization:he_uranium_fuel_rod_double" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_quad.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_quad.json index fa6275319..a24058fcc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_quad.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/fuel_rod_quad.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 2, - "item": "modern_industrialization:he_uranium_fuel_rod_double" + "ingredient": "modern_industrialization:he_uranium_fuel_rod_double" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_fuel_rod_quad" + "id": "modern_industrialization:he_uranium_fuel_rod_quad" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/ingot.json index ac301e58e..053abdfa7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/he_uranium" + "ingredient": "#c:nuggets/he_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:he_uranium_ingot" + "id": "modern_industrialization:he_uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/ingot.json index d091305a2..e440dae34 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/he_uranium" + "ingredient": "#c:storage_blocks/he_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_uranium_ingot" + "id": "modern_industrialization:he_uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/nugget.json index 94cb5dcdb..ff0d2a4a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/he_uranium" + "ingredient": "#c:ingots/he_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_uranium_nugget" + "id": "modern_industrialization:he_uranium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/tiny_dust.json index a83e38aa5..95174de0e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/he_uranium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/he_uranium" + "ingredient": "#c:dusts/he_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:he_uranium_tiny_dust" + "id": "modern_industrialization:he_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/heat_exchanger/lava.json b/src/generated/resources/data/modern_industrialization/recipe/materials/heat_exchanger/lava.json new file mode 100644 index 000000000..adbec5338 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/heat_exchanger/lava.json @@ -0,0 +1,28 @@ +{ + "type": "modern_industrialization:heat_exchanger", + "duration": 400, + "eu": 2, + "fluid_inputs": [ + { + "amount": 10, + "ingredient": "minecraft:lava" + }, + { + "amount": 500, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 8000, + "id": "modern_industrialization:steam" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:obsidian", + "probability": 0.01 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json new file mode 100644 index 000000000..7d9e53f20 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 9, + "ingredient": "#c:tiny_dusts/beryllium" + }, + { + "amount": 1, + "ingredient": "#c:nuggets/stainless_steel" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:beryllium_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json new file mode 100644 index 000000000..a62da9f01 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:mixed_ingot_blastproof" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:blastproof_alloy_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json new file mode 100644 index 000000000..29aecab64 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/diamond" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:diamond" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json new file mode 100644 index 000000000..ed15767b9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/emerald" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:emerald" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json new file mode 100644 index 000000000..b62c16879 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:mixed_ingot_iridium" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:iridium_plate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json new file mode 100644 index 000000000..55cea1756 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:mixed_plate_nuclear" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "modern_industrialization:nuclear_alloy_plate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json new file mode 100644 index 000000000..227bc438d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 9, + "ingredient": "#c:tiny_dusts/tungsten" + }, + { + "amount": 1, + "ingredient": "#c:nuggets/stainless_steel" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:tungsten_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/assembler/gear.json index 323cabadb..eba2a6e64 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/invar" + "ingredient": "#c:plates/invar" }, { "amount": 1, - "item": "modern_industrialization:invar_ring" + "ingredient": "modern_industrialization:invar_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_gear" + "id": "modern_industrialization:invar_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/double_ingot.json index 27a70a517..f9092457c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_double_ingot" + "ingredient": "modern_industrialization:invar_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_plate" + "id": "modern_industrialization:invar_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/main.json index 5aa9a428e..4ecf792fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/invar" + "ingredient": "#c:ingots/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_plate" + "id": "modern_industrialization:invar_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/ring.json index 6dea93600..0c8662d38 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/invar" + "ingredient": "#c:rods/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_ring" + "id": "modern_industrialization:invar_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/block_from_ingot.json index b6db8afea..010fda647 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/invar" - }, - "y": { - "item": "modern_industrialization:invar_ingot" - } + "x": "#c:ingots/invar", + "y": "modern_industrialization:invar_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:invar_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/dust_from_tiny_dust.json index 7da48d31d..0b5b9b45d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/invar" - }, - "y": { - "item": "modern_industrialization:invar_tiny_dust" - } + "x": "#c:tiny_dusts/invar", + "y": "modern_industrialization:invar_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:invar_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/gear.json index 3d672c60b..c58262062 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/invar" - }, - "R": { - "item": "modern_industrialization:invar_ring" - }, - "b": { - "item": "modern_industrialization:invar_bolt" - } + "P": "#c:plates/invar", + "R": "modern_industrialization:invar_ring", + "b": "modern_industrialization:invar_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:invar_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_block.json index 4ba632b6b..92dd618fc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:invar_block" - } + "modern_industrialization:invar_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_nugget.json index 09d8ba310..9f4dc84cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/invar" - }, - "y": { - "item": "modern_industrialization:invar_nugget" - } + "x": "#c:nuggets/invar", + "y": "modern_industrialization:invar_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/large_plate.json index a3b6dd7d5..e49c0bf33 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/invar" - } + "x": "#c:plates/invar" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:invar_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/nugget_from_ingot.json index 898429ce9..85b7e213e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:invar_ingot" - } + "modern_industrialization:invar_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ring.json index b99dcc794..14913a8ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/invar" - }, - "b": { - "item": "modern_industrialization:invar_bolt" - } + "R": "#c:rods/invar", + "b": "modern_industrialization:invar_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/tiny_dust_from_dust.json index 8bdb2249f..430a31c2c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:invar_dust" - } + "modern_industrialization:invar_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/double_ingot.json index e14177e28..a7705a283 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_double_ingot" + "ingredient": "modern_industrialization:invar_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:invar_rod" + "id": "modern_industrialization:invar_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/main.json index f99833a7c..435bc85b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/invar" + "ingredient": "#c:ingots/invar" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_rod" + "id": "modern_industrialization:invar_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/rod.json index 2efe5a432..b31a61688 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/invar" + "ingredient": "#c:rods/invar" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_bolt" + "id": "modern_industrialization:invar_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/bolt.json index d8797e704..2451519ab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_bolt" + "ingredient": "modern_industrialization:invar_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_tiny_dust" + "id": "modern_industrialization:invar_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/double_ingot.json index b07ffab3d..37680108a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_double_ingot" + "ingredient": "modern_industrialization:invar_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/gear.json index b1539b3aa..85a035fa2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/invar" + "ingredient": "#c:gears/invar" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ingot.json index 8e6dbb0c7..58d051837 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/invar" + "ingredient": "#c:ingots/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/large_plate.json index 10729f174..2a55e7473 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_large_plate" + "ingredient": "modern_industrialization:invar_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/nugget.json index f2e69ecd0..d4c8cbc83 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/invar" + "ingredient": "#c:nuggets/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_tiny_dust" + "id": "modern_industrialization:invar_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/plate.json index ee9e40193..42038885c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/invar" + "ingredient": "#c:plates/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ring.json index 184b108ca..30cac4a92 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:invar_ring" + "ingredient": "modern_industrialization:invar_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:invar_tiny_dust" + "id": "modern_industrialization:invar_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/rod.json index b25a7393d..86f8a8ac5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/invar" + "ingredient": "#c:rods/invar" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:invar_tiny_dust" + "id": "modern_industrialization:invar_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/block.json index f3b05f6e4..ce76fc490 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/invar" + "ingredient": "#c:ingots/invar" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_block" + "id": "modern_industrialization:invar_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/double_ingot.json index 36e8303a9..35ea89374 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/invar" + "ingredient": "#c:ingots/invar" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_double_ingot" + "id": "modern_industrialization:invar_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/dust.json index 0fe1a397e..9cda2aa5c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/invar" + "ingredient": "#c:tiny_dusts/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_dust" + "id": "modern_industrialization:invar_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/ingot.json index 72f043a24..9f549e64b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/invar" + "ingredient": "#c:nuggets/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_ingot" + "id": "modern_industrialization:invar_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/large_plate.json index 8d4de8c56..4f523d36c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/invar" + "ingredient": "#c:plates/invar" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:invar_large_plate" + "id": "modern_industrialization:invar_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_blasting.json index 171a88e2f..4f5599708 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:invar_dust" - }, + "ingredient": "modern_industrialization:invar_dust", "result": { - "count": 1, "id": "modern_industrialization:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_smelting.json index 1ec7bb89c..ddad1f664 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:invar_dust" - }, + "ingredient": "modern_industrialization:invar_dust", "result": { - "count": 1, "id": "modern_industrialization:invar_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_blasting.json index 570215eab..44bb0cd25 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:invar_tiny_dust" - }, + "ingredient": "modern_industrialization:invar_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_smelting.json index bc6c9c1cf..02140ac0d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:invar_tiny_dust" - }, + "ingredient": "modern_industrialization:invar_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:invar_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/ingot.json index b4de57c9d..ebcb80659 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/invar" + "ingredient": "#c:storage_blocks/invar" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:invar_ingot" + "id": "modern_industrialization:invar_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/nugget.json index e8dea31b8..9c27475ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/invar" + "ingredient": "#c:ingots/invar" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:invar_nugget" + "id": "modern_industrialization:invar_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/tiny_dust.json index ed53a464f..aad6cb1b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/invar/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/invar" + "ingredient": "#c:dusts/invar" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:invar_tiny_dust" + "id": "modern_industrialization:invar_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/compressor/plate.json index 2165cbff1..254480e39 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/iridium" + "ingredient": "#c:plates/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_curved_plate" + "id": "modern_industrialization:iridium_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/block_from_ingot.json index 94c21b7a7..6f88ac21e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/iridium" - }, - "y": { - "item": "modern_industrialization:iridium_ingot" - } + "x": "#c:ingots/iridium", + "y": "modern_industrialization:iridium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:iridium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/dust_from_tiny_dust.json index 3408aef58..5a45fa572 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/iridium" - }, - "y": { - "item": "modern_industrialization:iridium_tiny_dust" - } + "x": "#c:tiny_dusts/iridium", + "y": "modern_industrialization:iridium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:iridium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_block.json index dc8679755..6ac235f2c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:iridium_block" - } + "modern_industrialization:iridium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_nugget.json index 2a9f9c46b..c93145c89 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/iridium" - }, - "y": { - "item": "modern_industrialization:iridium_nugget" - } + "x": "#c:nuggets/iridium", + "y": "modern_industrialization:iridium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/nugget_from_ingot.json index c85674d5e..a8a438f03 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:iridium_ingot" - } + "modern_industrialization:iridium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_block_from_raw_metal.json index d102b6ec4..cb3178c70 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/iridium" - }, - "y": { - "item": "modern_industrialization:raw_iridium" - } + "x": "#c:raw_materials/iridium", + "y": "modern_industrialization:raw_iridium" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_iridium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_from_raw_metal_block.json index a7c0b614f..67126fdbe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_iridium_block" - } + "modern_industrialization:raw_iridium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/tiny_dust_from_dust.json index 385d77e5f..d3330bcf3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:iridium_dust" - } + "modern_industrialization:iridium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/curved_plate.json index f083a596d..c98828544 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_curved_plate" + "ingredient": "modern_industrialization:iridium_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_dust" + "id": "modern_industrialization:iridium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ingot.json index 16d2af6fe..70936cff1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/iridium" + "ingredient": "#c:ingots/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_dust" + "id": "modern_industrialization:iridium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/nugget.json index 9b62a37f3..e6b09c49d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/iridium" + "ingredient": "#c:nuggets/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_tiny_dust" + "id": "modern_industrialization:iridium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ore_to_raw.json index 36de5aa0b..fe50a9bfc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/iridium" + "ingredient": "#c:ores/iridium" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_iridium" + "id": "modern_industrialization:raw_iridium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/plate.json index 216bf378f..b7c73b7f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/iridium" + "ingredient": "#c:plates/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_dust" + "id": "modern_industrialization:iridium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/raw_metal.json index c6c6c5a34..f01cb4027 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/iridium" + "ingredient": "#c:raw_materials/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_dust" + "id": "modern_industrialization:iridium_dust" }, { "amount": 1, - "item": "modern_industrialization:iridium_dust", + "id": "modern_industrialization:iridium_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/block.json index 51ad7d538..45fd707c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/iridium" + "ingredient": "#c:ingots/iridium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_block" + "id": "modern_industrialization:iridium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/dust.json index a1f220b1d..3d8f9649c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/iridium" + "ingredient": "#c:tiny_dusts/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_dust" + "id": "modern_industrialization:iridium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/ingot.json index 053f5beb1..ab59f1344 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/iridium" + "ingredient": "#c:nuggets/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iridium_ingot" + "id": "modern_industrialization:iridium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/raw_metal_block.json index 45fb67125..3f4e7182e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/iridium" + "ingredient": "#c:raw_materials/iridium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_iridium_block" + "id": "modern_industrialization:raw_iridium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_blasting.json index 0e19c7e6c..390a72fd2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:iridium_dust" - }, + "ingredient": "modern_industrialization:iridium_dust", "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_smelting.json index 45d9c8c7b..3030a685f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:iridium_dust" - }, + "ingredient": "modern_industrialization:iridium_dust", "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_blasting.json index c3f2b1800..e4242f825 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:iridium_ore" - }, + "ingredient": "modern_industrialization:iridium_ore", "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_smelting.json index 09089faf2..b94ab7255 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:iridium_ore" - }, + "ingredient": "modern_industrialization:iridium_ore", "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_blasting.json index db07c97d5..c11a3407f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_iridium" - }, + "ingredient": "modern_industrialization:raw_iridium", "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_smelting.json index faf1352af..2a8d8766d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/raw_metal_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_iridium" - }, + "ingredient": "modern_industrialization:raw_iridium", "result": { - "count": 1, "id": "modern_industrialization:iridium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_blasting.json index f4fda20e8..14081aef9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:iridium_tiny_dust" - }, + "ingredient": "modern_industrialization:iridium_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:iridium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_smelting.json index 6d83aea20..52f4ad4d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:iridium_tiny_dust" - }, + "ingredient": "modern_industrialization:iridium_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:iridium_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/ingot.json index ea26dd0f7..ef975f4fa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/iridium" + "ingredient": "#c:storage_blocks/iridium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:iridium_ingot" + "id": "modern_industrialization:iridium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/nugget.json index c1a320141..f797f0165 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/iridium" + "ingredient": "#c:ingots/iridium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:iridium_nugget" + "id": "modern_industrialization:iridium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/raw_metal.json index baec9effe..ce1402949 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_iridium" + "ingredient": "#c:storage_blocks/raw_iridium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_iridium" + "id": "modern_industrialization:raw_iridium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/tiny_dust.json index 0ab478a80..f3c3fbfa9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/iridium" + "ingredient": "#c:dusts/iridium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:iridium_tiny_dust" + "id": "modern_industrialization:iridium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/barrel.json index 4dcc1a043..92d7b2b96 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/barrel.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:barrels/wooden" + "ingredient": "#c:barrels/wooden" }, { "amount": 8, - "tag": "c:plates/iron" + "ingredient": "#c:plates/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_barrel" + "id": "modern_industrialization:iron_barrel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/gear.json index 2a5cd69ec..fce3eeac6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/iron" + "ingredient": "#c:plates/iron" }, { "amount": 1, - "item": "modern_industrialization:iron_ring" + "ingredient": "modern_industrialization:iron_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_gear" + "id": "modern_industrialization:iron_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/tank.json index 87a0861a6..b55bbc40b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/assembler/tank.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/iron" + "ingredient": "#c:plates/iron" }, { "amount": 1, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_tank" + "id": "modern_industrialization:iron_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/double_ingot.json index e7424a389..1076e92a2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iron_double_ingot" + "ingredient": "modern_industrialization:iron_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_plate" + "id": "modern_industrialization:iron_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/main.json index ed3894191..09ebe6e62 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/iron" + "ingredient": "#c:ingots/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_plate" + "id": "modern_industrialization:iron_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/ring.json index 4f9a4f9e6..a671bed15 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/iron" + "ingredient": "#c:rods/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_ring" + "id": "modern_industrialization:iron_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/barrel.json index a2178c3db..484bdb174 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/barrel.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/iron" - }, - "b": { - "tag": "c:barrels/wooden" - } + "#": "#c:plates/iron", + "b": "#c:barrels/wooden" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:iron_barrel" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/deepslate_to_ore.json index 76fb57f82..bf6f4bca0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_iron_ore" - } + "minecraft:deepslate_iron_ore" ], "result": { - "count": 1, "id": "minecraft:iron_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/dust_from_tiny_dust.json index 49dab3640..4d3894d68 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/iron" - }, - "y": { - "item": "modern_industrialization:iron_tiny_dust" - } + "x": "#c:tiny_dusts/iron", + "y": "modern_industrialization:iron_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:iron_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/gear.json index 9eea68e29..b33de1768 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/iron" - }, - "R": { - "item": "modern_industrialization:iron_ring" - }, - "b": { - "item": "modern_industrialization:iron_bolt" - } + "P": "#c:plates/iron", + "R": "modern_industrialization:iron_ring", + "b": "modern_industrialization:iron_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:iron_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/hammer.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/hammer.json index fe8368ff3..53cdf5bbd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/hammer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/hammer.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "p": { - "item": "modern_industrialization:iron_large_plate" - }, - "s": { - "item": "minecraft:stick" - } + "p": "modern_industrialization:iron_large_plate", + "s": "minecraft:stick" }, "pattern": [ "ppp", @@ -15,7 +11,6 @@ " s " ], "result": { - "count": 1, "id": "modern_industrialization:iron_hammer" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/large_plate.json index ac2528b03..8d5a8c3f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/iron" - } + "x": "#c:plates/iron" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:iron_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/ring.json index 53005fa69..278a7cb82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/iron" - }, - "b": { - "item": "modern_industrialization:iron_bolt" - } + "R": "#c:rods/iron", + "b": "modern_industrialization:iron_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tank.json index 3a90deb27..5319c9c53 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tank.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/iron" - }, - "G": { - "tag": "c:glass_blocks" - } + "#": "#c:plates/iron", + "G": "#c:glass_blocks" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:iron_tank" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tiny_dust_from_dust.json index a5d8b12ec..b5f45c61c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:iron_dust" - } + "modern_industrialization:iron_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/double_ingot.json index f1c14a62a..028a33e83 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iron_double_ingot" + "ingredient": "modern_industrialization:iron_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:iron_rod" + "id": "modern_industrialization:iron_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/main.json index c1b14cd28..fb277c153 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/iron" + "ingredient": "#c:ingots/iron" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_rod" + "id": "modern_industrialization:iron_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/rod.json index 93a0e7c4d..9d5b0b978 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/iron" + "ingredient": "#c:rods/iron" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_bolt" + "id": "modern_industrialization:iron_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt.json index 3f2755760..515e9416e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 4, "id": "modern_industrialization:iron_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt_with_tool.json index dbb766919..853c8842b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 8, "id": "modern_industrialization:iron_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate.json index 4dda0cc33..7d5e953ce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:iron_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate_with_tool.json index 3df5db69e..a0f1fba19 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 2, "id": "modern_industrialization:iron_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring.json index d6a472191..9b84443ba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 2, "id": "modern_industrialization:iron_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring_with_tool.json index 278e309b8..35011fbfb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 4, "id": "modern_industrialization:iron_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod.json index c777bbbc5..2c67bbafa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 2, "id": "modern_industrialization:iron_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod_with_tool.json index 1b1e1b3f6..abfdb2d5c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/double_ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:iron_double_ingot" - }, + "ingredient": "modern_industrialization:iron_double_ingot", "result": { "count": 4, "id": "modern_industrialization:iron_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt.json index ac6875a13..1e15dadfe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { "count": 2, "id": "modern_industrialization:iron_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt_with_tool.json index dae4378c0..395dd7c4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { "count": 4, "id": "modern_industrialization:iron_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_double_ingot.json index bebda448b..39588759c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_double_ingot.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_double_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_dust.json index e09f8b6c8..5cf581305 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate.json index 683b670b2..7e8123907 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate_with_tool.json index a9cbb7943..9092a1eb9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring.json index 58812ca96..3e44857d3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring_with_tool.json index fe34b34e3..f364b7e05 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { "count": 2, "id": "modern_industrialization:iron_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod.json index 5e353120e..c0579d9f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod_with_tool.json index ffae532db..7cf59afd2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/iron" - }, + "ingredient": "#c:ingots/iron", "result": { "count": 2, "id": "modern_industrialization:iron_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/nugget_to_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/nugget_to_tiny_dust.json index eba4fdab5..a66eb36f7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/nugget_to_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/nugget_to_tiny_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:nuggets/iron" - }, + "ingredient": "#c:nuggets/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_tiny_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_dust_with_tool.json index 5f501b0eb..6272b454b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 50, - "ingredient": { - "tag": "c:ores/iron" - }, + "ingredient": "#c:ores/iron", "result": { "count": 4, "id": "modern_industrialization:iron_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal.json index 67d2f5a8a..3b3ce9252 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ores/iron" - }, + "ingredient": "#c:ores/iron", "result": { "count": 2, "id": "minecraft:raw_iron" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal_with_tool.json index 7a7bd1b57..efdff4db9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/ore_to_raw_metal_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ores/iron" - }, + "ingredient": "#c:ores/iron", "result": { "count": 3, "id": "minecraft:raw_iron" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/raw_metal_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/raw_metal_to_dust_with_tool.json index 8afc3dd9a..f234a5ecc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/raw_metal_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/raw_metal_to_dust_with_tool.json @@ -2,9 +2,7 @@ "type": "modern_industrialization:forge_hammer", "count": 3, "damage": 30, - "ingredient": { - "tag": "c:raw_materials/iron" - }, + "ingredient": "#c:raw_materials/iron", "result": { "count": 4, "id": "modern_industrialization:iron_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_bolt_with_tool.json index e078177a4..80bf3d755 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/iron" - }, + "ingredient": "#c:rods/iron", "result": { "count": 2, "id": "modern_industrialization:iron_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_ring_with_tool.json index c67ae20da..278485c83 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/forge_hammer/rod_to_ring_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/iron" - }, + "ingredient": "#c:rods/iron", "result": { - "count": 1, "id": "modern_industrialization:iron_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/bolt.json index e7d878350..3da5ec64f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iron_bolt" + "ingredient": "modern_industrialization:iron_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_tiny_dust" + "id": "modern_industrialization:iron_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/double_ingot.json index 40fb22b16..1d2b28381 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iron_double_ingot" + "ingredient": "modern_industrialization:iron_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/gear.json index 9ca494853..7e0c6f5f8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/iron" + "ingredient": "#c:gears/iron" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ingot.json index db265dee5..984a52a11 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/iron" + "ingredient": "#c:ingots/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/large_plate.json index b35e2581a..5df4aa182 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iron_large_plate" + "ingredient": "modern_industrialization:iron_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/nugget.json index 2733ed252..43672d09a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/iron" + "ingredient": "#c:nuggets/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_tiny_dust" + "id": "modern_industrialization:iron_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ore_to_raw.json index 3bceeb4d6..70700eea8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/iron" + "ingredient": "#c:ores/iron" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:raw_iron" + "id": "minecraft:raw_iron" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/plate.json index 18c1e9edb..72975be0d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/iron" + "ingredient": "#c:plates/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/raw_metal.json index a48181be8..851c86525 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/iron" + "ingredient": "#c:raw_materials/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" }, { "amount": 1, - "item": "modern_industrialization:iron_dust", + "id": "modern_industrialization:iron_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ring.json index bf059a159..2a274d180 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:iron_ring" + "ingredient": "modern_industrialization:iron_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:iron_tiny_dust" + "id": "modern_industrialization:iron_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/rod.json index 4c99021d3..6c866d8a8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/iron" + "ingredient": "#c:rods/iron" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:iron_tiny_dust" + "id": "modern_industrialization:iron_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/block.json index be6703268..3e61e714a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/iron" + "ingredient": "#c:ingots/iron" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:iron_block" + "id": "minecraft:iron_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/double_ingot.json index 370ee1d72..cd2875231 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/iron" + "ingredient": "#c:ingots/iron" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_double_ingot" + "id": "modern_industrialization:iron_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/dust.json index 5efdf6757..da9f970d0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/iron" + "ingredient": "#c:tiny_dusts/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_dust" + "id": "modern_industrialization:iron_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/ingot.json index afcbfac5c..99c2351af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/iron" + "ingredient": "#c:nuggets/iron" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/large_plate.json index ba80ebe29..f8c46d4ad 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/iron" + "ingredient": "#c:plates/iron" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:iron_large_plate" + "id": "modern_industrialization:iron_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/raw_metal_block.json index d353cbf23..fdb3bef77 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/iron" + "ingredient": "#c:raw_materials/iron" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:raw_iron_block" + "id": "minecraft:raw_iron_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_blasting.json index 26c7db0d5..ed32a0fc4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:iron_dust" - }, + "ingredient": "modern_industrialization:iron_dust", "result": { - "count": 1, "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_smelting.json index 71e07cb02..5ee1b10b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:iron_dust" - }, + "ingredient": "modern_industrialization:iron_dust", "result": { - "count": 1, "id": "minecraft:iron_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_blasting.json index 4a4624c37..8fc6ba76b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:iron_tiny_dust" - }, + "ingredient": "modern_industrialization:iron_tiny_dust", "result": { - "count": 1, "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_smelting.json index 33bbec927..32063d4f2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:iron_tiny_dust" - }, + "ingredient": "modern_industrialization:iron_tiny_dust", "result": { - "count": 1, "id": "minecraft:iron_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/ingot.json index 80b486e48..186530346 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/iron" + "ingredient": "#c:storage_blocks/iron" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:iron_ingot" + "id": "minecraft:iron_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/nugget.json index b056ab448..1462f1a4b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/iron" + "ingredient": "#c:ingots/iron" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:iron_nugget" + "id": "minecraft:iron_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/raw_metal.json index daa2bd9c6..bc69035ad 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_iron" + "ingredient": "#c:storage_blocks/raw_iron" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:raw_iron" + "id": "minecraft:raw_iron" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/tiny_dust.json index 64b1d38cb..73210f5ff 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/iron/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/iron" + "ingredient": "#c:dusts/iron" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:iron_tiny_dust" + "id": "modern_industrialization:iron_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json index 68c90d328..9bfc5fa44 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_wire" + "ingredient": "modern_industrialization:kanthal_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_cable" + "id": "modern_industrialization:kanthal_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json index 9451f98e1..1a167c197 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_wire" + "ingredient": "modern_industrialization:kanthal_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_cable" + "id": "modern_industrialization:kanthal_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/coil.json index c83fde850..409ec3b88 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/assembler/coil.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 8, - "item": "modern_industrialization:kanthal_cable" + "ingredient": "modern_industrialization:kanthal_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_coil" + "id": "modern_industrialization:kanthal_coil" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/blast_furnace/dust.json index 3f1c40485..355931f3e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/kanthal" + "ingredient": "#c:dusts/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_hot_ingot" + "id": "modern_industrialization:kanthal_hot_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/double_ingot.json index 81ea4338d..0ec601ad2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_double_ingot" + "ingredient": "modern_industrialization:kanthal_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:kanthal_plate" + "id": "modern_industrialization:kanthal_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/main.json index 0ed9ade40..90aec1853 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/kanthal" + "ingredient": "#c:ingots/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_plate" + "id": "modern_industrialization:kanthal_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/block_from_ingot.json index 747f6867a..b4ed83512 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/kanthal" - }, - "y": { - "item": "modern_industrialization:kanthal_ingot" - } + "x": "#c:ingots/kanthal", + "y": "modern_industrialization:kanthal_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:kanthal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json index 189457d92..0a3c5d775 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:kanthal_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:kanthal_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/coil.json index b629d42b1..784cf7285 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/coil.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "item": "modern_industrialization:kanthal_cable" - } + "x": "modern_industrialization:kanthal_cable" }, "pattern": [ "xxx", @@ -12,7 +10,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:kanthal_coil" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/dust_from_tiny_dust.json index 8e15a5222..11e1a77cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/kanthal" - }, - "y": { - "item": "modern_industrialization:kanthal_tiny_dust" - } + "x": "#c:tiny_dusts/kanthal", + "y": "modern_industrialization:kanthal_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:kanthal_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_block.json index 280d48ee0..f0333c67d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:kanthal_block" - } + "modern_industrialization:kanthal_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_nugget.json index 7bcfc686a..e0a8c8588 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/kanthal" - }, - "y": { - "item": "modern_industrialization:kanthal_nugget" - } + "x": "#c:nuggets/kanthal", + "y": "modern_industrialization:kanthal_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:kanthal_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/nugget_from_ingot.json index e7c6768ea..92fbfe6a6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:kanthal_ingot" - } + "modern_industrialization:kanthal_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/tiny_dust_from_dust.json index f59d6ca6e..adae894c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:kanthal_dust" - } + "modern_industrialization:kanthal_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json index e94c0f7f8..a528ab006 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_hot_ingot" + "ingredient": "modern_industrialization:kanthal_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_ingot" + "id": "modern_industrialization:kanthal_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/double_ingot.json index eefc6776c..a5c2c2581 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_double_ingot" + "ingredient": "modern_industrialization:kanthal_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:kanthal_dust" + "id": "modern_industrialization:kanthal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/ingot.json index 9956e7c3e..f1f06992b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/kanthal" + "ingredient": "#c:ingots/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_dust" + "id": "modern_industrialization:kanthal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/nugget.json index 131f271d0..642e80a1e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/kanthal" + "ingredient": "#c:nuggets/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_tiny_dust" + "id": "modern_industrialization:kanthal_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/plate.json index 89f4080da..ba1f15f9d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/kanthal" + "ingredient": "#c:plates/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_dust" + "id": "modern_industrialization:kanthal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json index c74f4756e..a8621bb70 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_wire" + "ingredient": "modern_industrialization:kanthal_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:kanthal_tiny_dust" + "id": "modern_industrialization:kanthal_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/block.json index 265182cad..0a8233d04 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/kanthal" + "ingredient": "#c:ingots/kanthal" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_block" + "id": "modern_industrialization:kanthal_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json index 944a14ab9..94507bcd1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:kanthal_wire" + "ingredient": "modern_industrialization:kanthal_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:kanthal_cable" + "id": "modern_industrialization:kanthal_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/double_ingot.json index c27c66e9c..3e3185568 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/kanthal" + "ingredient": "#c:ingots/kanthal" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_double_ingot" + "id": "modern_industrialization:kanthal_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/dust.json index 821402aad..8323fbeea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/kanthal" + "ingredient": "#c:tiny_dusts/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_dust" + "id": "modern_industrialization:kanthal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/ingot.json index 61ef7e7e7..c94d944ba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/kanthal" + "ingredient": "#c:nuggets/kanthal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_ingot" + "id": "modern_industrialization:kanthal_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/coil.json index 342abf00a..e8d41e42b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/coil.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_coil" + "ingredient": "modern_industrialization:kanthal_coil" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:kanthal_cable" + "id": "modern_industrialization:kanthal_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/ingot.json index d166330e0..63b1f73fc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/kanthal" + "ingredient": "#c:storage_blocks/kanthal" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:kanthal_ingot" + "id": "modern_industrialization:kanthal_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/nugget.json index 6d5aa34e4..c55fec23b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/kanthal" + "ingredient": "#c:ingots/kanthal" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:kanthal_nugget" + "id": "modern_industrialization:kanthal_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/tiny_dust.json index c1f74d5c7..1dd6899ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/kanthal" + "ingredient": "#c:dusts/kanthal" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:kanthal_tiny_dust" + "id": "modern_industrialization:kanthal_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/vacuum_freezer/hot_ingot.json index 9d39e5c2e..b0ac91282 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_hot_ingot" + "ingredient": "modern_industrialization:kanthal_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:kanthal_ingot" + "id": "modern_industrialization:kanthal_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/wiremill/wire.json index d76d71706..38d57564e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/kanthal" + "ingredient": "#c:plates/kanthal" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:kanthal_wire" + "id": "modern_industrialization:kanthal_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/compressor/lapis.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/compressor/lapis.json index 8020e68c3..01ac02fe4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/compressor/lapis.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/compressor/lapis.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/lapis" + "ingredient": "#c:dusts/lapis" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lapis_lazuli" + "id": "minecraft:lapis_lazuli" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/deepslate_to_ore.json index f8ee731b4..d96538396 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_lapis_ore" - } + "minecraft:deepslate_lapis_ore" ], "result": { - "count": 1, "id": "minecraft:lapis_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/dust_from_tiny_dust.json index 5722af79b..0d74a4861 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/lapis" - }, - "y": { - "item": "modern_industrialization:lapis_tiny_dust" - } + "x": "#c:tiny_dusts/lapis", + "y": "modern_industrialization:lapis_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:lapis_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/tiny_dust_from_dust.json index d2dea4f94..d3ecca836 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:lapis_dust" - } + "modern_industrialization:lapis_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/crushed_dust.json index 2cb787adb..ac62a08c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:lapis_crushed_dust" + "ingredient": "modern_industrialization:lapis_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lapis_dust" + "id": "modern_industrialization:lapis_dust" }, { "amount": 1, - "item": "modern_industrialization:lapis_dust", + "id": "modern_industrialization:lapis_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/gem.json index 13e4e16e9..ee3383cef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:lapis_lazuli" + "ingredient": "minecraft:lapis_lazuli" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lapis_dust" + "id": "modern_industrialization:lapis_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/block.json index c27855516..a3ad742b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "minecraft:lapis_lazuli" + "ingredient": "minecraft:lapis_lazuli" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:lapis_block" + "id": "minecraft:lapis_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/dust.json index 968f891f1..16b70233c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/lapis" + "ingredient": "#c:tiny_dusts/lapis" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lapis_dust" + "id": "modern_industrialization:lapis_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json index 10b3c8b45..61eda2201 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/lapis" + "ingredient": "#c:storage_blocks/lapis" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:lapis_lazuli" + "id": "minecraft:lapis_lazuli" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json index ff35d0051..0bb97e1a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lapis/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/lapis" + "ingredient": "#c:dusts/lapis" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:lapis_tiny_dust" + "id": "modern_industrialization:lapis_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json index 81732e5e9..e526b7d7e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/assembler/fuel_rod.json @@ -5,35 +5,35 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" }, { "amount": 100, - "fluid": "modern_industrialization:helium" + "ingredient": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 18, - "tag": "c:rods/le_mox" + "ingredient": "#c:rods/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_fuel_rod" + "id": "modern_industrialization:le_mox_fuel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json index 06c7c19e5..fe23f4550 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/le_mox" + "ingredient": "#c:dusts/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_ingot" + "id": "modern_industrialization:le_mox_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json index 7e7eab23b..6ce661f21 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/le_mox" + "ingredient": "#c:tiny_dusts/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_nugget" + "id": "modern_industrialization:le_mox_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/block_from_ingot.json index fba95d52b..1e3d61763 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/le_mox" - }, - "y": { - "item": "modern_industrialization:le_mox_ingot" - } + "x": "#c:ingots/le_mox", + "y": "modern_industrialization:le_mox_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:le_mox_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/dust_from_tiny_dust.json index 17757721f..b5c17740f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/le_mox" - }, - "y": { - "item": "modern_industrialization:le_mox_tiny_dust" - } + "x": "#c:tiny_dusts/le_mox", + "y": "modern_industrialization:le_mox_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:le_mox_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_block.json index 8c6cdfd30..78dd770b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:le_mox_block" - } + "modern_industrialization:le_mox_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_nugget.json index f0bc8d95d..7d29f2670 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/le_mox" - }, - "y": { - "item": "modern_industrialization:le_mox_nugget" - } + "x": "#c:nuggets/le_mox", + "y": "modern_industrialization:le_mox_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:le_mox_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/nugget_from_ingot.json index 83c6fcc6c..485cf4748 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:le_mox_ingot" - } + "modern_industrialization:le_mox_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/tiny_dust_from_dust.json index 0a6cf1f74..4fe05a9e3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:le_mox_dust" - } + "modern_industrialization:le_mox_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/cutting_machine/main.json index 827e1093f..171e4a7fd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/le_mox" + "ingredient": "#c:ingots/le_mox" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:le_mox_rod" + "id": "modern_industrialization:le_mox_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/ingot.json index 2152f72bb..f3d6b6c46 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/le_mox" + "ingredient": "#c:ingots/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_dust" + "id": "modern_industrialization:le_mox_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/nugget.json index b5dff7953..0a4a55fca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/le_mox" + "ingredient": "#c:nuggets/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_tiny_dust" + "id": "modern_industrialization:le_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/rod.json index 213133916..cc4124cfd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/le_mox" + "ingredient": "#c:rods/le_mox" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:le_mox_tiny_dust" + "id": "modern_industrialization:le_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/block.json index 0e653b884..3bf682109 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/le_mox" + "ingredient": "#c:ingots/le_mox" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_block" + "id": "modern_industrialization:le_mox_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/dust.json index de75e59f5..55a85c1c8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/le_mox" + "ingredient": "#c:tiny_dusts/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_dust" + "id": "modern_industrialization:le_mox_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_double.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_double.json index 67261f84a..971fa2490 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_double.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_double.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:le_mox_fuel_rod" + "ingredient": "modern_industrialization:le_mox_fuel_rod" }, { "amount": 1, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_fuel_rod_double" + "id": "modern_industrialization:le_mox_fuel_rod_double" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_quad.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_quad.json index 9953f506b..760f41443 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_quad.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/fuel_rod_quad.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 2, - "item": "modern_industrialization:le_mox_fuel_rod_double" + "ingredient": "modern_industrialization:le_mox_fuel_rod_double" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_fuel_rod_quad" + "id": "modern_industrialization:le_mox_fuel_rod_quad" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/ingot.json index 64c99eecf..f05eb768a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/le_mox" + "ingredient": "#c:nuggets/le_mox" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_mox_ingot" + "id": "modern_industrialization:le_mox_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/ingot.json index 26a3e7782..ee03eb7bb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/le_mox" + "ingredient": "#c:storage_blocks/le_mox" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_mox_ingot" + "id": "modern_industrialization:le_mox_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/nugget.json index ed5acf1e0..2a6fe5b24 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/le_mox" + "ingredient": "#c:ingots/le_mox" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_mox_nugget" + "id": "modern_industrialization:le_mox_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/tiny_dust.json index 67cd6a3bc..1da16227b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_mox/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/le_mox" + "ingredient": "#c:dusts/le_mox" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_mox_tiny_dust" + "id": "modern_industrialization:le_mox_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/assembler/fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/assembler/fuel_rod.json index 76a90aebc..2cab95e10 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/assembler/fuel_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/assembler/fuel_rod.json @@ -5,35 +5,35 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" }, { "amount": 100, - "fluid": "modern_industrialization:helium" + "ingredient": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 18, - "tag": "c:rods/le_uranium" + "ingredient": "#c:rods/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_fuel_rod" + "id": "modern_industrialization:le_uranium_fuel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/dust.json index 12263506d..f5d211bb5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/le_uranium" + "ingredient": "#c:dusts/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_ingot" + "id": "modern_industrialization:le_uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/tiny_dust.json index 25b731f72..f40c02700 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/le_uranium" + "ingredient": "#c:tiny_dusts/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_nugget" + "id": "modern_industrialization:le_uranium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/block_from_ingot.json index c5baa9c5c..a8af8d8a7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/le_uranium" - }, - "y": { - "item": "modern_industrialization:le_uranium_ingot" - } + "x": "#c:ingots/le_uranium", + "y": "modern_industrialization:le_uranium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:le_uranium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/dust_from_tiny_dust.json index eb98d99bd..922b031c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/le_uranium" - }, - "y": { - "item": "modern_industrialization:le_uranium_tiny_dust" - } + "x": "#c:tiny_dusts/le_uranium", + "y": "modern_industrialization:le_uranium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:le_uranium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_block.json index ada37a1cc..3d0700c0e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:le_uranium_block" - } + "modern_industrialization:le_uranium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_nugget.json index e47e5f506..4343955dd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/le_uranium" - }, - "y": { - "item": "modern_industrialization:le_uranium_nugget" - } + "x": "#c:nuggets/le_uranium", + "y": "modern_industrialization:le_uranium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:le_uranium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/nugget_from_ingot.json index 9d0b6b2f4..ddac63d46 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:le_uranium_ingot" - } + "modern_industrialization:le_uranium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/tiny_dust_from_dust.json index d5fd4c16f..64befaec8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:le_uranium_dust" - } + "modern_industrialization:le_uranium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/cutting_machine/main.json index 1e704b5ad..5b8eb7a33 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/le_uranium" + "ingredient": "#c:ingots/le_uranium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:le_uranium_rod" + "id": "modern_industrialization:le_uranium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/ingot.json index c26330d28..603c60af0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/le_uranium" + "ingredient": "#c:ingots/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_dust" + "id": "modern_industrialization:le_uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/nugget.json index 1e78e04f2..e4efdb6a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/le_uranium" + "ingredient": "#c:nuggets/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_tiny_dust" + "id": "modern_industrialization:le_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/rod.json index eec2cbe0c..7682bea91 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/le_uranium" + "ingredient": "#c:rods/le_uranium" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:le_uranium_tiny_dust" + "id": "modern_industrialization:le_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/block.json index a20ceeef0..80b8ed5f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/le_uranium" + "ingredient": "#c:ingots/le_uranium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_block" + "id": "modern_industrialization:le_uranium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/dust.json index 6068791d8..9556e1ca9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/le_uranium" + "ingredient": "#c:tiny_dusts/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_dust" + "id": "modern_industrialization:le_uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_double.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_double.json index 0f0504181..143eb6ca2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_double.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_double.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:le_uranium_fuel_rod" + "ingredient": "modern_industrialization:le_uranium_fuel_rod" }, { "amount": 1, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_fuel_rod_double" + "id": "modern_industrialization:le_uranium_fuel_rod_double" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_quad.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_quad.json index f88853483..5242dbee7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_quad.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/fuel_rod_quad.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 2, - "item": "modern_industrialization:le_uranium_fuel_rod_double" + "ingredient": "modern_industrialization:le_uranium_fuel_rod_double" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_fuel_rod_quad" + "id": "modern_industrialization:le_uranium_fuel_rod_quad" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/ingot.json index d04cc8941..5d1d6f9a2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/le_uranium" + "ingredient": "#c:nuggets/le_uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:le_uranium_ingot" + "id": "modern_industrialization:le_uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json index fe8aedf0e..f45868cf9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/le_uranium" + "ingredient": "#c:storage_blocks/le_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_uranium_ingot" + "id": "modern_industrialization:le_uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json index 8e0052a62..ff10ec7a7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/le_uranium" + "ingredient": "#c:ingots/le_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_uranium_nugget" + "id": "modern_industrialization:le_uranium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json index 2b75e3b6e..8186bec57 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/le_uranium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/le_uranium" + "ingredient": "#c:dusts/le_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:le_uranium_tiny_dust" + "id": "modern_industrialization:le_uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json index afd0bb3eb..bb3ef1f5d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:lead_double_ingot" + "ingredient": "modern_industrialization:lead_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:lead_plate" + "id": "modern_industrialization:lead_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/main.json index 327b26c05..77891bac0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/lead" + "ingredient": "#c:ingots/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_plate" + "id": "modern_industrialization:lead_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json index 0b2ed61c3..1ad8ad52a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/lead" - }, - "y": { - "item": "modern_industrialization:lead_ingot" - } + "x": "#c:ingots/lead", + "y": "modern_industrialization:lead_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:lead_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json index 9e27db898..0c87676de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_lead_ore" - } + "modern_industrialization:deepslate_lead_ore" ], "result": { - "count": 1, "id": "modern_industrialization:lead_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json index f2506ee0c..50634e46e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/lead" - }, - "y": { - "item": "modern_industrialization:lead_tiny_dust" - } + "x": "#c:tiny_dusts/lead", + "y": "modern_industrialization:lead_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:lead_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json index 3f7ee99f7..6a02338f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:lead_block" - } + "modern_industrialization:lead_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json index 4a805d266..ed341254d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/lead" - }, - "y": { - "item": "modern_industrialization:lead_nugget" - } + "x": "#c:nuggets/lead", + "y": "modern_industrialization:lead_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json index d1cf565ac..65f0cd379 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:lead_ingot" - } + "modern_industrialization:lead_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json index 7af8f4785..3bf14a571 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/lead" - }, - "y": { - "item": "modern_industrialization:raw_lead" - } + "x": "#c:raw_materials/lead", + "y": "modern_industrialization:raw_lead" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_lead_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json index 14c999c0b..781faa76c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_lead_block" - } + "modern_industrialization:raw_lead_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json index 9cc54f5fa..8d6444ae7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:lead_dust" - } + "modern_industrialization:lead_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json index acaf088f7..054253a0c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:lead_double_ingot" + "ingredient": "modern_industrialization:lead_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:lead_dust" + "id": "modern_industrialization:lead_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ingot.json index 9ed738f52..91f62aaef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/lead" + "ingredient": "#c:ingots/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_dust" + "id": "modern_industrialization:lead_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/nugget.json index edd61a3a8..34982d280 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/lead" + "ingredient": "#c:nuggets/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_tiny_dust" + "id": "modern_industrialization:lead_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json index ec98edfc8..e6febc7ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/lead" + "ingredient": "#c:ores/lead" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_lead" + "id": "modern_industrialization:raw_lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/plate.json index 5ed3c8e9b..be55c9501 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/lead" + "ingredient": "#c:plates/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_dust" + "id": "modern_industrialization:lead_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/block.json index 84ccf7a60..21436b436 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/lead" + "ingredient": "#c:ingots/lead" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_block" + "id": "modern_industrialization:lead_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json index 61847179a..c862c33b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/lead" + "ingredient": "#c:ingots/lead" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_double_ingot" + "id": "modern_industrialization:lead_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/dust.json index d03f1fc8a..ed4ffb3dd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_dust" + "id": "modern_industrialization:lead_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/ingot.json index 4ea6c0d45..00a3c2a5a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/lead" + "ingredient": "#c:nuggets/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lead_ingot" + "id": "modern_industrialization:lead_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json index 520b3f8b1..dc03e615a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/lead" + "ingredient": "#c:raw_materials/lead" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_lead_block" + "id": "modern_industrialization:raw_lead_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json index 199edfab4..108ffe8c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:lead_dust" - }, + "ingredient": "modern_industrialization:lead_dust", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json index 2e172d19c..ff59f8729 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:lead_dust" - }, + "ingredient": "modern_industrialization:lead_dust", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json index f0c15a857..32a53ff92 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_lead_ore" - }, + "ingredient": "modern_industrialization:deepslate_lead_ore", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json index fa66fd955..cc4842a6e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_deepslate_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_lead_ore" - }, + "ingredient": "modern_industrialization:deepslate_lead_ore", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json index a218b8266..7b0b60cf6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:lead_ore" - }, + "ingredient": "modern_industrialization:lead_ore", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json index def7711d6..05d678b30 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/ore_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:lead_ore" - }, + "ingredient": "modern_industrialization:lead_ore", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json index 9f50683d0..e6ab91e1f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_lead" - }, + "ingredient": "modern_industrialization:raw_lead", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json index de1e93a20..5f110b5b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/raw_metal_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_lead" - }, + "ingredient": "modern_industrialization:raw_lead", "result": { - "count": 1, "id": "modern_industrialization:lead_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json index 0c339fb78..085754d42 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:lead_tiny_dust" - }, + "ingredient": "modern_industrialization:lead_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json index 263b65603..e40ded2ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:lead_tiny_dust" - }, + "ingredient": "modern_industrialization:lead_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:lead_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json index 3d2541cc7..f7167dedc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/lead" + "ingredient": "#c:storage_blocks/lead" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:lead_ingot" + "id": "modern_industrialization:lead_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json index 36aa2a741..f360900b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/lead" + "ingredient": "#c:ingots/lead" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:lead_nugget" + "id": "modern_industrialization:lead_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json index 581fa3fbd..c0beaec07 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_lead" + "ingredient": "#c:storage_blocks/raw_lead" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_lead" + "id": "modern_industrialization:raw_lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json index 8c3c9bed4..2a6ad3391 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lead/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/lead" + "ingredient": "#c:dusts/lead" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:lead_tiny_dust" + "id": "modern_industrialization:lead_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json index 641b595d2..cad4c9856 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/compressor/lignite_coal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/lignite_coal" + "ingredient": "#c:dusts/lignite_coal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lignite_coal" + "id": "modern_industrialization:lignite_coal" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json index 9a49146ee..814957223 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/block_from_gem.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "item": "modern_industrialization:lignite_coal" - }, - "y": { - "item": "modern_industrialization:lignite_coal" - } + "x": "#c:lignite_coal", + "y": "modern_industrialization:lignite_coal" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:lignite_coal_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json index 4a47b4aa4..c3fe39e86 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_lignite_coal_ore" - } + "modern_industrialization:deepslate_lignite_coal_ore" ], "result": { - "count": 1, "id": "modern_industrialization:lignite_coal_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/dust_from_tiny_dust.json index e2e967f23..4dd0bc01b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/lignite_coal" - }, - "y": { - "item": "modern_industrialization:lignite_coal_tiny_dust" - } + "x": "#c:tiny_dusts/lignite_coal", + "y": "modern_industrialization:lignite_coal_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:lignite_coal_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/gem_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/gem_from_block.json index dea4d6147..e823a02e5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/gem_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/gem_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:lignite_coal_block" - } + "modern_industrialization:lignite_coal_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/tiny_dust_from_dust.json index e5a4f94ef..092f504fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:lignite_coal_dust" - } + "modern_industrialization:lignite_coal_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/crushed_dust_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/crushed_dust_to_dust_with_tool.json index a143757a9..0d3728644 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/crushed_dust_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/crushed_dust_to_dust_with_tool.json @@ -2,9 +2,7 @@ "type": "modern_industrialization:forge_hammer", "count": 3, "damage": 30, - "ingredient": { - "item": "modern_industrialization:lignite_coal_crushed_dust" - }, + "ingredient": "modern_industrialization:lignite_coal_crushed_dust", "result": { "count": 4, "id": "modern_industrialization:lignite_coal_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust.json index 2a15b0337..6f075e2a6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ores/lignite_coal" - }, + "ingredient": "#c:ores/lignite_coal", "result": { "count": 2, "id": "modern_industrialization:lignite_coal_crushed_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust_with_tool.json index 8a7dde747..2e05eb087 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_crushed_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ores/lignite_coal" - }, + "ingredient": "#c:ores/lignite_coal", "result": { "count": 3, "id": "modern_industrialization:lignite_coal_crushed_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_dust_with_tool.json index 443346d2d..49442bdc7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/forge_hammer/ore_to_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 50, - "ingredient": { - "tag": "c:ores/lignite_coal" - }, + "ingredient": "#c:ores/lignite_coal", "result": { "count": 4, "id": "modern_industrialization:lignite_coal_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/gem.json index 1c0350f16..ef206d09a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:lignite_coal" + "ingredient": "#c:lignite_coal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lignite_coal_dust" + "id": "modern_industrialization:lignite_coal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/ore_to_crushed.json index ca78ca9a9..0eabc9e6f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/lignite_coal" + "ingredient": "#c:ores/lignite_coal" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:lignite_coal_crushed_dust" + "id": "modern_industrialization:lignite_coal_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/block.json index 2aed0ddda..f082b24dd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "modern_industrialization:lignite_coal" + "ingredient": "#c:lignite_coal" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lignite_coal_block" + "id": "modern_industrialization:lignite_coal_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/dust.json index 3f3a8053f..7972c9c39 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/lignite_coal" + "ingredient": "#c:tiny_dusts/lignite_coal" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:lignite_coal_dust" + "id": "modern_industrialization:lignite_coal_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_blasting.json index 1b0ad2de6..c6eec28de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_lignite_coal_ore" - }, + "ingredient": "modern_industrialization:deepslate_lignite_coal_ore", "result": { - "count": 1, "id": "modern_industrialization:lignite_coal" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_smelting.json index 2157e16ef..91521d9b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_deepslate_to_gem_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_lignite_coal_ore" - }, + "ingredient": "modern_industrialization:deepslate_lignite_coal_ore", "result": { - "count": 1, "id": "modern_industrialization:lignite_coal" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_blasting.json index 54fdd01dd..3ec0cd98d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:lignite_coal_ore" - }, + "ingredient": "modern_industrialization:lignite_coal_ore", "result": { - "count": 1, "id": "modern_industrialization:lignite_coal" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_smelting.json index 4fe1271cb..544b825fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/smelting/ore_to_gem_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:lignite_coal_ore" - }, + "ingredient": "modern_industrialization:lignite_coal_ore", "result": { - "count": 1, "id": "modern_industrialization:lignite_coal" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/gem.json index 4c90e9d59..2022d9598 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/lignite_coal" + "ingredient": "#c:storage_blocks/lignite_coal" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:lignite_coal" + "id": "modern_industrialization:lignite_coal" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/tiny_dust.json index fa12ccf1e..a6e082a97 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/lignite_coal/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/lignite_coal" + "ingredient": "#c:dusts/lignite_coal" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:lignite_coal_tiny_dust" + "id": "modern_industrialization:lignite_coal_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json new file mode 100644 index 000000000..64bc5f581 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:bricks" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:brick_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json new file mode 100644 index 000000000..1fe136faf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#minecraft:terracotta" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:brick_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json new file mode 100644 index 000000000..125c2f0a5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:ores/copper" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:raw_copper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json new file mode 100644 index 000000000..8a2ef60f8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:ores/lapis" + } + ], + "item_outputs": [ + { + "amount": 16, + "id": "modern_industrialization:lapis_crushed_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json new file mode 100644 index 000000000..99a76c452 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:raw_materials/lead" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:lead_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:raw_silver", + "probability": 0.5 + }, + { + "amount": 1, + "id": "modern_industrialization:lead_dust", + "probability": 0.5 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json new file mode 100644 index 000000000..ea21b10a8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:lignite_coal_crushed_dust" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:lignite_coal_dust" + }, + { + "amount": 1, + "id": "modern_industrialization:lignite_coal_dust", + "probability": 0.5 + }, + { + "amount": 1, + "id": "modern_industrialization:sulfur_dust", + "probability": 0.5 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json new file mode 100644 index 000000000..ced3f38b6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:ores/quartz" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:quartz_crushed_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json new file mode 100644 index 000000000..02e117be1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:ores/redstone" + } + ], + "item_outputs": [ + { + "amount": 6, + "id": "modern_industrialization:redstone_crushed_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/wood_pulp.json b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/wood_pulp.json new file mode 100644 index 000000000..243b69eb9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/macerator/wood_pulp.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#minecraft:logs" + } + ], + "item_outputs": [ + { + "amount": 12, + "id": "modern_industrialization:wood_pulp" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/dust_from_tiny_dust.json index 4686bcc5d..4bfbe1867 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/manganese" - }, - "y": { - "item": "modern_industrialization:manganese_tiny_dust" - } + "x": "#c:tiny_dusts/manganese", + "y": "modern_industrialization:manganese_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:manganese_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/tiny_dust_from_dust.json index a4f97285f..96c72ca18 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:manganese_dust" - } + "modern_industrialization:manganese_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/packer/dust.json index 210a7edcf..3bbdadd13 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/manganese" + "ingredient": "#c:tiny_dusts/manganese" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:manganese_dust" + "id": "modern_industrialization:manganese_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/unpacker/tiny_dust.json index d065a4912..7dba48f4f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/manganese/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/manganese" + "ingredient": "#c:dusts/manganese" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:manganese_tiny_dust" + "id": "modern_industrialization:manganese_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json new file mode 100644 index 000000000..9463e99b4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 400, + "eu": 2, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 200, + "id": "modern_industrialization:raw_synthetic_oil" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:carbon_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json new file mode 100644 index 000000000..d0d847718 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 400, + "eu": 2, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 200, + "id": "modern_industrialization:raw_synthetic_oil" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:coke_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json new file mode 100644 index 000000000..bc040593d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 2, + "ingredient": "modern_industrialization:brick_dust" + }, + { + "amount": 2, + "ingredient": "minecraft:clay_ball" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:fire_clay_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/gunpowder.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/gunpowder.json new file mode 100644 index 000000000..5a9585976 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/gunpowder.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:coke_dust" + }, + { + "amount": 1, + "ingredient": "#c:dusts/sulfur" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:gunpowder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/itnt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/itnt.json new file mode 100644 index 000000000..d1d68bf55 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/itnt.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 200, + "eu": 16, + "fluid_inputs": [ + { + "amount": 250, + "ingredient": "modern_industrialization:toluene" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:nitrogen" + } + ], + "item_inputs": [ + { + "amount": 4, + "ingredient": "#minecraft:sand" + }, + { + "amount": 3, + "ingredient": "minecraft:flint" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "modern_industrialization:industrial_tnt" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/lubricant.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/lubricant.json new file mode 100644 index 000000000..15a195e1e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/lubricant.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:creosote" + } + ], + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:lubricant" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:redstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json new file mode 100644 index 000000000..cba520527 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:naphtha" + } + ], + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:lubricant" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:redstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json new file mode 100644 index 000000000..07851e841 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 300, + "eu": 4, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:synthetic_oil" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:synthetic_rubber" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/sulfur" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json new file mode 100644 index 000000000..77b08c053 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:synthetic_oil" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:paper" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "modern_industrialization:rubber_sheet" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json new file mode 100644 index 000000000..881e6f8a9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:synthetic_rubber" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:paper" + } + ], + "item_outputs": [ + { + "amount": 12, + "id": "modern_industrialization:rubber_sheet" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json new file mode 100644 index 000000000..2454ce7ad --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 7, + "ingredient": "#c:dusts/iron" + }, + { + "amount": 2, + "ingredient": "modern_industrialization:coke_dust" + } + ], + "item_outputs": [ + { + "amount": 9, + "id": "modern_industrialization:uncooked_steel_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/block_from_dust.json index 71f6ac3c3..77efcc767 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/monazite" - }, - "y": { - "item": "modern_industrialization:monazite_dust" - } + "x": "#c:dusts/monazite", + "y": "modern_industrialization:monazite_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:monazite_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/deepslate_to_ore.json index 880d5411e..b644c2544 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_monazite_ore" - } + "modern_industrialization:deepslate_monazite_ore" ], "result": { - "count": 1, "id": "modern_industrialization:monazite_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_block.json index 8f539388e..e369db117 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:monazite_block" - } + "modern_industrialization:monazite_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_tiny_dust.json index ef528abd3..f85a6f66a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/monazite" - }, - "y": { - "item": "modern_industrialization:monazite_tiny_dust" - } + "x": "#c:tiny_dusts/monazite", + "y": "modern_industrialization:monazite_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:monazite_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/tiny_dust_from_dust.json index fe07cd379..cbbe6bb2b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:monazite_dust" - } + "modern_industrialization:monazite_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/crushed_dust.json index ff8fe9de3..6cb0cd5c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:monazite_crushed_dust" + "ingredient": "modern_industrialization:monazite_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:monazite_dust" + "id": "modern_industrialization:monazite_dust" }, { "amount": 1, - "item": "modern_industrialization:monazite_dust", + "id": "modern_industrialization:monazite_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/ore_to_crushed.json index 53bdcbb1b..f91e2b4c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/monazite" + "ingredient": "#c:ores/monazite" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:monazite_crushed_dust" + "id": "modern_industrialization:monazite_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/block.json index 8289593bf..6d88dc745 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/monazite" + "ingredient": "#c:dusts/monazite" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:monazite_block" + "id": "modern_industrialization:monazite_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/dust.json index 0fbf34e47..10d3ca424 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/monazite" + "ingredient": "#c:tiny_dusts/monazite" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:monazite_dust" + "id": "modern_industrialization:monazite_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/dust.json index 33393a0ff..df3d71325 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/monazite" + "ingredient": "#c:storage_blocks/monazite" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:monazite_dust" + "id": "modern_industrialization:monazite_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/tiny_dust.json index e5faa67aa..2194a8d98 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/monazite/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/monazite" + "ingredient": "#c:dusts/monazite" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:monazite_tiny_dust" + "id": "modern_industrialization:monazite_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/block_from_dust.json index b4fc2867c..5f34bfa79 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/neodymium" - }, - "y": { - "item": "modern_industrialization:neodymium_dust" - } + "x": "#c:dusts/neodymium", + "y": "modern_industrialization:neodymium_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:neodymium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_block.json index 325c4ad2e..bfa1494e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:neodymium_block" - } + "modern_industrialization:neodymium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_tiny_dust.json index bfa46f4f1..dcd83eabc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/neodymium" - }, - "y": { - "item": "modern_industrialization:neodymium_tiny_dust" - } + "x": "#c:tiny_dusts/neodymium", + "y": "modern_industrialization:neodymium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:neodymium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/tiny_dust_from_dust.json index dcddcfd09..0176129d1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:neodymium_dust" - } + "modern_industrialization:neodymium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/block.json index 2960e4123..9aa858dfd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/neodymium" + "ingredient": "#c:dusts/neodymium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:neodymium_block" + "id": "modern_industrialization:neodymium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/dust.json index c4affc1a8..18c26b4e1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/neodymium" + "ingredient": "#c:tiny_dusts/neodymium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:neodymium_dust" + "id": "modern_industrialization:neodymium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/dust.json index 45c8adcff..21302e76a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/neodymium" + "ingredient": "#c:storage_blocks/neodymium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:neodymium_dust" + "id": "modern_industrialization:neodymium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/tiny_dust.json index 86b538181..f9ee78714 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/neodymium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/neodymium" + "ingredient": "#c:dusts/neodymium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:neodymium_tiny_dust" + "id": "modern_industrialization:neodymium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/double_ingot.json index 45680dc51..aa8c4b28e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_double_ingot" + "ingredient": "modern_industrialization:nickel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:nickel_plate" + "id": "modern_industrialization:nickel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/main.json index d8ec2abdf..2ad0cec15 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/nickel" + "ingredient": "#c:ingots/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_plate" + "id": "modern_industrialization:nickel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/block_from_ingot.json index 59a0b8583..10c1e7248 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/nickel" - }, - "y": { - "item": "modern_industrialization:nickel_ingot" - } + "x": "#c:ingots/nickel", + "y": "modern_industrialization:nickel_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:nickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/deepslate_to_ore.json index 728ccb85e..a8acdd9b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_nickel_ore" - } + "modern_industrialization:deepslate_nickel_ore" ], "result": { - "count": 1, "id": "modern_industrialization:nickel_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/dust_from_tiny_dust.json index 6e0b6f207..e5c087337 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/nickel" - }, - "y": { - "item": "modern_industrialization:nickel_tiny_dust" - } + "x": "#c:tiny_dusts/nickel", + "y": "modern_industrialization:nickel_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:nickel_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_block.json index 4ec9e043e..195fed4a8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:nickel_block" - } + "modern_industrialization:nickel_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_nugget.json index f8d04f8e2..5f1f50093 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/nickel" - }, - "y": { - "item": "modern_industrialization:nickel_nugget" - } + "x": "#c:nuggets/nickel", + "y": "modern_industrialization:nickel_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/nugget_from_ingot.json index 2786f1514..4fa728e12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:nickel_ingot" - } + "modern_industrialization:nickel_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_block_from_raw_metal.json index 2fcb16dee..0c935d0ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/nickel" - }, - "y": { - "item": "modern_industrialization:raw_nickel" - } + "x": "#c:raw_materials/nickel", + "y": "modern_industrialization:raw_nickel" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_nickel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_from_raw_metal_block.json index a741a66fc..d9d3b3230 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_nickel_block" - } + "modern_industrialization:raw_nickel_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/tiny_dust_from_dust.json index 3a0ec5f70..8969bd0d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:nickel_dust" - } + "modern_industrialization:nickel_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/double_ingot.json index 5351e82da..3f65f68b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_double_ingot" + "ingredient": "modern_industrialization:nickel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:nickel_dust" + "id": "modern_industrialization:nickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ingot.json index cd6a76a6a..36243f3a8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/nickel" + "ingredient": "#c:ingots/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_dust" + "id": "modern_industrialization:nickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/nugget.json index bd6e9bae9..667738c79 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/nickel" + "ingredient": "#c:nuggets/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_tiny_dust" + "id": "modern_industrialization:nickel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ore_to_raw.json index bc10ea032..e900dcd31 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/nickel" + "ingredient": "#c:ores/nickel" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_nickel" + "id": "modern_industrialization:raw_nickel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/plate.json index 766cbfd87..dbe3c9ede 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/nickel" + "ingredient": "#c:plates/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_dust" + "id": "modern_industrialization:nickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/raw_metal.json index fbb428547..eb9f9c9d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/nickel" + "ingredient": "#c:raw_materials/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_dust" + "id": "modern_industrialization:nickel_dust" }, { "amount": 1, - "item": "modern_industrialization:nickel_dust", + "id": "modern_industrialization:nickel_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/block.json index 735ca6404..18c78993a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/nickel" + "ingredient": "#c:ingots/nickel" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_block" + "id": "modern_industrialization:nickel_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/double_ingot.json index 781576df6..0625d2b88 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/nickel" + "ingredient": "#c:ingots/nickel" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_double_ingot" + "id": "modern_industrialization:nickel_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/dust.json index c0b3a15a7..4686bf2e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/nickel" + "ingredient": "#c:tiny_dusts/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_dust" + "id": "modern_industrialization:nickel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/ingot.json index bb7d56fa1..c427c8f8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/nickel" + "ingredient": "#c:nuggets/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nickel_ingot" + "id": "modern_industrialization:nickel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/raw_metal_block.json index f9e402f70..1c03b6652 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/nickel" + "ingredient": "#c:raw_materials/nickel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_nickel_block" + "id": "modern_industrialization:raw_nickel_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_blasting.json index 48d1782d3..a5840d3d0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:nickel_dust" - }, + "ingredient": "modern_industrialization:nickel_dust", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_smelting.json index 635662881..7c145f150 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:nickel_dust" - }, + "ingredient": "modern_industrialization:nickel_dust", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_blasting.json index 2857ff577..6bd7b7ed4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_nickel_ore" - }, + "ingredient": "modern_industrialization:deepslate_nickel_ore", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_smelting.json index 0744a2b29..eb22fb5da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_deepslate_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_nickel_ore" - }, + "ingredient": "modern_industrialization:deepslate_nickel_ore", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_blasting.json index 220422d0c..54ad8a60d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:nickel_ore" - }, + "ingredient": "modern_industrialization:nickel_ore", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_smelting.json index 03e73dfea..f6e9f6264 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/ore_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:nickel_ore" - }, + "ingredient": "modern_industrialization:nickel_ore", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_blasting.json index 66b912b1a..e1a5eeb93 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_nickel" - }, + "ingredient": "modern_industrialization:raw_nickel", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_smelting.json index 0bdc391d9..d54019f91 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/raw_metal_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_nickel" - }, + "ingredient": "modern_industrialization:raw_nickel", "result": { - "count": 1, "id": "modern_industrialization:nickel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_blasting.json index fa71afa97..d3753a71e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:nickel_tiny_dust" - }, + "ingredient": "modern_industrialization:nickel_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_smelting.json index 25f7ace52..a5037f709 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:nickel_tiny_dust" - }, + "ingredient": "modern_industrialization:nickel_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:nickel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/ingot.json index 78825eb1c..c1498e784 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/nickel" + "ingredient": "#c:storage_blocks/nickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:nickel_ingot" + "id": "modern_industrialization:nickel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/nugget.json index 5675bdb9e..39bbdc64e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/nickel" + "ingredient": "#c:ingots/nickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:nickel_nugget" + "id": "modern_industrialization:nickel_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/raw_metal.json index c02fed20e..622f4817f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_nickel" + "ingredient": "#c:storage_blocks/raw_nickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_nickel" + "id": "modern_industrialization:raw_nickel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/tiny_dust.json index 59b700913..e0729cfa7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nickel/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/nickel" + "ingredient": "#c:dusts/nickel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:nickel_tiny_dust" + "id": "modern_industrialization:nickel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/craft/large_plate.json index 28a66aca0..816e67394 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/nuclear_alloy" - } + "x": "#c:plates/nuclear_alloy" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:nuclear_alloy_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/packer/large_plate.json index 65961e6ee..f9eff015f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/nuclear_alloy/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:nuclear_alloy_large_plate" + "id": "modern_industrialization:nuclear_alloy_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/packer/fire_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/fire_bricks.json new file mode 100644 index 000000000..d6fcfc403 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/fire_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "modern_industrialization:fire_clay_brick" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:fire_clay_bricks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json new file mode 100644 index 000000000..938c4b6f4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:packer", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:ingots/tungsten" + }, + { + "amount": 1, + "ingredient": "#c:ingots/titanium" + }, + { + "amount": 1, + "ingredient": "#c:ingots/stainless_steel" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:mixed_ingot_blastproof" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json new file mode 100644 index 000000000..5ea4d865e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:packer", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:ingots/blastproof_alloy" + }, + { + "amount": 1, + "ingredient": "#c:ingots/iridium" + }, + { + "amount": 1, + "ingredient": "#c:ingots/blastproof_alloy" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:mixed_ingot_iridium" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json new file mode 100644 index 000000000..32b2b1991 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:packer", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:blastproof_alloy_plate" + }, + { + "amount": 1, + "ingredient": "#c:plates/beryllium" + }, + { + "amount": 1, + "ingredient": "#c:plates/cadmium" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:mixed_plate_nuclear" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json index e3779de72..bbc75ced1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_wire" + "ingredient": "modern_industrialization:platinum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_cable" + "id": "modern_industrialization:platinum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json index b561fc7f9..02c2565c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_wire" + "ingredient": "modern_industrialization:platinum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_cable" + "id": "modern_industrialization:platinum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/blast_furnace/dust.json index 66309edaf..f21c1196e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/platinum" + "ingredient": "#c:dusts/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_hot_ingot" + "id": "modern_industrialization:platinum_hot_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/double_ingot.json index e2025052f..20d71dead 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_double_ingot" + "ingredient": "modern_industrialization:platinum_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:platinum_plate" + "id": "modern_industrialization:platinum_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/main.json index b505ee81c..7a38b8fac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/platinum" + "ingredient": "#c:ingots/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_plate" + "id": "modern_industrialization:platinum_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/block_from_ingot.json index 84535542b..480a8282d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/platinum" - }, - "y": { - "item": "modern_industrialization:platinum_ingot" - } + "x": "#c:ingots/platinum", + "y": "modern_industrialization:platinum_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:platinum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json index 01dc18bbd..3f9f2c889 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:platinum_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:platinum_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/dust_from_tiny_dust.json index 9ad86fd12..e1992d5bc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/platinum" - }, - "y": { - "item": "modern_industrialization:platinum_tiny_dust" - } + "x": "#c:tiny_dusts/platinum", + "y": "modern_industrialization:platinum_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:platinum_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_block.json index 55244ca66..1691e7506 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:platinum_block" - } + "modern_industrialization:platinum_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_nugget.json index 255ace114..743a1b6ab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/platinum" - }, - "y": { - "item": "modern_industrialization:platinum_nugget" - } + "x": "#c:nuggets/platinum", + "y": "modern_industrialization:platinum_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:platinum_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/nugget_from_ingot.json index 77a93c5d8..6bfd3d570 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:platinum_ingot" - } + "modern_industrialization:platinum_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_block_from_raw_metal.json index fb2684db4..db77e4a93 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/platinum" - }, - "y": { - "item": "modern_industrialization:raw_platinum" - } + "x": "#c:raw_materials/platinum", + "y": "modern_industrialization:raw_platinum" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_platinum_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_from_raw_metal_block.json index 01f873b98..50a0bb84f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_platinum_block" - } + "modern_industrialization:raw_platinum_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/tiny_dust_from_dust.json index d891f1dcd..9827d1215 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:platinum_dust" - } + "modern_industrialization:platinum_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json index 88ee7da28..e3530f57f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_hot_ingot" + "ingredient": "modern_industrialization:platinum_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_ingot" + "id": "modern_industrialization:platinum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/double_ingot.json index 1a6ac5f06..faa955c8e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_double_ingot" + "ingredient": "modern_industrialization:platinum_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:platinum_dust" + "id": "modern_industrialization:platinum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ingot.json index 51cef6469..3935bc035 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/platinum" + "ingredient": "#c:ingots/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_dust" + "id": "modern_industrialization:platinum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/nugget.json index bcbbb9878..c6702f8fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/platinum" + "ingredient": "#c:nuggets/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_tiny_dust" + "id": "modern_industrialization:platinum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ore_to_raw.json index bcb793c0d..08c8856b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/platinum" + "ingredient": "#c:ores/platinum" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_platinum" + "id": "modern_industrialization:raw_platinum" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/plate.json index 585878909..8108578df 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/platinum" + "ingredient": "#c:plates/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_dust" + "id": "modern_industrialization:platinum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json index 72dd66fd3..c5f52645d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_wire" + "ingredient": "modern_industrialization:platinum_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:platinum_tiny_dust" + "id": "modern_industrialization:platinum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/block.json index 510bfe43e..365edf555 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/platinum" + "ingredient": "#c:ingots/platinum" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_block" + "id": "modern_industrialization:platinum_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json index beefd464d..b51eec065 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:platinum_wire" + "ingredient": "modern_industrialization:platinum_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:platinum_cable" + "id": "modern_industrialization:platinum_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/double_ingot.json index 503a280b7..0d8717cce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/platinum" + "ingredient": "#c:ingots/platinum" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_double_ingot" + "id": "modern_industrialization:platinum_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/dust.json index f1a22ce40..1888c648a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/platinum" + "ingredient": "#c:tiny_dusts/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_dust" + "id": "modern_industrialization:platinum_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/ingot.json index bf676e077..c16c13a6a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/platinum" + "ingredient": "#c:nuggets/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_ingot" + "id": "modern_industrialization:platinum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/raw_metal_block.json index 0854154b7..b918a1a19 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/platinum" + "ingredient": "#c:raw_materials/platinum" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_platinum_block" + "id": "modern_industrialization:raw_platinum_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/ingot.json index 40b3371b6..e419f13cd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/platinum" + "ingredient": "#c:storage_blocks/platinum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:platinum_ingot" + "id": "modern_industrialization:platinum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/nugget.json index ca9e01679..0969282cc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/platinum" + "ingredient": "#c:ingots/platinum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:platinum_nugget" + "id": "modern_industrialization:platinum_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/raw_metal.json index 4940c52c1..0dc6ea33b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_platinum" + "ingredient": "#c:storage_blocks/raw_platinum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_platinum" + "id": "modern_industrialization:raw_platinum" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/tiny_dust.json index 4bc00885a..39aa489f9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/platinum" + "ingredient": "#c:dusts/platinum" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:platinum_tiny_dust" + "id": "modern_industrialization:platinum_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/vacuum_freezer/hot_ingot.json index 6575ccae0..a1c321bb1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_hot_ingot" + "ingredient": "modern_industrialization:platinum_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_ingot" + "id": "modern_industrialization:platinum_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json index 1a3d07486..3ce4219bc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/fine_wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:platinum_wire" + "ingredient": "modern_industrialization:platinum_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:platinum_fine_wire" + "id": "modern_industrialization:platinum_fine_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/wire.json index 5688e8eef..3e30c71b8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/platinum" + "ingredient": "#c:plates/platinum" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:platinum_wire" + "id": "modern_industrialization:platinum_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/dust.json index df57d736e..5d504d337 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/plutonium" + "ingredient": "#c:dusts/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_ingot" + "id": "modern_industrialization:plutonium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/tiny_dust.json index b130dc05c..5f8e5315a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/plutonium" + "ingredient": "#c:tiny_dusts/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_nugget" + "id": "modern_industrialization:plutonium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/block_from_ingot.json index 69d88ae1b..93aad6c55 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/plutonium" - }, - "y": { - "item": "modern_industrialization:plutonium_ingot" - } + "x": "#c:ingots/plutonium", + "y": "modern_industrialization:plutonium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:plutonium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/dust_from_tiny_dust.json index bc6126780..e5a90bce3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/plutonium" - }, - "y": { - "item": "modern_industrialization:plutonium_tiny_dust" - } + "x": "#c:tiny_dusts/plutonium", + "y": "modern_industrialization:plutonium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:plutonium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_block.json index b1bbbd771..b2b19b315 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:plutonium_block" - } + "modern_industrialization:plutonium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_nugget.json index 45c553592..0470e3def 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/plutonium" - }, - "y": { - "item": "modern_industrialization:plutonium_nugget" - } + "x": "#c:nuggets/plutonium", + "y": "modern_industrialization:plutonium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:plutonium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/nugget_from_ingot.json index c785b4f65..267191973 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:plutonium_ingot" - } + "modern_industrialization:plutonium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/tiny_dust_from_dust.json index 75a3782a3..7a79ccc97 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:plutonium_dust" - } + "modern_industrialization:plutonium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/ingot.json index e5cef8179..500a46763 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/plutonium" + "ingredient": "#c:ingots/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_dust" + "id": "modern_industrialization:plutonium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/nugget.json index e1d2695c9..28920022b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/plutonium" + "ingredient": "#c:nuggets/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_tiny_dust" + "id": "modern_industrialization:plutonium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/block.json index 2d88583aa..922b0280d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/plutonium" + "ingredient": "#c:ingots/plutonium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_block" + "id": "modern_industrialization:plutonium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/dust.json index 47475e0d7..b19ba38c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/plutonium" + "ingredient": "#c:tiny_dusts/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_dust" + "id": "modern_industrialization:plutonium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/ingot.json index 37899721d..384cbbd74 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/plutonium" + "ingredient": "#c:nuggets/plutonium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:plutonium_ingot" + "id": "modern_industrialization:plutonium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/ingot.json index 3a4da07dc..e4da1f44e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/plutonium" + "ingredient": "#c:storage_blocks/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:plutonium_ingot" + "id": "modern_industrialization:plutonium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/nugget.json index 9e28638c7..9272c7617 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/plutonium" + "ingredient": "#c:ingots/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:plutonium_nugget" + "id": "modern_industrialization:plutonium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/tiny_dust.json index 84f996919..007f95260 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/plutonium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/plutonium" + "ingredient": "#c:dusts/plutonium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:plutonium_tiny_dust" + "id": "modern_industrialization:plutonium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json new file mode 100644 index 000000000..10c6729d6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 125, + "ingredient": "modern_industrialization:high_pressure_heavy_water" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:heavy_water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json new file mode 100644 index 000000000..b4d2b4b3e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 125, + "ingredient": "modern_industrialization:high_pressure_heavy_water_steam" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:heavy_water_steam" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/steam.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/steam.json new file mode 100644 index 000000000..ff1f264ec --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/steam.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 125, + "ingredient": "modern_industrialization:high_pressure_steam" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:steam" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/water.json new file mode 100644 index 000000000..40d3e54ee --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/down/water.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 125, + "ingredient": "modern_industrialization:high_pressure_water" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "minecraft:water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json new file mode 100644 index 000000000..d68a2b638 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json @@ -0,0 +1,18 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 200, + "eu": 8, + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:liquid_air" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:air_intake", + "probability": 0.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json new file mode 100644 index 000000000..48669b134 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 1200, + "eu": 64, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:heavy_water" + } + ], + "fluid_outputs": [ + { + "amount": 125, + "id": "modern_industrialization:high_pressure_heavy_water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json new file mode 100644 index 000000000..356c8f91c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 75, + "eu": 64, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:heavy_water_steam" + } + ], + "fluid_outputs": [ + { + "amount": 125, + "id": "modern_industrialization:high_pressure_heavy_water_steam" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/steam.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/steam.json new file mode 100644 index 000000000..039c54cea --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/steam.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 75, + "eu": 64, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:steam" + } + ], + "fluid_outputs": [ + { + "amount": 125, + "id": "modern_industrialization:high_pressure_steam" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/water.json b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/water.json new file mode 100644 index 000000000..584c4301b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/pressurizer/up/water.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:pressurizer", + "duration": 1200, + "eu": 64, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 125, + "id": "modern_industrialization:high_pressure_water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/compressor/quartz.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/compressor/quartz.json index 127ac3dcd..686e51ea2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/compressor/quartz.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/compressor/quartz.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/quartz" + "ingredient": "#c:dusts/quartz" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:quartz" + "id": "minecraft:quartz" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/dust_from_tiny_dust.json index 2513b4cd7..ea3687100 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/quartz" - }, - "y": { - "item": "modern_industrialization:quartz_tiny_dust" - } + "x": "#c:tiny_dusts/quartz", + "y": "modern_industrialization:quartz_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:quartz_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/tiny_dust_from_dust.json index a065385ff..50037ccdf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:quartz_dust" - } + "modern_industrialization:quartz_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/crushed_dust.json index c1decca17..6ebd69738 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:quartz_crushed_dust" + "ingredient": "modern_industrialization:quartz_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quartz_dust" + "id": "modern_industrialization:quartz_dust" }, { "amount": 1, - "item": "modern_industrialization:quartz_dust", + "id": "modern_industrialization:quartz_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/gem.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/gem.json index f28e5f19c..869d0ddd7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/gem.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/macerator/gem.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:quartz" + "ingredient": "minecraft:quartz" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quartz_dust" + "id": "modern_industrialization:quartz_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/packer/dust.json index aed95346e..807e6ad19 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/quartz" + "ingredient": "#c:tiny_dusts/quartz" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quartz_dust" + "id": "modern_industrialization:quartz_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/unpacker/tiny_dust.json index dab055064..31a6dc9c6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/quartz/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/quartz" + "ingredient": "#c:dusts/quartz" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:quartz_tiny_dust" + "id": "modern_industrialization:quartz_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/deepslate_to_ore.json index 3be3f0e39..536cf2ca5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:deepslate_redstone_ore" - } + "minecraft:deepslate_redstone_ore" ], "result": { - "count": 1, "id": "minecraft:redstone_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/dust_from_tiny_dust.json index 17fee506b..6d37097e9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/redstone" - }, - "y": { - "item": "modern_industrialization:redstone_tiny_dust" - } + "x": "#c:tiny_dusts/redstone", + "y": "modern_industrialization:redstone_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "minecraft:redstone" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/tiny_dust_from_dust.json index 9b90a0896..396d3639e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:redstone" - } + "minecraft:redstone" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/macerator/crushed_dust.json index ddeb40f68..f72df8d5d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:redstone_crushed_dust" + "ingredient": "modern_industrialization:redstone_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:redstone" + "id": "minecraft:redstone" }, { "amount": 1, - "item": "minecraft:redstone", + "id": "minecraft:redstone", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/block.json index 1de49759f..8955f50bd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "item": "minecraft:redstone" + "ingredient": "minecraft:redstone" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:redstone_block" + "id": "minecraft:redstone_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/dust.json index 4a6c74147..58262be80 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/redstone" + "ingredient": "#c:tiny_dusts/redstone" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:redstone" + "id": "minecraft:redstone" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/dust.json index 76d27da80..d2f98b61c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/redstone" + "ingredient": "#c:storage_blocks/redstone" } ], "item_outputs": [ { "amount": 9, - "item": "minecraft:redstone" + "id": "minecraft:redstone" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/tiny_dust.json index a4f0a434b..d14d1aa28 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/redstone/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:redstone" + "ingredient": "minecraft:redstone" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:redstone_tiny_dust" + "id": "modern_industrialization:redstone_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/dust_from_tiny_dust.json index 15c81da27..93407f52b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/ruby" - }, - "y": { - "item": "modern_industrialization:ruby_tiny_dust" - } + "x": "#c:tiny_dusts/ruby", + "y": "modern_industrialization:ruby_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:ruby_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/tiny_dust_from_dust.json index c3bcf99bf..7558908a3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:ruby_dust" - } + "modern_industrialization:ruby_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/packer/dust.json index ad68c840d..ded304b08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/ruby" + "ingredient": "#c:tiny_dusts/ruby" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:ruby_dust" + "id": "modern_industrialization:ruby_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/unpacker/tiny_dust.json index a2c57523a..44db4cbf8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/ruby/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/ruby" + "ingredient": "#c:dusts/ruby" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:ruby_tiny_dust" + "id": "modern_industrialization:ruby_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/block_from_dust.json index 069696535..f4236f283 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/salt" - }, - "y": { - "item": "modern_industrialization:salt_dust" - } + "x": "#c:dusts/salt", + "y": "modern_industrialization:salt_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:salt_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/deepslate_to_ore.json index 6d55551b1..a1c6c9f72 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_salt_ore" - } + "modern_industrialization:deepslate_salt_ore" ], "result": { - "count": 1, "id": "modern_industrialization:salt_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_block.json index ddf510690..c1dd41e1b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:salt_block" - } + "modern_industrialization:salt_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_tiny_dust.json index 6fdf4dc79..7696ad17d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/salt" - }, - "y": { - "item": "modern_industrialization:salt_tiny_dust" - } + "x": "#c:tiny_dusts/salt", + "y": "modern_industrialization:salt_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:salt_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/tiny_dust_from_dust.json index 210100938..09460f111 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:salt_dust" - } + "modern_industrialization:salt_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/crushed_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/crushed_dust.json index 458a041d9..fb4cca014 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/crushed_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/crushed_dust.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:salt_crushed_dust" + "ingredient": "modern_industrialization:salt_crushed_dust" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:salt_dust" + "id": "modern_industrialization:salt_dust" }, { "amount": 1, - "item": "modern_industrialization:salt_dust", + "id": "modern_industrialization:salt_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/ore_to_crushed.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/ore_to_crushed.json index 915d602c3..f4eccc5b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/ore_to_crushed.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/macerator/ore_to_crushed.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/salt" + "ingredient": "#c:ores/salt" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:salt_crushed_dust" + "id": "modern_industrialization:salt_crushed_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/block.json index 2c797d85e..bba26d68e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/salt" + "ingredient": "#c:dusts/salt" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:salt_block" + "id": "modern_industrialization:salt_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/dust.json index b0338c837..99fcc0aba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/salt" + "ingredient": "#c:tiny_dusts/salt" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:salt_dust" + "id": "modern_industrialization:salt_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/dust.json index 010db98b7..07be09e48 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/salt" + "ingredient": "#c:storage_blocks/salt" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:salt_dust" + "id": "modern_industrialization:salt_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/tiny_dust.json index fdf38d181..f0e1c8df9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/salt/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/salt" + "ingredient": "#c:dusts/salt" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:salt_tiny_dust" + "id": "modern_industrialization:salt_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/double_ingot.json index 90276a138..04ea18e4c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_double_ingot" + "ingredient": "modern_industrialization:silicon_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:silicon_plate" + "id": "modern_industrialization:silicon_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/main.json index 1e9f6a275..161e3d780 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/silicon" + "ingredient": "#c:ingots/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_plate" + "id": "modern_industrialization:silicon_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/block_from_ingot.json index d04f48205..61cbaf41d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/silicon" - }, - "y": { - "item": "modern_industrialization:silicon_ingot" - } + "x": "#c:ingots/silicon", + "y": "modern_industrialization:silicon_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:silicon_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/dust_from_tiny_dust.json index 77fdddfb3..08e36b009 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/silicon" - }, - "y": { - "item": "modern_industrialization:silicon_tiny_dust" - } + "x": "#c:tiny_dusts/silicon", + "y": "modern_industrialization:silicon_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:silicon_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_block.json index fd491905d..c65fe828d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:silicon_block" - } + "modern_industrialization:silicon_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_nugget.json index 7007ccbf0..c6b57d61d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/silicon" - }, - "y": { - "item": "modern_industrialization:silicon_nugget" - } + "x": "#c:nuggets/silicon", + "y": "modern_industrialization:silicon_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:silicon_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/nugget_from_ingot.json index 619737252..d11a47844 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:silicon_ingot" - } + "modern_industrialization:silicon_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/tiny_dust_from_dust.json index 3a5a0d3d6..2096d881d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:silicon_dust" - } + "modern_industrialization:silicon_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/double_ingot.json index 20f19b7b3..92f02ad7e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_double_ingot" + "ingredient": "modern_industrialization:silicon_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:silicon_dust" + "id": "modern_industrialization:silicon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/ingot.json index b3898db36..db6259ba4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/silicon" + "ingredient": "#c:ingots/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_dust" + "id": "modern_industrialization:silicon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/nugget.json index 9e0d80338..f2929abce 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/silicon" + "ingredient": "#c:nuggets/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_tiny_dust" + "id": "modern_industrialization:silicon_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/plate.json index d75d9c777..5948a9efc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/silicon" + "ingredient": "#c:plates/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_dust" + "id": "modern_industrialization:silicon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/block.json index 8994bbf6b..e4d330045 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/silicon" + "ingredient": "#c:ingots/silicon" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_block" + "id": "modern_industrialization:silicon_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/double_ingot.json index 74c6bb077..e99d88f01 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/silicon" + "ingredient": "#c:ingots/silicon" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_double_ingot" + "id": "modern_industrialization:silicon_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/dust.json index 9d363ba05..c532a1232 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/silicon" + "ingredient": "#c:tiny_dusts/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_dust" + "id": "modern_industrialization:silicon_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/ingot.json index 9040cf7ba..67de4368a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/silicon" + "ingredient": "#c:nuggets/silicon" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silicon_ingot" + "id": "modern_industrialization:silicon_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_blasting.json index 93b57e75c..dffd04e25 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:silicon_dust" - }, + "ingredient": "modern_industrialization:silicon_dust", "result": { - "count": 1, "id": "modern_industrialization:silicon_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_smelting.json index 3655cef42..246b9be45 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:silicon_dust" - }, + "ingredient": "modern_industrialization:silicon_dust", "result": { - "count": 1, "id": "modern_industrialization:silicon_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_blasting.json index 9181058c5..fd680a6e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:silicon_tiny_dust" - }, + "ingredient": "modern_industrialization:silicon_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:silicon_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_smelting.json index fc0402931..5d32b1dbb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:silicon_tiny_dust" - }, + "ingredient": "modern_industrialization:silicon_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:silicon_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/ingot.json index 45d27c798..3aaf3d8e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/silicon" + "ingredient": "#c:storage_blocks/silicon" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:silicon_ingot" + "id": "modern_industrialization:silicon_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/nugget.json index 65f2d0863..24ca029de 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/silicon" + "ingredient": "#c:ingots/silicon" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:silicon_nugget" + "id": "modern_industrialization:silicon_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/tiny_dust.json index 00f50a884..9e435d47b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silicon/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/silicon" + "ingredient": "#c:dusts/silicon" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:silicon_tiny_dust" + "id": "modern_industrialization:silicon_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json index 3ce9da608..4dccec1f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:silver_wire" + "ingredient": "modern_industrialization:silver_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:silver_cable" + "id": "modern_industrialization:silver_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json index 243117429..855800076 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:silver_wire" + "ingredient": "modern_industrialization:silver_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:silver_cable" + "id": "modern_industrialization:silver_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/double_ingot.json index dfc767550..ac0e2533a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silver_double_ingot" + "ingredient": "modern_industrialization:silver_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:silver_plate" + "id": "modern_industrialization:silver_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/main.json index 5fe892626..c9ed762da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/silver" + "ingredient": "#c:ingots/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_plate" + "id": "modern_industrialization:silver_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/block_from_ingot.json index 85ba43e40..2436fda17 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/silver" - }, - "y": { - "item": "modern_industrialization:silver_ingot" - } + "x": "#c:ingots/silver", + "y": "modern_industrialization:silver_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:silver_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json index 35ab75d2e..2207a7983 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:silver_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:silver_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/dust_from_tiny_dust.json index 04ab43ed4..18413d68d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/silver" - }, - "y": { - "item": "modern_industrialization:silver_tiny_dust" - } + "x": "#c:tiny_dusts/silver", + "y": "modern_industrialization:silver_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:silver_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_block.json index ddeacdc8f..6f7539fc9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:silver_block" - } + "modern_industrialization:silver_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_nugget.json index 8b8af7a4d..bc8d582fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/silver" - }, - "y": { - "item": "modern_industrialization:silver_nugget" - } + "x": "#c:nuggets/silver", + "y": "modern_industrialization:silver_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/nugget_from_ingot.json index d9c0ddef8..4b76734fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:silver_ingot" - } + "modern_industrialization:silver_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_block_from_raw_metal.json index 1a142ee92..70f9b5a08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/silver" - }, - "y": { - "item": "modern_industrialization:raw_silver" - } + "x": "#c:raw_materials/silver", + "y": "modern_industrialization:raw_silver" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_silver_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_from_raw_metal_block.json index 7eb41f15e..a65ddec71 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_silver_block" - } + "modern_industrialization:raw_silver_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/tiny_dust_from_dust.json index 9483a601c..6b0bb14cc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:silver_dust" - } + "modern_industrialization:silver_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/double_ingot.json index 93db74bf8..daea56d8a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silver_double_ingot" + "ingredient": "modern_industrialization:silver_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:silver_dust" + "id": "modern_industrialization:silver_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/ingot.json index 99578ea19..cc4cb0ce1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/silver" + "ingredient": "#c:ingots/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_dust" + "id": "modern_industrialization:silver_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/nugget.json index 16a37c602..8ce0edf5a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/silver" + "ingredient": "#c:nuggets/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_tiny_dust" + "id": "modern_industrialization:silver_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/plate.json index ddcb266a3..b030589ea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/silver" + "ingredient": "#c:plates/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_dust" + "id": "modern_industrialization:silver_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/raw_metal.json index 2d31c2c01..adaea1903 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/silver" + "ingredient": "#c:raw_materials/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_dust" + "id": "modern_industrialization:silver_dust" }, { "amount": 1, - "item": "modern_industrialization:silver_dust", + "id": "modern_industrialization:silver_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json index 0dc7426a0..a8a86c714 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:silver_wire" + "ingredient": "modern_industrialization:silver_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:silver_tiny_dust" + "id": "modern_industrialization:silver_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/block.json index 0eda3e774..a3275821e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/silver" + "ingredient": "#c:ingots/silver" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_block" + "id": "modern_industrialization:silver_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json index 9a1cceb4d..c52aed95c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:silver_wire" + "ingredient": "modern_industrialization:silver_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:silver_cable" + "id": "modern_industrialization:silver_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/double_ingot.json index 7a68c039b..37698c196 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/silver" + "ingredient": "#c:ingots/silver" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_double_ingot" + "id": "modern_industrialization:silver_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/dust.json index 35824fa2b..0d79bdbc6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/silver" + "ingredient": "#c:tiny_dusts/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_dust" + "id": "modern_industrialization:silver_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/ingot.json index 04e28a713..3e4216cc8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/silver" + "ingredient": "#c:nuggets/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:silver_ingot" + "id": "modern_industrialization:silver_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/raw_metal_block.json index 542144949..5e179ba24 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/silver" + "ingredient": "#c:raw_materials/silver" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_silver_block" + "id": "modern_industrialization:raw_silver_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_blasting.json index 8c4773a92..3a28303ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:silver_dust" - }, + "ingredient": "modern_industrialization:silver_dust", "result": { - "count": 1, "id": "modern_industrialization:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_smelting.json index c6fcabb7f..30b762cc1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:silver_dust" - }, + "ingredient": "modern_industrialization:silver_dust", "result": { - "count": 1, "id": "modern_industrialization:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_blasting.json index fa6beb004..9bb27c5cb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_silver" - }, + "ingredient": "modern_industrialization:raw_silver", "result": { - "count": 1, "id": "modern_industrialization:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_smelting.json index 6a860c9ec..3fb6cd4ff 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/raw_metal_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_silver" - }, + "ingredient": "modern_industrialization:raw_silver", "result": { - "count": 1, "id": "modern_industrialization:silver_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_blasting.json index 139d126a1..f2b2ed2d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:silver_tiny_dust" - }, + "ingredient": "modern_industrialization:silver_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_smelting.json index 12a01bf11..6832dfedf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:silver_tiny_dust" - }, + "ingredient": "modern_industrialization:silver_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:silver_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/ingot.json index dab86f2be..df4985f4d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/silver" + "ingredient": "#c:storage_blocks/silver" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:silver_ingot" + "id": "modern_industrialization:silver_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/nugget.json index 9b59d5faa..97feb12d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/silver" + "ingredient": "#c:ingots/silver" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:silver_nugget" + "id": "modern_industrialization:silver_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/raw_metal.json index 1922543f7..1ac5889a1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_silver" + "ingredient": "#c:storage_blocks/raw_silver" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_silver" + "id": "modern_industrialization:raw_silver" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/tiny_dust.json index 77aed15c2..ee20e90fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/silver" + "ingredient": "#c:dusts/silver" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:silver_tiny_dust" + "id": "modern_industrialization:silver_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/wiremill/wire.json index 11c00cda9..55a1e270b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/silver/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/silver/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/silver" + "ingredient": "#c:plates/silver" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:silver_wire" + "id": "modern_industrialization:silver_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/block_from_dust.json index 204e1b676..40ca019d3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/sodium" - }, - "y": { - "item": "modern_industrialization:sodium_dust" - } + "x": "#c:dusts/sodium", + "y": "modern_industrialization:sodium_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:sodium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_block.json index aeb3611fb..4d41c9d6e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:sodium_block" - } + "modern_industrialization:sodium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_tiny_dust.json index d03995167..4114cfe06 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/sodium" - }, - "y": { - "item": "modern_industrialization:sodium_tiny_dust" - } + "x": "#c:tiny_dusts/sodium", + "y": "modern_industrialization:sodium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:sodium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/tiny_dust_from_dust.json index 293b2aab9..25476f27a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:sodium_dust" - } + "modern_industrialization:sodium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/block.json index e03de3b4e..786f6d002 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/sodium" + "ingredient": "#c:dusts/sodium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:sodium_block" + "id": "modern_industrialization:sodium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/dust.json index 3c4119b92..c842dc1f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/sodium" + "ingredient": "#c:tiny_dusts/sodium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:sodium_dust" + "id": "modern_industrialization:sodium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/dust.json index 6a3da107d..645d008bc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/sodium" + "ingredient": "#c:storage_blocks/sodium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:sodium_dust" + "id": "modern_industrialization:sodium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/tiny_dust.json index f224e02df..e0e432be7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sodium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/sodium" + "ingredient": "#c:dusts/sodium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:sodium_tiny_dust" + "id": "modern_industrialization:sodium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/block_from_dust.json index 904643e67..bd06525b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/soldering_alloy" - }, - "y": { - "item": "modern_industrialization:soldering_alloy_dust" - } + "x": "#c:dusts/soldering_alloy", + "y": "modern_industrialization:soldering_alloy_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:soldering_alloy_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_block.json index 1857368c1..da63f00b8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:soldering_alloy_block" - } + "modern_industrialization:soldering_alloy_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_tiny_dust.json index cdc23daf7..27d9d4ddc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/soldering_alloy" - }, - "y": { - "item": "modern_industrialization:soldering_alloy_tiny_dust" - } + "x": "#c:tiny_dusts/soldering_alloy", + "y": "modern_industrialization:soldering_alloy_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:soldering_alloy_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/tiny_dust_from_dust.json index 9c10834ca..146cf6402 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:soldering_alloy_dust" - } + "modern_industrialization:soldering_alloy_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/block.json index 4d0ea2188..f840b7d22 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/soldering_alloy" + "ingredient": "#c:dusts/soldering_alloy" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:soldering_alloy_block" + "id": "modern_industrialization:soldering_alloy_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/dust.json index 5cf78141f..2a85ac01b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/soldering_alloy" + "ingredient": "#c:tiny_dusts/soldering_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:soldering_alloy_dust" + "id": "modern_industrialization:soldering_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/dust.json index eb4b73f5f..1e68f2e7e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/soldering_alloy" + "ingredient": "#c:storage_blocks/soldering_alloy" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:soldering_alloy_dust" + "id": "modern_industrialization:soldering_alloy_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/tiny_dust.json index 6c12becb1..a661f7ccf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/soldering_alloy/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/soldering_alloy" + "ingredient": "#c:dusts/soldering_alloy" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:soldering_alloy_tiny_dust" + "id": "modern_industrialization:soldering_alloy_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/barrel.json index 73f862574..5b7aa4f37 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/barrel.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:barrels/wooden" + "ingredient": "#c:barrels/wooden" }, { "amount": 8, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_barrel" + "id": "modern_industrialization:stainless_steel_barrel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/drill_head.json index 1f9df96ac..6b6dbff83 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" }, { "amount": 2, - "item": "modern_industrialization:stainless_steel_curved_plate" + "ingredient": "modern_industrialization:stainless_steel_curved_plate" }, { "amount": 1, - "tag": "c:rods/stainless_steel" + "ingredient": "#c:rods/stainless_steel" }, { "amount": 2, - "tag": "c:gears/stainless_steel" + "ingredient": "#c:gears/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_drill_head" + "id": "modern_industrialization:stainless_steel_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/gear.json index 1134b18aa..6cd8ed3d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_ring" + "ingredient": "modern_industrialization:stainless_steel_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_gear" + "id": "modern_industrialization:stainless_steel_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/rotor.json index 74499367f..3df17f287 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/rotor.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_blade" + "ingredient": "modern_industrialization:stainless_steel_blade" }, { "amount": 1, - "item": "modern_industrialization:stainless_steel_ring" + "ingredient": "modern_industrialization:stainless_steel_ring" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_rotor" + "id": "modern_industrialization:stainless_steel_rotor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/tank.json index 7cda77af1..6a8204c41 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/assembler/tank.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" }, { "amount": 1, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_tank" + "id": "modern_industrialization:stainless_steel_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/blast_furnace/dust.json index ef16ab3db..2ddb348da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/stainless_steel" + "ingredient": "#c:dusts/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_hot_ingot" + "id": "modern_industrialization:stainless_steel_hot_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/double_ingot.json index 4918f2744..d095ba59a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_double_ingot" + "ingredient": "modern_industrialization:stainless_steel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_plate" + "id": "modern_industrialization:stainless_steel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/main.json index fd585ab84..5b1a9b15d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/stainless_steel" + "ingredient": "#c:ingots/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_plate" + "id": "modern_industrialization:stainless_steel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/plate.json index eeb5ca6b1..5e934b5ba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_curved_plate" + "id": "modern_industrialization:stainless_steel_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/ring.json index a6f5c074d..59695832f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/stainless_steel" + "ingredient": "#c:rods/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_ring" + "id": "modern_industrialization:stainless_steel_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/barrel.json index 876884eec..1e430efe5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/barrel.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/stainless_steel" - }, - "b": { - "tag": "c:barrels/wooden" - } + "#": "#c:plates/stainless_steel", + "b": "#c:barrels/wooden" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_barrel" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/blade.json index 2bb5fd379..c917f129d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "tag": "c:rods/stainless_steel" - }, - "P": { - "item": "modern_industrialization:stainless_steel_curved_plate" - } + "I": "#c:rods/stainless_steel", + "P": "modern_industrialization:stainless_steel_curved_plate" }, "pattern": [ "P", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/block_from_ingot.json index 85bdf5c4d..c54051ffe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/stainless_steel" - }, - "y": { - "item": "modern_industrialization:stainless_steel_ingot" - } + "x": "#c:ingots/stainless_steel", + "y": "modern_industrialization:stainless_steel_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/drill_head.json index 7c70278fb..0b5ef420e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/stainless_steel" - }, - "R": { - "tag": "c:rods/stainless_steel" - }, - "b": { - "item": "modern_industrialization:stainless_steel_bolt" - }, - "c": { - "item": "modern_industrialization:stainless_steel_curved_plate" - }, - "p": { - "tag": "c:plates/stainless_steel" - } + "G": "#c:gears/stainless_steel", + "R": "#c:rods/stainless_steel", + "b": "modern_industrialization:stainless_steel_bolt", + "c": "modern_industrialization:stainless_steel_curved_plate", + "p": "#c:plates/stainless_steel" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/dust_from_tiny_dust.json index c196a188a..27aadc083 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/stainless_steel" - }, - "y": { - "item": "modern_industrialization:stainless_steel_tiny_dust" - } + "x": "#c:tiny_dusts/stainless_steel", + "y": "modern_industrialization:stainless_steel_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/gear.json index 175144de8..f94c9f618 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/stainless_steel" - }, - "R": { - "item": "modern_industrialization:stainless_steel_ring" - }, - "b": { - "item": "modern_industrialization:stainless_steel_bolt" - } + "P": "#c:plates/stainless_steel", + "R": "modern_industrialization:stainless_steel_ring", + "b": "modern_industrialization:stainless_steel_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_block.json index a0254ed3c..0f08727ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:stainless_steel_block" - } + "modern_industrialization:stainless_steel_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_nugget.json index 34b60b659..8e969e2ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/stainless_steel" - }, - "y": { - "item": "modern_industrialization:stainless_steel_nugget" - } + "x": "#c:nuggets/stainless_steel", + "y": "modern_industrialization:stainless_steel_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/large_plate.json index 9fcc69ec5..cd30eb8ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/stainless_steel" - } + "x": "#c:plates/stainless_steel" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/nugget_from_ingot.json index 012acb64e..df013cedf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:stainless_steel_ingot" - } + "modern_industrialization:stainless_steel_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ring.json index 0d3861a88..7592ac6c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/stainless_steel" - }, - "b": { - "item": "modern_industrialization:stainless_steel_bolt" - } + "R": "#c:rods/stainless_steel", + "b": "modern_industrialization:stainless_steel_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/rotor.json index f73d016bc..591f81571 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/rotor.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "B": { - "item": "modern_industrialization:stainless_steel_blade" - }, - "R": { - "item": "modern_industrialization:stainless_steel_ring" - }, - "b": { - "item": "modern_industrialization:stainless_steel_bolt" - } + "B": "modern_industrialization:stainless_steel_blade", + "R": "modern_industrialization:stainless_steel_ring", + "b": "modern_industrialization:stainless_steel_bolt" }, "pattern": [ "bBb", @@ -18,7 +12,6 @@ "bBb" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_rotor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tank.json index 58c124160..b4c30c80a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tank.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/stainless_steel" - }, - "G": { - "tag": "c:glass_blocks" - } + "#": "#c:plates/stainless_steel", + "G": "#c:glass_blocks" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_tank" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tiny_dust_from_dust.json index 08d2cf869..89d8ea1cd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:stainless_steel_dust" - } + "modern_industrialization:stainless_steel_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/double_ingot.json index 25d55c6a1..702d365a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_double_ingot" + "ingredient": "modern_industrialization:stainless_steel_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_rod" + "id": "modern_industrialization:stainless_steel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/main.json index 94f321620..258d903bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/stainless_steel" + "ingredient": "#c:ingots/stainless_steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_rod" + "id": "modern_industrialization:stainless_steel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/rod.json index f0a24f44d..4aac9b3fd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/stainless_steel" + "ingredient": "#c:rods/stainless_steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_bolt" + "id": "modern_industrialization:stainless_steel_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json index 634312f1b..6ade65dfa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_hot_ingot" + "ingredient": "modern_industrialization:stainless_steel_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_ingot" + "id": "modern_industrialization:stainless_steel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/blade.json index 58ac108db..8a353da84 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/blade.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_blade" + "ingredient": "modern_industrialization:stainless_steel_blade" } ], "item_outputs": [ { "amount": 5, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/bolt.json index a27b53106..eea3b7b08 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_bolt" + "ingredient": "modern_industrialization:stainless_steel_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/curved_plate.json index de0997f9e..3d04085b3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_curved_plate" + "ingredient": "modern_industrialization:stainless_steel_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/double_ingot.json index 017e41ee5..652403739 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_double_ingot" + "ingredient": "modern_industrialization:stainless_steel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/drill_head.json index bffef01ef..08c334f9f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_drill_head" + "ingredient": "modern_industrialization:stainless_steel_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/gear.json index 4b7afac0a..ea4313ddc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/stainless_steel" + "ingredient": "#c:gears/stainless_steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ingot.json index 339e755cf..18f5e3c6f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/stainless_steel" + "ingredient": "#c:ingots/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/large_plate.json index 2c4833f64..090822796 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_large_plate" + "ingredient": "modern_industrialization:stainless_steel_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/nugget.json index ada486cb4..7810a5da1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/stainless_steel" + "ingredient": "#c:nuggets/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/plate.json index 3d4f28cf4..30a1bd524 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ring.json index ee62d7f01..19d920a80 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_ring" + "ingredient": "modern_industrialization:stainless_steel_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rod.json index c70882ae3..3398120ea 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/stainless_steel" + "ingredient": "#c:rods/stainless_steel" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rotor.json index 484981de4..d20e4a87f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/macerator/rotor.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_rotor" + "ingredient": "modern_industrialization:stainless_steel_rotor" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/blade.json index f75cb761e..ec59a61c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:stainless_steel_curved_plate" + "ingredient": "modern_industrialization:stainless_steel_curved_plate" }, { "amount": 1, - "tag": "c:rods/stainless_steel" + "ingredient": "#c:rods/stainless_steel" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:stainless_steel_blade" + "id": "modern_industrialization:stainless_steel_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/block.json index 4e32882c3..720bdae3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/stainless_steel" + "ingredient": "#c:ingots/stainless_steel" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_block" + "id": "modern_industrialization:stainless_steel_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/double_ingot.json index 56f68acdf..9cad65e4f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/stainless_steel" + "ingredient": "#c:ingots/stainless_steel" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_double_ingot" + "id": "modern_industrialization:stainless_steel_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/dust.json index 416804c11..6acdafe9d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/stainless_steel" + "ingredient": "#c:tiny_dusts/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_dust" + "id": "modern_industrialization:stainless_steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/ingot.json index da9b3ef89..d8f1dd2b9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/stainless_steel" + "ingredient": "#c:nuggets/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_ingot" + "id": "modern_industrialization:stainless_steel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/large_plate.json index 85207655e..a08162c39 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/stainless_steel" + "ingredient": "#c:plates/stainless_steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_large_plate" + "id": "modern_industrialization:stainless_steel_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/smelting/rod_magnetic_to_rod_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/smelting/rod_magnetic_to_rod_smelting.json index 1e031d730..966e96641 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/smelting/rod_magnetic_to_rod_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/smelting/rod_magnetic_to_rod_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "modern_industrialization:stainless_steel_rod_magnetic" - }, + "ingredient": "modern_industrialization:stainless_steel_rod_magnetic", "result": { - "count": 1, "id": "modern_industrialization:stainless_steel_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/ingot.json index afc0ede24..64a08080d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/stainless_steel" + "ingredient": "#c:storage_blocks/stainless_steel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:stainless_steel_ingot" + "id": "modern_industrialization:stainless_steel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/nugget.json index 84da82ff1..2a4e8b646 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/stainless_steel" + "ingredient": "#c:ingots/stainless_steel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:stainless_steel_nugget" + "id": "modern_industrialization:stainless_steel_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/tiny_dust.json index 5b1f8a100..36f834cd5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/stainless_steel" + "ingredient": "#c:dusts/stainless_steel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:stainless_steel_tiny_dust" + "id": "modern_industrialization:stainless_steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/vacuum_freezer/hot_ingot.json index 0c02474b9..400e3ff68 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_hot_ingot" + "ingredient": "modern_industrialization:stainless_steel_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:stainless_steel_ingot" + "id": "modern_industrialization:stainless_steel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/barrel.json index 431715e11..1ec9c4c19 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/barrel.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:barrels/wooden" + "ingredient": "#c:barrels/wooden" }, { "amount": 8, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_barrel" + "id": "modern_industrialization:steel_barrel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/drill_head.json index c2c1869d1..e1bea738f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 2, - "item": "modern_industrialization:steel_curved_plate" + "ingredient": "modern_industrialization:steel_curved_plate" }, { "amount": 1, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" }, { "amount": 2, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_drill_head" + "id": "modern_industrialization:steel_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/gear.json index d391ab4ac..ac1b786af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 1, - "item": "modern_industrialization:steel_ring" + "ingredient": "modern_industrialization:steel_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_gear" + "id": "modern_industrialization:steel_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/tank.json index 9c9193a73..efaa3e2b1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/assembler/tank.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" }, { "amount": 1, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_tank" + "id": "modern_industrialization:steel_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/double_ingot.json index ce0ff05a3..c13cea0cf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_double_ingot" + "ingredient": "modern_industrialization:steel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_plate" + "id": "modern_industrialization:steel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/main.json index 59ecb48e4..e3876a45b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_plate" + "id": "modern_industrialization:steel_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/plate.json index b14871792..0bdbdad34 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_curved_plate" + "id": "modern_industrialization:steel_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/ring.json index a2b36a4ea..d3d40258a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_ring" + "id": "modern_industrialization:steel_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/barrel.json index 20f6b744a..72a91ce3a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/barrel.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/steel" - }, - "b": { - "tag": "c:barrels/wooden" - } + "#": "#c:plates/steel", + "b": "#c:barrels/wooden" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:steel_barrel" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/block_from_ingot.json index 6390d9754..2fc4efcf0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/steel" - }, - "y": { - "item": "modern_industrialization:steel_ingot" - } + "x": "#c:ingots/steel", + "y": "modern_industrialization:steel_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:steel_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/drill_head.json index 1277fed00..ac5cfaf80 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/steel" - }, - "R": { - "tag": "c:rods/steel" - }, - "b": { - "item": "modern_industrialization:steel_bolt" - }, - "c": { - "item": "modern_industrialization:steel_curved_plate" - }, - "p": { - "tag": "c:plates/steel" - } + "G": "#c:gears/steel", + "R": "#c:rods/steel", + "b": "modern_industrialization:steel_bolt", + "c": "modern_industrialization:steel_curved_plate", + "p": "#c:plates/steel" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:steel_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/dust_from_tiny_dust.json index e14f6eb30..d7b8588a3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/steel" - }, - "y": { - "item": "modern_industrialization:steel_tiny_dust" - } + "x": "#c:tiny_dusts/steel", + "y": "modern_industrialization:steel_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:steel_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/gear.json index 79c9ac336..446a0d52d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/steel" - }, - "R": { - "item": "modern_industrialization:steel_ring" - }, - "b": { - "item": "modern_industrialization:steel_bolt" - } + "P": "#c:plates/steel", + "R": "modern_industrialization:steel_ring", + "b": "modern_industrialization:steel_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:steel_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/hammer.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/hammer.json index 40c0aa7e9..c53b76b12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/hammer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/hammer.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "p": { - "item": "modern_industrialization:steel_large_plate" - }, - "s": { - "item": "minecraft:stick" - } + "p": "modern_industrialization:steel_large_plate", + "s": "minecraft:stick" }, "pattern": [ "ppp", @@ -15,7 +11,6 @@ " s " ], "result": { - "count": 1, "id": "modern_industrialization:steel_hammer" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_block.json index 12dfa22d2..ec054bc4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:steel_block" - } + "modern_industrialization:steel_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_nugget.json index 610aa19fb..8ca5e9781 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/steel" - }, - "y": { - "item": "modern_industrialization:steel_nugget" - } + "x": "#c:nuggets/steel", + "y": "modern_industrialization:steel_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/large_plate.json index 3f43a34a5..ad359f576 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/steel" - } + "x": "#c:plates/steel" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:steel_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/nugget_from_ingot.json index 705153722..0d857de24 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:steel_ingot" - } + "modern_industrialization:steel_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ring.json index 6bcc5a0e6..24621a5e1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/steel" - }, - "b": { - "item": "modern_industrialization:steel_bolt" - } + "R": "#c:rods/steel", + "b": "modern_industrialization:steel_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tank.json index 9cc7c2d5d..6319213b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tank.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/steel" - }, - "G": { - "tag": "c:glass_blocks" - } + "#": "#c:plates/steel", + "G": "#c:glass_blocks" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:steel_tank" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tiny_dust_from_dust.json index 3228067c7..352efd7ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:steel_dust" - } + "modern_industrialization:steel_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/double_ingot.json index 64dc736ca..1c971f939 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_double_ingot" + "ingredient": "modern_industrialization:steel_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:steel_rod" + "id": "modern_industrialization:steel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/main.json index 08afc0b2d..7fc0c0fee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_rod" + "id": "modern_industrialization:steel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/rod.json index bd4f45856..405e9dbcb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_bolt" + "id": "modern_industrialization:steel_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt.json index 944f45b93..4e1990bf6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 4, "id": "modern_industrialization:steel_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt_with_tool.json index d15e6c18a..fd2a99ffd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 8, "id": "modern_industrialization:steel_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate.json index 73784b0f9..edafc9620 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:steel_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate_with_tool.json index c8bec3a97..7b3a41d6e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_curved_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 2, "id": "modern_industrialization:steel_curved_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate.json index ac89a496a..1143e812c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:steel_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate_with_tool.json index 69df67e3d..4fcdd8597 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 2, "id": "modern_industrialization:steel_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring.json index e974d8718..a5eea2e05 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 2, "id": "modern_industrialization:steel_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring_with_tool.json index 3151a4166..cf4188826 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 4, "id": "modern_industrialization:steel_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod.json index 990b166a6..fdcf5f29f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 2, "id": "modern_industrialization:steel_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod_with_tool.json index dad86596d..edd411c01 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/double_ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:steel_double_ingot" - }, + "ingredient": "modern_industrialization:steel_double_ingot", "result": { "count": 4, "id": "modern_industrialization:steel_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt.json index 149207025..82ad66e5d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { "count": 2, "id": "modern_industrialization:steel_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt_with_tool.json index e60eb5093..85fdd6e76 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { "count": 4, "id": "modern_industrialization:steel_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate.json index 9702d4aac..367bb5bae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate_with_tool.json index fc9b164b2..d2b9c430d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 40, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_double_ingot.json index 7ad734254..4c8e2cd21 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_double_ingot.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_double_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_dust.json index b36152e9b..40e820784 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate.json index a1d0c0ec1..a6c343c8c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate_with_tool.json index a366a8d25..acb8de64a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring.json index d528a6ba7..70c9ff4c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring_with_tool.json index 94aa3df24..3c0100b72 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { "count": 2, "id": "modern_industrialization:steel_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod.json index d88236a30..360580ea8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod_with_tool.json index ce041c8b6..77c79d326 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/steel" - }, + "ingredient": "#c:ingots/steel", "result": { "count": 2, "id": "modern_industrialization:steel_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/nugget_to_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/nugget_to_tiny_dust.json index c2488e62d..2e0ac8640 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/nugget_to_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/nugget_to_tiny_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:nuggets/steel" - }, + "ingredient": "#c:nuggets/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_tiny_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/plate_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/plate_to_curved_plate_with_tool.json index 402bb940f..30c0a459e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/plate_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/plate_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:plates/steel" - }, + "ingredient": "#c:plates/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_bolt_with_tool.json index 3d67ecc16..abb4c8359 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/steel" - }, + "ingredient": "#c:rods/steel", "result": { "count": 2, "id": "modern_industrialization:steel_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_ring_with_tool.json index 19b1de646..95c8f1743 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/forge_hammer/rod_to_ring_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/steel" - }, + "ingredient": "#c:rods/steel", "result": { - "count": 1, "id": "modern_industrialization:steel_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/bolt.json index 378b55ff1..f1dc4175b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_bolt" + "ingredient": "modern_industrialization:steel_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/curved_plate.json index af3c5f8a9..da9de0d9a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_curved_plate" + "ingredient": "modern_industrialization:steel_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/double_ingot.json index 3f2b7c7c4..52b6e156b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_double_ingot" + "ingredient": "modern_industrialization:steel_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/drill_head.json index 53ada909e..deb6a0f54 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_drill_head" + "ingredient": "modern_industrialization:steel_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/gear.json index bef4108e7..c43ef5d7e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/steel" + "ingredient": "#c:gears/steel" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ingot.json index 2bf1b7938..2251840ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/large_plate.json index fdbf73136..d71eb861d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_large_plate" + "ingredient": "modern_industrialization:steel_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/nugget.json index 09443ef3e..29eaecfec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/steel" + "ingredient": "#c:nuggets/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/plate.json index 99f96b1d4..d956edbdb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ring.json index 34af3bb16..949862f40 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_ring" + "ingredient": "modern_industrialization:steel_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/rod.json index 010128aaa..d4144ea5c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/block.json index 723924c77..30920ee18 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_block" + "id": "modern_industrialization:steel_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/double_ingot.json index 43ef655ca..1df1fb24c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_double_ingot" + "id": "modern_industrialization:steel_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/dust.json index 768d9b835..bd815479b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/steel" + "ingredient": "#c:tiny_dusts/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_dust" + "id": "modern_industrialization:steel_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/ingot.json index e43e50ba5..1e6b991dc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/steel" + "ingredient": "#c:nuggets/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_ingot" + "id": "modern_industrialization:steel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/large_plate.json index 5b0948e2e..236632007 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/steel" + "ingredient": "#c:plates/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_large_plate" + "id": "modern_industrialization:steel_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/polarizer/rod_magnetic.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/polarizer/rod_magnetic.json index fa52632fc..ae5b46d6e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/polarizer/rod_magnetic.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/polarizer/rod_magnetic.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/steel" + "ingredient": "#c:rods/steel" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_rod_magnetic" + "id": "modern_industrialization:steel_rod_magnetic" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_blasting.json index 0ec6e7407..1cbe8d512 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:steel_dust" - }, + "ingredient": "modern_industrialization:steel_dust", "result": { - "count": 1, "id": "modern_industrialization:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_smelting.json index 3f2e031f8..ff851f3b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:steel_dust" - }, + "ingredient": "modern_industrialization:steel_dust", "result": { - "count": 1, "id": "modern_industrialization:steel_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/rod_magnetic_to_rod_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/rod_magnetic_to_rod_smelting.json index 54aa79c17..def296f54 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/rod_magnetic_to_rod_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/rod_magnetic_to_rod_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.0, - "ingredient": { - "item": "modern_industrialization:steel_rod_magnetic" - }, + "ingredient": "modern_industrialization:steel_rod_magnetic", "result": { - "count": 1, "id": "modern_industrialization:steel_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_blasting.json index 16ecfc089..07d0b63d6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:steel_tiny_dust" - }, + "ingredient": "modern_industrialization:steel_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_smelting.json index 492022e48..5cf1839b1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:steel_tiny_dust" - }, + "ingredient": "modern_industrialization:steel_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:steel_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/ingot.json index 49f03aec1..4dbb8f828 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/steel" + "ingredient": "#c:storage_blocks/steel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:steel_ingot" + "id": "modern_industrialization:steel_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/nugget.json index a25587357..0b9175fb0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/steel" + "ingredient": "#c:ingots/steel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:steel_nugget" + "id": "modern_industrialization:steel_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/tiny_dust.json index 5ef3fa4ab..e50768018 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/steel/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/steel" + "ingredient": "#c:dusts/steel" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:steel_tiny_dust" + "id": "modern_industrialization:steel_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/block_from_dust.json index f6c0750ed..46cc1ae6d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/sulfur" - }, - "y": { - "item": "modern_industrialization:sulfur_dust" - } + "x": "#c:dusts/sulfur", + "y": "modern_industrialization:sulfur_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:sulfur_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_block.json index 84aede53f..71f4730b7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:sulfur_block" - } + "modern_industrialization:sulfur_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_tiny_dust.json index 2c1b704aa..1b2f84479 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/sulfur" - }, - "y": { - "item": "modern_industrialization:sulfur_tiny_dust" - } + "x": "#c:tiny_dusts/sulfur", + "y": "modern_industrialization:sulfur_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:sulfur_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/tiny_dust_from_dust.json index 94bd8d58f..16089ff89 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:sulfur_dust" - } + "modern_industrialization:sulfur_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/block.json index 31202f40e..d4cc21f75 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/sulfur" + "ingredient": "#c:dusts/sulfur" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:sulfur_block" + "id": "modern_industrialization:sulfur_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/dust.json index 7ab74f953..3e997c2fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/sulfur" + "ingredient": "#c:tiny_dusts/sulfur" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:sulfur_dust" + "id": "modern_industrialization:sulfur_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/dust.json index 4f8128677..9de1b27dd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/sulfur" + "ingredient": "#c:storage_blocks/sulfur" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:sulfur_dust" + "id": "modern_industrialization:sulfur_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/tiny_dust.json index c89efb563..605e18c9f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/sulfur/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/sulfur" + "ingredient": "#c:dusts/sulfur" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:sulfur_tiny_dust" + "id": "modern_industrialization:sulfur_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/assembler/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/assembler/coil.json index 8a9718fd9..6420efcd6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/assembler/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/assembler/coil.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 8, - "item": "modern_industrialization:superconductor_cable" + "ingredient": "modern_industrialization:superconductor_cable" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_coil" + "id": "modern_industrialization:superconductor_coil" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/double_ingot.json index 07d0dfc82..ae664ee96 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_double_ingot" + "ingredient": "modern_industrialization:superconductor_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:superconductor_plate" + "id": "modern_industrialization:superconductor_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/main.json index ea883b6d7..e01835820 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/superconductor" + "ingredient": "#c:ingots/superconductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_plate" + "id": "modern_industrialization:superconductor_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/coil.json index 29bb7edf5..afadcf452 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/coil.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "item": "modern_industrialization:superconductor_cable" - } + "x": "modern_industrialization:superconductor_cable" }, "pattern": [ "xxx", @@ -12,7 +10,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_coil" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/dust_from_tiny_dust.json index 1e4cc4b4e..4fcb53e30 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/superconductor" - }, - "y": { - "item": "modern_industrialization:superconductor_tiny_dust" - } + "x": "#c:tiny_dusts/superconductor", + "y": "modern_industrialization:superconductor_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/ingot_from_nugget.json index 4ad8c9e20..f10e7a750 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/superconductor" - }, - "y": { - "item": "modern_industrialization:superconductor_nugget" - } + "x": "#c:nuggets/superconductor", + "y": "modern_industrialization:superconductor_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:superconductor_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/nugget_from_ingot.json index 7d2981f90..f629499a0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:superconductor_ingot" - } + "modern_industrialization:superconductor_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/tiny_dust_from_dust.json index 3c2d54dba..dd373e0d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:superconductor_dust" - } + "modern_industrialization:superconductor_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json index 0314fbd35..12f0346d9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_hot_ingot" + "ingredient": "modern_industrialization:superconductor_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_ingot" + "id": "modern_industrialization:superconductor_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/double_ingot.json index e852492f1..554549c12 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_double_ingot" + "ingredient": "modern_industrialization:superconductor_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:superconductor_dust" + "id": "modern_industrialization:superconductor_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/ingot.json index cdcc48e7c..58c9afa48 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/superconductor" + "ingredient": "#c:ingots/superconductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_dust" + "id": "modern_industrialization:superconductor_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/nugget.json index b42772cd2..bd75968b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/superconductor" + "ingredient": "#c:nuggets/superconductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_tiny_dust" + "id": "modern_industrialization:superconductor_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/plate.json index c88104cff..be1b58821 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/superconductor" + "ingredient": "#c:plates/superconductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_dust" + "id": "modern_industrialization:superconductor_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json index f97e97e91..e43b693b9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_wire" + "ingredient": "modern_industrialization:superconductor_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:superconductor_tiny_dust" + "id": "modern_industrialization:superconductor_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/double_ingot.json index 5cc361f49..27bb2235f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/superconductor" + "ingredient": "#c:ingots/superconductor" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_double_ingot" + "id": "modern_industrialization:superconductor_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/dust.json index 4722300ec..c37182b68 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/superconductor" + "ingredient": "#c:tiny_dusts/superconductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_dust" + "id": "modern_industrialization:superconductor_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/ingot.json index 9f497b4eb..9d3eb96d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/superconductor" + "ingredient": "#c:nuggets/superconductor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_ingot" + "id": "modern_industrialization:superconductor_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/coil.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/coil.json index fe5d3cc4f..5fe628a0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/coil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/coil.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_coil" + "ingredient": "modern_industrialization:superconductor_coil" } ], "item_outputs": [ { "amount": 8, - "item": "modern_industrialization:superconductor_cable" + "id": "modern_industrialization:superconductor_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/nugget.json index 43e826dc8..071d36d8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/superconductor" + "ingredient": "#c:ingots/superconductor" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:superconductor_nugget" + "id": "modern_industrialization:superconductor_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/tiny_dust.json index f3f35be6e..4292ae09f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/superconductor" + "ingredient": "#c:dusts/superconductor" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:superconductor_tiny_dust" + "id": "modern_industrialization:superconductor_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/vacuum_freezer/hot_ingot.json index b83c263c6..29346921d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_hot_ingot" + "ingredient": "modern_industrialization:superconductor_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:superconductor_ingot" + "id": "modern_industrialization:superconductor_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/wiremill/wire.json index b36d5ca2b..6cb829e13 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/superconductor" + "ingredient": "#c:plates/superconductor" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:superconductor_wire" + "id": "modern_industrialization:superconductor_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json index 55cd84ab4..5445ac3a8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_styrene_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 6, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "ingredient": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:tin_wire" + "ingredient": "modern_industrialization:tin_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:tin_cable" + "id": "modern_industrialization:tin_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json index 2fcdbaa08..94aeb3aca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/cable_synthetic_rubber.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 30, - "fluid": "modern_industrialization:synthetic_rubber" + "ingredient": "modern_industrialization:synthetic_rubber" } ], "item_inputs": [ { "amount": 3, - "item": "modern_industrialization:tin_wire" + "ingredient": "modern_industrialization:tin_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:tin_cable" + "id": "modern_industrialization:tin_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/gear.json index 78fa93988..28a237898 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/tin" + "ingredient": "#c:plates/tin" }, { "amount": 1, - "item": "modern_industrialization:tin_ring" + "ingredient": "modern_industrialization:tin_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_gear" + "id": "modern_industrialization:tin_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/rotor.json index 203c831e5..470178a17 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/assembler/rotor.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:tin_blade" + "ingredient": "modern_industrialization:tin_blade" }, { "amount": 1, - "item": "modern_industrialization:tin_ring" + "ingredient": "modern_industrialization:tin_ring" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_rotor" + "id": "modern_industrialization:tin_rotor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/double_ingot.json index fdc051fb6..20ffbb03c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_double_ingot" + "ingredient": "modern_industrialization:tin_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_plate" + "id": "modern_industrialization:tin_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/main.json index 5e8c98d99..46e75d4ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tin" + "ingredient": "#c:ingots/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_plate" + "id": "modern_industrialization:tin_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/plate.json index 173c02187..13bafa3fd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/tin" + "ingredient": "#c:plates/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_curved_plate" + "id": "modern_industrialization:tin_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/ring.json index 383244c78..a469c4dca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/tin" + "ingredient": "#c:rods/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_ring" + "id": "modern_industrialization:tin_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/blade.json index 5ed755d11..5da8a5e95 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "tag": "c:rods/tin" - }, - "P": { - "item": "modern_industrialization:tin_curved_plate" - } + "I": "#c:rods/tin", + "P": "modern_industrialization:tin_curved_plate" }, "pattern": [ "P", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/block_from_ingot.json index d547dcd51..4dbb1351d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/tin" - }, - "y": { - "item": "modern_industrialization:tin_ingot" - } + "x": "#c:ingots/tin", + "y": "modern_industrialization:tin_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:tin_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json index d771d6e53..755e22b6b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/cable.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "r": { - "item": "modern_industrialization:rubber_sheet" - }, - "w": { - "item": "modern_industrialization:tin_wire" - } + "r": "modern_industrialization:rubber_sheet", + "w": "modern_industrialization:tin_wire" }, "pattern": [ "rrr", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/deepslate_to_ore.json index 2bdeae7de..2cd8c652f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_tin_ore" - } + "modern_industrialization:deepslate_tin_ore" ], "result": { - "count": 1, "id": "modern_industrialization:tin_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/dust_from_tiny_dust.json index 7c0065cf6..afd85bbf1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/tin" - }, - "y": { - "item": "modern_industrialization:tin_tiny_dust" - } + "x": "#c:tiny_dusts/tin", + "y": "modern_industrialization:tin_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:tin_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/gear.json index f65fdfc21..8e6e2737f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/tin" - }, - "R": { - "item": "modern_industrialization:tin_ring" - }, - "b": { - "item": "modern_industrialization:tin_bolt" - } + "P": "#c:plates/tin", + "R": "modern_industrialization:tin_ring", + "b": "modern_industrialization:tin_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:tin_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_block.json index 629ce1052..347aeb3b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:tin_block" - } + "modern_industrialization:tin_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_nugget.json index 57209e38d..7a745144c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/tin" - }, - "y": { - "item": "modern_industrialization:tin_nugget" - } + "x": "#c:nuggets/tin", + "y": "modern_industrialization:tin_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/nugget_from_ingot.json index afc42f0de..1beb1b76c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:tin_ingot" - } + "modern_industrialization:tin_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_block_from_raw_metal.json index f2d0ec2b5..4bbd45479 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/tin" - }, - "y": { - "item": "modern_industrialization:raw_tin" - } + "x": "#c:raw_materials/tin", + "y": "modern_industrialization:raw_tin" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_tin_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_from_raw_metal_block.json index 24cf1d8dc..fdcdec3bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_tin_block" - } + "modern_industrialization:raw_tin_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ring.json index 1dc79b11f..34849b04b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/tin" - }, - "b": { - "item": "modern_industrialization:tin_bolt" - } + "R": "#c:rods/tin", + "b": "modern_industrialization:tin_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/rotor.json index 13a533b2d..b01c5bc4a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/rotor.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "B": { - "item": "modern_industrialization:tin_blade" - }, - "R": { - "item": "modern_industrialization:tin_ring" - }, - "b": { - "item": "modern_industrialization:tin_bolt" - } + "B": "modern_industrialization:tin_blade", + "R": "modern_industrialization:tin_ring", + "b": "modern_industrialization:tin_bolt" }, "pattern": [ "bBb", @@ -18,7 +12,6 @@ "bBb" ], "result": { - "count": 1, "id": "modern_industrialization:tin_rotor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/tiny_dust_from_dust.json index 780cb3296..07cc419c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:tin_dust" - } + "modern_industrialization:tin_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/double_ingot.json index 83812bea9..d7e2214ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_double_ingot" + "ingredient": "modern_industrialization:tin_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:tin_rod" + "id": "modern_industrialization:tin_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/main.json index 4982b7b95..b7b3f89a7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tin" + "ingredient": "#c:ingots/tin" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_rod" + "id": "modern_industrialization:tin_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/rod.json index 3fe32270d..efb83cdb6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/tin" + "ingredient": "#c:rods/tin" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_bolt" + "id": "modern_industrialization:tin_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt.json index 431812b26..687f921f1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 4, "id": "modern_industrialization:tin_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt_with_tool.json index 4304082c8..c13eb91cc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 8, "id": "modern_industrialization:tin_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate.json index 7ddbb71c7..b3cd1abdc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:tin_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate_with_tool.json index 74b61729b..e5e8a0d1f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_curved_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 2, "id": "modern_industrialization:tin_curved_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate.json index 8888b4294..52b5b29e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { - "count": 1, "id": "modern_industrialization:tin_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate_with_tool.json index a1c73f5d5..bc8a5fd94 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_plate_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 2, "id": "modern_industrialization:tin_plate" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring.json index 46acf06a8..c2c0c260a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 2, "id": "modern_industrialization:tin_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring_with_tool.json index ed3bb8647..c44dcbb54 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 100, - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 4, "id": "modern_industrialization:tin_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod.json index 339a870ba..0412f4d15 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 2, "id": "modern_industrialization:tin_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod_with_tool.json index 5cf3e0f45..b0705c4b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/double_ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "item": "modern_industrialization:tin_double_ingot" - }, + "ingredient": "modern_industrialization:tin_double_ingot", "result": { "count": 4, "id": "modern_industrialization:tin_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt.json index 997fb333b..3c893ca9d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { "count": 2, "id": "modern_industrialization:tin_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt_with_tool.json index 8f7a66869..5aec6d31a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { "count": 4, "id": "modern_industrialization:tin_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate.json index b239d8010..30270083a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate_with_tool.json index 697a53a12..0f1611ee9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 40, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_double_ingot.json index f332e6f0a..064e81f0f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_double_ingot.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_double_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_dust.json index 5f36e1a16..be5469b57 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate.json index f722366a5..a5db1e406 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "count": 2, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate_with_tool.json index 6bbf32584..b6bd10b3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring.json index 0b66a0084..43052bf5a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring_with_tool.json index 63dd4db0b..65ba94780 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_ring_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 60, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { "count": 2, "id": "modern_industrialization:tin_ring" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod.json index 93c8138b1..0d681aec0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_rod" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod_with_tool.json index c254d7849..bd3b1368d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ingot_to_rod_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ingots/tin" - }, + "ingredient": "#c:ingots/tin", "result": { "count": 2, "id": "modern_industrialization:tin_rod" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/nugget_to_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/nugget_to_tiny_dust.json index 7983b6156..8931cecb7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/nugget_to_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/nugget_to_tiny_dust.json @@ -1,10 +1,7 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:nuggets/tin" - }, + "ingredient": "#c:nuggets/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_tiny_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_dust_with_tool.json index 4d3b42763..8731e8fc6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_dust_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 50, - "ingredient": { - "tag": "c:ores/tin" - }, + "ingredient": "#c:ores/tin", "result": { "count": 4, "id": "modern_industrialization:tin_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal.json index 7857fe6bd..43148a0c4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal.json @@ -1,8 +1,6 @@ { "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ores/tin" - }, + "ingredient": "#c:ores/tin", "result": { "count": 2, "id": "modern_industrialization:raw_tin" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal_with_tool.json index c43cb6d6b..4cc140112 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/ore_to_raw_metal_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:ores/tin" - }, + "ingredient": "#c:ores/tin", "result": { "count": 3, "id": "modern_industrialization:raw_tin" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/plate_to_curved_plate_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/plate_to_curved_plate_with_tool.json index 83fd0f9c4..febe3a428 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/plate_to_curved_plate_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/plate_to_curved_plate_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:plates/tin" - }, + "ingredient": "#c:plates/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_curved_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/raw_metal_to_dust_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/raw_metal_to_dust_with_tool.json index c9aaf8c65..9379b805d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/raw_metal_to_dust_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/raw_metal_to_dust_with_tool.json @@ -2,9 +2,7 @@ "type": "modern_industrialization:forge_hammer", "count": 3, "damage": 30, - "ingredient": { - "tag": "c:raw_materials/tin" - }, + "ingredient": "#c:raw_materials/tin", "result": { "count": 4, "id": "modern_industrialization:tin_dust" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_bolt_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_bolt_with_tool.json index f72398b06..21ef8de5f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_bolt_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_bolt_with_tool.json @@ -1,9 +1,7 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/tin" - }, + "ingredient": "#c:rods/tin", "result": { "count": 2, "id": "modern_industrialization:tin_bolt" diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_ring_with_tool.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_ring_with_tool.json index 4d0b56377..84ea8f3ba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_ring_with_tool.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/forge_hammer/rod_to_ring_with_tool.json @@ -1,11 +1,8 @@ { "type": "modern_industrialization:forge_hammer", "damage": 20, - "ingredient": { - "tag": "c:rods/tin" - }, + "ingredient": "#c:rods/tin", "result": { - "count": 1, "id": "modern_industrialization:tin_ring" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/blade.json index 157138786..c32e0d67c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/blade.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_blade" + "ingredient": "modern_industrialization:tin_blade" } ], "item_outputs": [ { "amount": 5, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/bolt.json index a5364b71e..975e6bd4a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_bolt" + "ingredient": "modern_industrialization:tin_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/curved_plate.json index 0620d72c8..026fe7887 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_curved_plate" + "ingredient": "modern_industrialization:tin_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/double_ingot.json index ddab866d6..745ac623e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_double_ingot" + "ingredient": "modern_industrialization:tin_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/gear.json index f857c2977..f18cc2e3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/tin" + "ingredient": "#c:gears/tin" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ingot.json index b8efc9901..dc011b38a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tin" + "ingredient": "#c:ingots/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/nugget.json index 10f789891..4816ee51a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/tin" + "ingredient": "#c:nuggets/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ore_to_raw.json index 9455f4d93..c41387e59 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/tin" + "ingredient": "#c:ores/tin" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_tin" + "id": "modern_industrialization:raw_tin" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/plate.json index cf823e0ae..2b5e259aa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/tin" + "ingredient": "#c:plates/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/raw_metal.json index a457c4a42..84f304d3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/tin" + "ingredient": "#c:raw_materials/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" }, { "amount": 1, - "item": "modern_industrialization:tin_dust", + "id": "modern_industrialization:tin_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ring.json index d3334fd7a..11aa51a8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_ring" + "ingredient": "modern_industrialization:tin_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rod.json index 26893b31d..58e948fd7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/tin" + "ingredient": "#c:rods/tin" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rotor.json index 3b2da4a91..aecb2439d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/rotor.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_rotor" + "ingredient": "modern_industrialization:tin_rotor" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json index 85b761a38..adf8f4296 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/macerator/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tin_wire" + "ingredient": "modern_industrialization:tin_wire" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/blade.json index 17155ab6f..721860f3c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:tin_curved_plate" + "ingredient": "modern_industrialization:tin_curved_plate" }, { "amount": 1, - "tag": "c:rods/tin" + "ingredient": "#c:rods/tin" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:tin_blade" + "id": "modern_industrialization:tin_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/block.json index 68bd646b0..401f4acc8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/tin" + "ingredient": "#c:ingots/tin" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_block" + "id": "modern_industrialization:tin_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json index 2b16632c4..618db271e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/cable.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 6, - "item": "modern_industrialization:rubber_sheet" + "ingredient": "modern_industrialization:rubber_sheet" }, { "amount": 3, - "item": "modern_industrialization:tin_wire" + "ingredient": "modern_industrialization:tin_wire" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:tin_cable" + "id": "modern_industrialization:tin_cable" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/double_ingot.json index 1396006a0..242728176 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/tin" + "ingredient": "#c:ingots/tin" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_double_ingot" + "id": "modern_industrialization:tin_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/dust.json index 0958fef51..bc7afbd75 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/tin" + "ingredient": "#c:tiny_dusts/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_dust" + "id": "modern_industrialization:tin_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/ingot.json index 24ca0ec5b..d99fadfb4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/tin" + "ingredient": "#c:nuggets/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tin_ingot" + "id": "modern_industrialization:tin_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/raw_metal_block.json index 3ea395d96..142938b70 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/tin" + "ingredient": "#c:raw_materials/tin" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_tin_block" + "id": "modern_industrialization:raw_tin_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_blasting.json index 118d461cb..15daf6239 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:tin_dust" - }, + "ingredient": "modern_industrialization:tin_dust", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_smelting.json index 561186cf1..baff9919e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/dust_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:tin_dust" - }, + "ingredient": "modern_industrialization:tin_dust", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_blasting.json index b049b6e5d..afbea9e82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_tin_ore" - }, + "ingredient": "modern_industrialization:deepslate_tin_ore", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_smelting.json index 4288ac6cc..3675754b5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_deepslate_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_tin_ore" - }, + "ingredient": "modern_industrialization:deepslate_tin_ore", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_blasting.json index 336f87145..7554a0371 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:tin_ore" - }, + "ingredient": "modern_industrialization:tin_ore", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_smelting.json index 4836fb055..4fb834039 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/ore_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:tin_ore" - }, + "ingredient": "modern_industrialization:tin_ore", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_blasting.json index d8903e1a9..1c3aabdbe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_tin" - }, + "ingredient": "modern_industrialization:raw_tin", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_smelting.json index f28ed280a..4496cc9f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/raw_metal_to_ingot_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:raw_tin" - }, + "ingredient": "modern_industrialization:raw_tin", "result": { - "count": 1, "id": "modern_industrialization:tin_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_blasting.json index 9b1a6d143..ec2598333 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_blasting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_blasting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 100, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:tin_tiny_dust" - }, + "ingredient": "modern_industrialization:tin_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_smelting.json index 3d0c6ad74..53a7f6f27 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_smelting.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/smelting/tiny_dust_to_nugget_smelting.json @@ -3,11 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.08, - "ingredient": { - "item": "modern_industrialization:tin_tiny_dust" - }, + "ingredient": "modern_industrialization:tin_tiny_dust", "result": { - "count": 1, "id": "modern_industrialization:tin_nugget" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/ingot.json index 13d7f22ef..78f45b70f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/tin" + "ingredient": "#c:storage_blocks/tin" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:tin_ingot" + "id": "modern_industrialization:tin_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/nugget.json index 7308a9626..cd77e3243 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tin" + "ingredient": "#c:ingots/tin" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:tin_nugget" + "id": "modern_industrialization:tin_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/raw_metal.json index df3947335..36140b7a6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_tin" + "ingredient": "#c:storage_blocks/raw_tin" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_tin" + "id": "modern_industrialization:raw_tin" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/tiny_dust.json index fc352f06c..ee59fbb54 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/tin" + "ingredient": "#c:dusts/tin" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:tin_tiny_dust" + "id": "modern_industrialization:tin_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/wiremill/wire.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/wiremill/wire.json index 0754da1e2..37a93e608 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tin/wiremill/wire.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tin/wiremill/wire.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/tin" + "ingredient": "#c:plates/tin" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tin_wire" + "id": "modern_industrialization:tin_wire" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/barrel.json index 55822bacf..292bda7ab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/barrel.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:barrels/wooden" + "ingredient": "#c:barrels/wooden" }, { "amount": 8, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_barrel" + "id": "modern_industrialization:titanium_barrel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/drill_head.json index 6766a6bb2..1729a0462 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/drill_head.json @@ -5,31 +5,31 @@ "fluid_inputs": [ { "amount": 75, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 1, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" }, { "amount": 2, - "item": "modern_industrialization:titanium_curved_plate" + "ingredient": "modern_industrialization:titanium_curved_plate" }, { "amount": 1, - "tag": "c:rods/titanium" + "ingredient": "#c:rods/titanium" }, { "amount": 2, - "tag": "c:gears/titanium" + "ingredient": "#c:gears/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_drill_head" + "id": "modern_industrialization:titanium_drill_head" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/gear.json index 875b7d830..47e655dd4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/gear.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" }, { "amount": 1, - "item": "modern_industrialization:titanium_ring" + "ingredient": "modern_industrialization:titanium_ring" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_gear" + "id": "modern_industrialization:titanium_gear" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/rotor.json index 4150b4cff..da1947584 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/rotor.json @@ -5,23 +5,23 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" } ], "item_inputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_blade" + "ingredient": "modern_industrialization:titanium_blade" }, { "amount": 1, - "item": "modern_industrialization:titanium_ring" + "ingredient": "modern_industrialization:titanium_ring" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_rotor" + "id": "modern_industrialization:titanium_rotor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/tank.json index 64d131960..661906d97 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/assembler/tank.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 8, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" }, { "amount": 1, - "tag": "c:glass_blocks" + "ingredient": "#c:glass_blocks" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_tank" + "id": "modern_industrialization:titanium_tank" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/blast_furnace/dust.json index 1b6247535..8973b26a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/titanium" + "ingredient": "#c:dusts/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_hot_ingot" + "id": "modern_industrialization:titanium_hot_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/double_ingot.json index ae0b90f65..3bffa235a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_double_ingot" + "ingredient": "modern_industrialization:titanium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_plate" + "id": "modern_industrialization:titanium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/main.json index 56373d391..ff1ef2292 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/titanium" + "ingredient": "#c:ingots/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_plate" + "id": "modern_industrialization:titanium_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/plate.json index 9ca5617be..cafac239a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_curved_plate" + "id": "modern_industrialization:titanium_curved_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/ring.json index a25f3ccc2..2574a5e48 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/compressor/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/titanium" + "ingredient": "#c:rods/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_ring" + "id": "modern_industrialization:titanium_ring" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/barrel.json index 588b1727d..4955424c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/barrel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/barrel.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/titanium" - }, - "b": { - "tag": "c:barrels/wooden" - } + "#": "#c:plates/titanium", + "b": "#c:barrels/wooden" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_barrel" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/blade.json index 29797616e..775ede807 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/blade.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "tag": "c:rods/titanium" - }, - "P": { - "item": "modern_industrialization:titanium_curved_plate" - } + "I": "#c:rods/titanium", + "P": "modern_industrialization:titanium_curved_plate" }, "pattern": [ "P", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/block_from_ingot.json index 928cd3bbe..f0f16210e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/titanium" - }, - "y": { - "item": "modern_industrialization:titanium_ingot" - } + "x": "#c:ingots/titanium", + "y": "modern_industrialization:titanium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/drill_head.json index ac9874aa5..ad9fcd2ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/drill_head.json @@ -2,21 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "G": { - "tag": "c:gears/titanium" - }, - "R": { - "tag": "c:rods/titanium" - }, - "b": { - "item": "modern_industrialization:titanium_bolt" - }, - "c": { - "item": "modern_industrialization:titanium_curved_plate" - }, - "p": { - "tag": "c:plates/titanium" - } + "G": "#c:gears/titanium", + "R": "#c:rods/titanium", + "b": "modern_industrialization:titanium_bolt", + "c": "modern_industrialization:titanium_curved_plate", + "p": "#c:plates/titanium" }, "pattern": [ "bcp", @@ -24,7 +14,6 @@ "bGb" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_drill_head" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/dust_from_tiny_dust.json index a31e44869..2d4008166 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/titanium" - }, - "y": { - "item": "modern_industrialization:titanium_tiny_dust" - } + "x": "#c:tiny_dusts/titanium", + "y": "modern_industrialization:titanium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/gear.json index e2f735c59..2539c1b37 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/gear.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "P": { - "tag": "c:plates/titanium" - }, - "R": { - "item": "modern_industrialization:titanium_ring" - }, - "b": { - "item": "modern_industrialization:titanium_bolt" - } + "P": "#c:plates/titanium", + "R": "modern_industrialization:titanium_ring", + "b": "modern_industrialization:titanium_bolt" }, "pattern": [ "PbP", @@ -18,7 +12,6 @@ "PbP" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_gear" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_block.json index 2c67dfb88..8aefd41d0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:titanium_block" - } + "modern_industrialization:titanium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_nugget.json index bd26fc7e3..6d23ea850 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/titanium" - }, - "y": { - "item": "modern_industrialization:titanium_nugget" - } + "x": "#c:nuggets/titanium", + "y": "modern_industrialization:titanium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/large_plate.json index 1f0cad337..8b2fa6fcd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/titanium" - } + "x": "#c:plates/titanium" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/nugget_from_ingot.json index a26f6bced..31f2148af 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:titanium_ingot" - } + "modern_industrialization:titanium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_block_from_raw_metal.json index e227b128c..e046d7b97 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/titanium" - }, - "y": { - "item": "modern_industrialization:raw_titanium" - } + "x": "#c:raw_materials/titanium", + "y": "modern_industrialization:raw_titanium" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_titanium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_from_raw_metal_block.json index b2222aab5..1190efe7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_titanium_block" - } + "modern_industrialization:raw_titanium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ring.json index f8582f0e6..9842255ec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/ring.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "R": { - "tag": "c:rods/titanium" - }, - "b": { - "item": "modern_industrialization:titanium_bolt" - } + "R": "#c:rods/titanium", + "b": "modern_industrialization:titanium_bolt" }, "pattern": [ "bRb", diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/rotor.json index da4a921c0..f3cbc5690 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/rotor.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "B": { - "item": "modern_industrialization:titanium_blade" - }, - "R": { - "item": "modern_industrialization:titanium_ring" - }, - "b": { - "item": "modern_industrialization:titanium_bolt" - } + "B": "modern_industrialization:titanium_blade", + "R": "modern_industrialization:titanium_ring", + "b": "modern_industrialization:titanium_bolt" }, "pattern": [ "bBb", @@ -18,7 +12,6 @@ "bBb" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_rotor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tank.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tank.json index d4959d679..af9ebd3ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tank.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tank.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "tag": "c:plates/titanium" - }, - "G": { - "tag": "c:glass_blocks" - } + "#": "#c:plates/titanium", + "G": "#c:glass_blocks" }, "pattern": [ "###", @@ -15,7 +11,6 @@ "###" ], "result": { - "count": 1, "id": "modern_industrialization:titanium_tank" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tiny_dust_from_dust.json index 286cfac4f..435764a7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:titanium_dust" - } + "modern_industrialization:titanium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/double_ingot.json index 327c644aa..21408358e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/double_ingot.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_double_ingot" + "ingredient": "modern_industrialization:titanium_double_ingot" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_rod" + "id": "modern_industrialization:titanium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/main.json index 64fc80288..8b7a93e76 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/titanium" + "ingredient": "#c:ingots/titanium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_rod" + "id": "modern_industrialization:titanium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/rod.json index 3324cc18b..1d094dfbd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/cutting_machine/rod.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:rods/titanium" + "ingredient": "#c:rods/titanium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_bolt" + "id": "modern_industrialization:titanium_bolt" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json index 8aaa8b22c..3bfdb595d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 20, - "fluid": "modern_industrialization:cryofluid" + "ingredient": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { "amount": 13, - "fluid": "modern_industrialization:argon" + "id": "modern_industrialization:argon" }, { "amount": 5, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_hot_ingot" + "ingredient": "modern_industrialization:titanium_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_ingot" + "id": "modern_industrialization:titanium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/blade.json index bcc4925a4..f29626406 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/blade.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_blade" + "ingredient": "modern_industrialization:titanium_blade" } ], "item_outputs": [ { "amount": 5, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/bolt.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/bolt.json index aa877828d..d08d0114a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/bolt.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/bolt.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_bolt" + "ingredient": "modern_industrialization:titanium_bolt" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/curved_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/curved_plate.json index 7742a0c45..a03d42703 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/curved_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/curved_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_curved_plate" + "ingredient": "modern_industrialization:titanium_curved_plate" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/double_ingot.json index 3a8583f34..b974c6c7a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_double_ingot" + "ingredient": "modern_industrialization:titanium_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/drill_head.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/drill_head.json index f687ba050..979e078fe 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/drill_head.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/drill_head.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_drill_head" + "ingredient": "modern_industrialization:titanium_drill_head" } ], "item_outputs": [ { "amount": 64, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" }, { "amount": 3, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/gear.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/gear.json index 521f96d43..a3e7c80d2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/gear.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/gear.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:gears/titanium" + "ingredient": "#c:gears/titanium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ingot.json index 38993f669..d24c17f52 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/titanium" + "ingredient": "#c:ingots/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/large_plate.json index 36b5168ed..b559fa56e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_large_plate" + "ingredient": "modern_industrialization:titanium_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/nugget.json index cde08d291..c0c610d21 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/titanium" + "ingredient": "#c:nuggets/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ore_to_raw.json index 9f159f1e8..163811d3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/titanium" + "ingredient": "#c:ores/titanium" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_titanium" + "id": "modern_industrialization:raw_titanium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/plate.json index 85f2e1bbd..db14ecb3a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ring.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ring.json index a19f00d15..fadde13ab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ring.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/ring.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_ring" + "ingredient": "modern_industrialization:titanium_ring" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rod.json index d9d5e04dc..e8f9ae3f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/titanium" + "ingredient": "#c:rods/titanium" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rotor.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rotor.json index 0e818a15a..f7af1d4ed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rotor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/macerator/rotor.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_rotor" + "ingredient": "modern_industrialization:titanium_rotor" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/blade.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/blade.json index 4e7e51848..856f192e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/blade.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/blade.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:titanium_curved_plate" + "ingredient": "modern_industrialization:titanium_curved_plate" }, { "amount": 1, - "tag": "c:rods/titanium" + "ingredient": "#c:rods/titanium" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:titanium_blade" + "id": "modern_industrialization:titanium_blade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/block.json index 1e7d7fb06..8856b8b99 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/titanium" + "ingredient": "#c:ingots/titanium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_block" + "id": "modern_industrialization:titanium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/double_ingot.json index f79fb99d8..ebeca65e5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/titanium" + "ingredient": "#c:ingots/titanium" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_double_ingot" + "id": "modern_industrialization:titanium_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/dust.json index 0d231b687..f160fdccc 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/titanium" + "ingredient": "#c:tiny_dusts/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_dust" + "id": "modern_industrialization:titanium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/ingot.json index 857c69761..24d4d4926 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/titanium" + "ingredient": "#c:nuggets/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_ingot" + "id": "modern_industrialization:titanium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/large_plate.json index 644060418..c825f5d47 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/titanium" + "ingredient": "#c:plates/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_large_plate" + "id": "modern_industrialization:titanium_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/raw_metal_block.json index 828590f3e..f2eccfd38 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/titanium" + "ingredient": "#c:raw_materials/titanium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_titanium_block" + "id": "modern_industrialization:raw_titanium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/ingot.json index 1597e8b42..47efba530 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/titanium" + "ingredient": "#c:storage_blocks/titanium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:titanium_ingot" + "id": "modern_industrialization:titanium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/nugget.json index 2c433ce97..f3e6173c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/titanium" + "ingredient": "#c:ingots/titanium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:titanium_nugget" + "id": "modern_industrialization:titanium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/raw_metal.json index 52254ad87..c94a9fe16 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_titanium" + "ingredient": "#c:storage_blocks/raw_titanium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_titanium" + "id": "modern_industrialization:raw_titanium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/tiny_dust.json index 315440706..b76c99e95 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/titanium" + "ingredient": "#c:dusts/titanium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:titanium_tiny_dust" + "id": "modern_industrialization:titanium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/vacuum_freezer/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/vacuum_freezer/hot_ingot.json index 62a07d627..05bd0fb32 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/vacuum_freezer/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/vacuum_freezer/hot_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_hot_ingot" + "ingredient": "modern_industrialization:titanium_hot_ingot" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:titanium_ingot" + "id": "modern_industrialization:titanium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/double_ingot.json index 464bbcb0e..3dfe08e4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_double_ingot" + "ingredient": "modern_industrialization:tungsten_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tungsten_plate" + "id": "modern_industrialization:tungsten_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/main.json index 7b0397a93..d41375e66 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/compressor/main.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tungsten" + "ingredient": "#c:ingots/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_plate" + "id": "modern_industrialization:tungsten_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/block_from_ingot.json index e0142a4d4..7733b1aa9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/tungsten" - }, - "y": { - "item": "modern_industrialization:tungsten_ingot" - } + "x": "#c:ingots/tungsten", + "y": "modern_industrialization:tungsten_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:tungsten_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/deepslate_to_ore.json index 826feb8ca..188c237c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_tungsten_ore" - } + "modern_industrialization:deepslate_tungsten_ore" ], "result": { - "count": 1, "id": "modern_industrialization:tungsten_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/dust_from_tiny_dust.json index b2e3ea92d..02a10c238 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/tungsten" - }, - "y": { - "item": "modern_industrialization:tungsten_tiny_dust" - } + "x": "#c:tiny_dusts/tungsten", + "y": "modern_industrialization:tungsten_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:tungsten_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_block.json index 04e727736..1bfd5b3c0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:tungsten_block" - } + "modern_industrialization:tungsten_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_nugget.json index 8f7cf70f0..9dfa0b38b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/tungsten" - }, - "y": { - "item": "modern_industrialization:tungsten_nugget" - } + "x": "#c:nuggets/tungsten", + "y": "modern_industrialization:tungsten_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:tungsten_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/large_plate.json index ab4398906..347ebb967 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/large_plate.json @@ -2,16 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:plates/tungsten" - } + "x": "#c:plates/tungsten" }, "pattern": [ "xx", "xx" ], "result": { - "count": 1, "id": "modern_industrialization:tungsten_large_plate" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/nugget_from_ingot.json index 17249797e..c56af3496 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:tungsten_ingot" - } + "modern_industrialization:tungsten_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_block_from_raw_metal.json index a8f8c60cf..ae1dce55b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/tungsten" - }, - "y": { - "item": "modern_industrialization:raw_tungsten" - } + "x": "#c:raw_materials/tungsten", + "y": "modern_industrialization:raw_tungsten" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_tungsten_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_from_raw_metal_block.json index e79b917d9..68fff76d2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_tungsten_block" - } + "modern_industrialization:raw_tungsten_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/tiny_dust_from_dust.json index 3f613e53f..bf3ea3111 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:tungsten_dust" - } + "modern_industrialization:tungsten_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/double_ingot.json index 471d33507..f620b5774 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/double_ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_double_ingot" + "ingredient": "modern_industrialization:tungsten_double_ingot" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:tungsten_dust" + "id": "modern_industrialization:tungsten_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ingot.json index b16d5bead..6a315efb9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tungsten" + "ingredient": "#c:ingots/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_dust" + "id": "modern_industrialization:tungsten_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/large_plate.json index 5443e08a8..c2238f038 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_large_plate" + "ingredient": "modern_industrialization:tungsten_large_plate" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:tungsten_dust" + "id": "modern_industrialization:tungsten_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/nugget.json index a9ae9600d..ae069f8b6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/tungsten" + "ingredient": "#c:nuggets/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_tiny_dust" + "id": "modern_industrialization:tungsten_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ore_to_raw.json index 8c13b5b55..a143491eb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/tungsten" + "ingredient": "#c:ores/tungsten" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_tungsten" + "id": "modern_industrialization:raw_tungsten" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/plate.json index a7c1da7e5..f0d65f83d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:plates/tungsten" + "ingredient": "#c:plates/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_dust" + "id": "modern_industrialization:tungsten_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/raw_metal.json index bed50b946..24e30c115 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/tungsten" + "ingredient": "#c:raw_materials/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_dust" + "id": "modern_industrialization:tungsten_dust" }, { "amount": 1, - "item": "modern_industrialization:tungsten_dust", + "id": "modern_industrialization:tungsten_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/block.json index 0d58f5324..b68b6eb43 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/tungsten" + "ingredient": "#c:ingots/tungsten" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_block" + "id": "modern_industrialization:tungsten_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/double_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/double_ingot.json index 6478910c5..2fcbd4d11 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/double_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/double_ingot.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 2, - "tag": "c:ingots/tungsten" + "ingredient": "#c:ingots/tungsten" }, { "amount": 1, - "item": "modern_industrialization:packer_double_ingot_template", + "ingredient": "modern_industrialization:packer_double_ingot_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_double_ingot" + "id": "modern_industrialization:tungsten_double_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/dust.json index a137fe396..28e40b9ca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/tungsten" + "ingredient": "#c:tiny_dusts/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_dust" + "id": "modern_industrialization:tungsten_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/ingot.json index 26b6fdee9..c05e38f5a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/tungsten" + "ingredient": "#c:nuggets/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_ingot" + "id": "modern_industrialization:tungsten_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/large_plate.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/large_plate.json index 7be11cf09..15562e355 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/large_plate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/large_plate.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "tag": "c:plates/tungsten" + "ingredient": "#c:plates/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:tungsten_large_plate" + "id": "modern_industrialization:tungsten_large_plate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/raw_metal_block.json index d22afe4b4..eb548a193 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/tungsten" + "ingredient": "#c:raw_materials/tungsten" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_tungsten_block" + "id": "modern_industrialization:raw_tungsten_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/ingot.json index 2e936be47..f5f81dac3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/tungsten" + "ingredient": "#c:storage_blocks/tungsten" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:tungsten_ingot" + "id": "modern_industrialization:tungsten_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/nugget.json index 726273483..34d1742a9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/tungsten" + "ingredient": "#c:ingots/tungsten" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:tungsten_nugget" + "id": "modern_industrialization:tungsten_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/raw_metal.json index ecb1d7ca9..e287777e8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_tungsten" + "ingredient": "#c:storage_blocks/raw_tungsten" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_tungsten" + "id": "modern_industrialization:raw_tungsten" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/tiny_dust.json index fff8251ac..c2f1b3ae5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/tungsten/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/tungsten" + "ingredient": "#c:dusts/tungsten" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:tungsten_tiny_dust" + "id": "modern_industrialization:tungsten_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uncooked_steel_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uncooked_steel_dust.json new file mode 100644 index 000000000..e276daca3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uncooked_steel_dust.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "#c:dusts/iron", + "#c:dusts/iron", + "#c:dusts/iron", + "#c:dusts/iron", + "#c:dusts/iron", + "#c:dusts/iron", + "#c:dusts/iron", + "#c:dusts/coke", + "#c:dusts/coke" + ], + "result": { + "count": 7, + "id": "modern_industrialization:uncooked_steel_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/assembler/fuel_rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/assembler/fuel_rod.json index a9439afe4..49ce5043d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/assembler/fuel_rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/assembler/fuel_rod.json @@ -5,35 +5,35 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:soldering_alloy" + "ingredient": "modern_industrialization:soldering_alloy" }, { "amount": 100, - "fluid": "modern_industrialization:helium" + "ingredient": "modern_industrialization:helium" } ], "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:blastproof_alloy_curved_plate" + "ingredient": "modern_industrialization:blastproof_alloy_curved_plate" }, { "amount": 1, - "item": "modern_industrialization:large_motor" + "ingredient": "modern_industrialization:large_motor" }, { "amount": 2, - "item": "modern_industrialization:robot_arm" + "ingredient": "modern_industrialization:robot_arm" }, { "amount": 18, - "tag": "c:rods/uranium" + "ingredient": "#c:rods/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_fuel_rod" + "id": "modern_industrialization:uranium_fuel_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/dust.json index bb111ded0..c83b82eab 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/uranium" + "ingredient": "#c:dusts/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_ingot" + "id": "modern_industrialization:uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/tiny_dust.json index dc9024c9b..5abb90e4f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/uranium" + "ingredient": "#c:tiny_dusts/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_nugget" + "id": "modern_industrialization:uranium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/block_from_ingot.json index 14a798d41..e13279205 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/uranium" - }, - "y": { - "item": "modern_industrialization:uranium_ingot" - } + "x": "#c:ingots/uranium", + "y": "modern_industrialization:uranium_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/deepslate_to_ore.json index 62e462168..3836a8ded 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/deepslate_to_ore.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/deepslate_to_ore.json @@ -2,12 +2,9 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:deepslate_uranium_ore" - } + "modern_industrialization:deepslate_uranium_ore" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_ore" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/dust_from_tiny_dust.json index 70c6aec6e..e3659bdb2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/uranium" - }, - "y": { - "item": "modern_industrialization:uranium_tiny_dust" - } + "x": "#c:tiny_dusts/uranium", + "y": "modern_industrialization:uranium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_block.json index 3da6783d2..dbe9e484b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_block" - } + "modern_industrialization:uranium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_nugget.json index 1f896c318..0544154b4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/uranium" - }, - "y": { - "item": "modern_industrialization:uranium_nugget" - } + "x": "#c:nuggets/uranium", + "y": "modern_industrialization:uranium_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/nugget_from_ingot.json index 00b75fcb4..815892667 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_ingot" - } + "modern_industrialization:uranium_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_block_from_raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_block_from_raw_metal.json index efd7ccb84..249e87b7d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_block_from_raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_block_from_raw_metal.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:raw_materials/uranium" - }, - "y": { - "item": "modern_industrialization:raw_uranium" - } + "x": "#c:raw_materials/uranium", + "y": "modern_industrialization:raw_uranium" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:raw_uranium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_from_raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_from_raw_metal_block.json index 8d9566355..53cf30e51 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_from_raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/raw_metal_from_raw_metal_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:raw_uranium_block" - } + "modern_industrialization:raw_uranium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/tiny_dust_from_dust.json index f6b72fd3b..311201ad7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_dust" - } + "modern_industrialization:uranium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/cutting_machine/main.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/cutting_machine/main.json index 2a59485c2..23c2925c2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/cutting_machine/main.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/cutting_machine/main.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 1, - "fluid": "modern_industrialization:lubricant" + "ingredient": "modern_industrialization:lubricant" } ], "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium" + "ingredient": "#c:ingots/uranium" } ], "item_outputs": [ { "amount": 2, - "item": "modern_industrialization:uranium_rod" + "id": "modern_industrialization:uranium_rod" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ingot.json index 48344989e..910e902fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium" + "ingredient": "#c:ingots/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_dust" + "id": "modern_industrialization:uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/nugget.json index c3a57ade0..1ad9f5df1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/uranium" + "ingredient": "#c:nuggets/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_tiny_dust" + "id": "modern_industrialization:uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ore_to_raw.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ore_to_raw.json index ee9e71da1..75444f044 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ore_to_raw.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/ore_to_raw.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/uranium" + "ingredient": "#c:ores/uranium" } ], "item_outputs": [ { "amount": 3, - "item": "modern_industrialization:raw_uranium" + "id": "modern_industrialization:raw_uranium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/raw_metal.json index bc15e4ac1..76f1460e9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/raw_metal.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/uranium" + "ingredient": "#c:raw_materials/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_dust" + "id": "modern_industrialization:uranium_dust" }, { "amount": 1, - "item": "modern_industrialization:uranium_dust", + "id": "modern_industrialization:uranium_dust", "probability": 0.5 } ] diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/rod.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/rod.json index 46b894e33..972c86467 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/rod.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/macerator/rod.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:rods/uranium" + "ingredient": "#c:rods/uranium" } ], "item_outputs": [ { "amount": 4, - "item": "modern_industrialization:uranium_tiny_dust" + "id": "modern_industrialization:uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/block.json index f3ebac9dc..47a0208ee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/uranium" + "ingredient": "#c:ingots/uranium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_block" + "id": "modern_industrialization:uranium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/dust.json index eea9e2972..9ec3adcca 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/uranium" + "ingredient": "#c:tiny_dusts/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_dust" + "id": "modern_industrialization:uranium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_double.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_double.json index e070d466b..3be97d57a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_double.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_double.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "item": "modern_industrialization:uranium_fuel_rod" + "ingredient": "modern_industrialization:uranium_fuel_rod" }, { "amount": 1, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_fuel_rod_double" + "id": "modern_industrialization:uranium_fuel_rod_double" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_quad.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_quad.json index e19d10ba4..68fd0bbe5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_quad.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/fuel_rod_quad.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 2, - "tag": "c:plates/nuclear_alloy" + "ingredient": "#c:plates/nuclear_alloy" }, { "amount": 2, - "item": "modern_industrialization:uranium_fuel_rod_double" + "ingredient": "modern_industrialization:uranium_fuel_rod_double" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_fuel_rod_quad" + "id": "modern_industrialization:uranium_fuel_rod_quad" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/ingot.json index 641f6a550..8f1d4c1db 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/uranium" + "ingredient": "#c:nuggets/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_ingot" + "id": "modern_industrialization:uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/raw_metal_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/raw_metal_block.json index 7c403dcaf..a68e6cb80 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/raw_metal_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/packer/raw_metal_block.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:raw_materials/uranium" + "ingredient": "#c:raw_materials/uranium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:raw_uranium_block" + "id": "modern_industrialization:raw_uranium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/ingot.json index 4124e7566..4fb0d9ceb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/uranium" + "ingredient": "#c:storage_blocks/uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_ingot" + "id": "modern_industrialization:uranium_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/nugget.json index 565a7cc16..ce753e92d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium" + "ingredient": "#c:ingots/uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_nugget" + "id": "modern_industrialization:uranium_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/raw_metal.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/raw_metal.json index d4c580dff..ac42d160a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/raw_metal.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/raw_metal.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/raw_uranium" + "ingredient": "#c:storage_blocks/raw_uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:raw_uranium" + "id": "modern_industrialization:raw_uranium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/tiny_dust.json index 6965108fb..bfa23fd39 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/uranium" + "ingredient": "#c:dusts/uranium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_tiny_dust" + "id": "modern_industrialization:uranium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/dust.json index 8a3e64bae..e162bd6b1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/uranium_235" + "ingredient": "#c:dusts/uranium_235" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_ingot" + "id": "modern_industrialization:uranium_235_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/tiny_dust.json index 2b32819a8..da6eae8dd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/uranium_235" + "ingredient": "#c:tiny_dusts/uranium_235" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_nugget" + "id": "modern_industrialization:uranium_235_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/block_from_ingot.json index f0f5360db..370d53dd7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/uranium_235" - }, - "y": { - "item": "modern_industrialization:uranium_235_ingot" - } + "x": "#c:ingots/uranium_235", + "y": "modern_industrialization:uranium_235_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_235_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/dust_from_tiny_dust.json index d52a3570c..5a4619bb5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/uranium_235" - }, - "y": { - "item": "modern_industrialization:uranium_235_tiny_dust" - } + "x": "#c:tiny_dusts/uranium_235", + "y": "modern_industrialization:uranium_235_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_235_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_block.json index 0e5e5c026..2f1943817 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_235_block" - } + "modern_industrialization:uranium_235_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_nugget.json index bdaf19af0..de7af71fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/uranium_235" - }, - "y": { - "item": "modern_industrialization:uranium_235_nugget" - } + "x": "#c:nuggets/uranium_235", + "y": "modern_industrialization:uranium_235_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_235_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/nugget_from_ingot.json index cd65d5528..e1b409ec5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_235_ingot" - } + "modern_industrialization:uranium_235_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/tiny_dust_from_dust.json index eacea77c5..a41d7c2c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_235_dust" - } + "modern_industrialization:uranium_235_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/ingot.json index 91060a41b..8f0dc6441 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium_235" + "ingredient": "#c:ingots/uranium_235" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_dust" + "id": "modern_industrialization:uranium_235_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/nugget.json index 064fec5a1..ac5c69880 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/uranium_235" + "ingredient": "#c:nuggets/uranium_235" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_tiny_dust" + "id": "modern_industrialization:uranium_235_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/block.json index 142c62bb0..bb968cdda 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/uranium_235" + "ingredient": "#c:ingots/uranium_235" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_block" + "id": "modern_industrialization:uranium_235_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/dust.json index ae3a444e3..42e8a2c62 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/uranium_235" + "ingredient": "#c:tiny_dusts/uranium_235" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_dust" + "id": "modern_industrialization:uranium_235_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/ingot.json index b10425914..6d8491452 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/uranium_235" + "ingredient": "#c:nuggets/uranium_235" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_235_ingot" + "id": "modern_industrialization:uranium_235_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/ingot.json index f059d937e..f18147b8a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/uranium_235" + "ingredient": "#c:storage_blocks/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_235_ingot" + "id": "modern_industrialization:uranium_235_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/nugget.json index e206c5a41..050ac1bdf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium_235" + "ingredient": "#c:ingots/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_235_nugget" + "id": "modern_industrialization:uranium_235_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/tiny_dust.json index b5570fabb..b3bce2edb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_235/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/uranium_235" + "ingredient": "#c:dusts/uranium_235" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_235_tiny_dust" + "id": "modern_industrialization:uranium_235_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/dust.json index 96ba12d77..0e1bf49f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/uranium_238" + "ingredient": "#c:dusts/uranium_238" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_ingot" + "id": "modern_industrialization:uranium_238_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/tiny_dust.json index efb86416f..39f3b3712 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/blast_furnace/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/uranium_238" + "ingredient": "#c:tiny_dusts/uranium_238" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_nugget" + "id": "modern_industrialization:uranium_238_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/block_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/block_from_ingot.json index 5824a797b..207cb6c94 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/block_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/block_from_ingot.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:ingots/uranium_238" - }, - "y": { - "item": "modern_industrialization:uranium_238_ingot" - } + "x": "#c:ingots/uranium_238", + "y": "modern_industrialization:uranium_238_ingot" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_238_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/dust_from_tiny_dust.json index d4d774418..a0f78aa52 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/uranium_238" - }, - "y": { - "item": "modern_industrialization:uranium_238_tiny_dust" - } + "x": "#c:tiny_dusts/uranium_238", + "y": "modern_industrialization:uranium_238_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_238_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_block.json index b5ac60bfd..97c7c555b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_238_block" - } + "modern_industrialization:uranium_238_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_nugget.json index 624ebb40c..b03b028a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/ingot_from_nugget.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:nuggets/uranium_238" - }, - "y": { - "item": "modern_industrialization:uranium_238_nugget" - } + "x": "#c:nuggets/uranium_238", + "y": "modern_industrialization:uranium_238_nugget" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:uranium_238_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/nugget_from_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/nugget_from_ingot.json index 861f16ee2..711f18ba1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/nugget_from_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/nugget_from_ingot.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_238_ingot" - } + "modern_industrialization:uranium_238_ingot" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/tiny_dust_from_dust.json index ba8cc82a9..59c96fc6a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:uranium_238_dust" - } + "modern_industrialization:uranium_238_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/ingot.json index 35ebb0715..90b79a3fa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium_238" + "ingredient": "#c:ingots/uranium_238" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_dust" + "id": "modern_industrialization:uranium_238_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/nugget.json index a8ab9fc43..4c74474ac 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/macerator/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:nuggets/uranium_238" + "ingredient": "#c:nuggets/uranium_238" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_tiny_dust" + "id": "modern_industrialization:uranium_238_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/block.json index 6e937f605..3ce9c346f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:ingots/uranium_238" + "ingredient": "#c:ingots/uranium_238" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_block" + "id": "modern_industrialization:uranium_238_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/dust.json index 02d422e71..9b6dccad4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/uranium_238" + "ingredient": "#c:tiny_dusts/uranium_238" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_dust" + "id": "modern_industrialization:uranium_238_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/ingot.json index fdbbd7cab..e79d722da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/packer/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:nuggets/uranium_238" + "ingredient": "#c:nuggets/uranium_238" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:uranium_238_ingot" + "id": "modern_industrialization:uranium_238_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/ingot.json index 19d7c65b1..b290df65e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/ingot.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/uranium_238" + "ingredient": "#c:storage_blocks/uranium_238" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_238_ingot" + "id": "modern_industrialization:uranium_238_ingot" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/nugget.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/nugget.json index 44b27b31b..e67754327 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/nugget.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/nugget.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/uranium_238" + "ingredient": "#c:ingots/uranium_238" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_238_nugget" + "id": "modern_industrialization:uranium_238_nugget" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/tiny_dust.json index 14ff535fe..079cfd238 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/uranium_238/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/uranium_238" + "ingredient": "#c:dusts/uranium_238" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:uranium_238_tiny_dust" + "id": "modern_industrialization:uranium_238_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json b/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json new file mode 100644 index 000000000..41190a6d7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:vacuum_freezer", + "duration": 250, + "eu": 256, + "fluid_inputs": [ + { + "amount": 140, + "ingredient": "modern_industrialization:argon" + }, + { + "amount": 60, + "ingredient": "modern_industrialization:helium" + } + ], + "fluid_outputs": [ + { + "amount": 200, + "id": "modern_industrialization:cryofluid" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json b/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json new file mode 100644 index 000000000..a3bb8dd19 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json @@ -0,0 +1,18 @@ +{ + "type": "modern_industrialization:vacuum_freezer", + "duration": 200, + "eu": 32, + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:liquid_air" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:air_intake", + "probability": 0.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json b/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json new file mode 100644 index 000000000..1a5c05e07 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:vacuum_freezer", + "duration": 5, + "eu": 16, + "fluid_inputs": [ + { + "amount": 90, + "ingredient": "modern_industrialization:molten_redstone" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:redstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/block_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/block_from_dust.json index c60097de0..66c12e99e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/block_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/block_from_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:dusts/yttrium" - }, - "y": { - "item": "modern_industrialization:yttrium_dust" - } + "x": "#c:dusts/yttrium", + "y": "modern_industrialization:yttrium_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:yttrium_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_block.json index c007dae3b..9ec0c05a4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_block.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:yttrium_block" - } + "modern_industrialization:yttrium_block" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_tiny_dust.json index 865aacec0..fd299330b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/dust_from_tiny_dust.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "x": { - "tag": "c:tiny_dusts/yttrium" - }, - "y": { - "item": "modern_industrialization:yttrium_tiny_dust" - } + "x": "#c:tiny_dusts/yttrium", + "y": "modern_industrialization:yttrium_tiny_dust" }, "pattern": [ "xxx", @@ -15,7 +11,6 @@ "xxx" ], "result": { - "count": 1, "id": "modern_industrialization:yttrium_dust" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/tiny_dust_from_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/tiny_dust_from_dust.json index 6216b587f..0b6ce94ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/tiny_dust_from_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/craft/tiny_dust_from_dust.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:yttrium_dust" - } + "modern_industrialization:yttrium_dust" ], "result": { "count": 9, diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/block.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/block.json index 014701f67..29f1d7abf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/block.json @@ -5,18 +5,18 @@ "item_inputs": [ { "amount": 9, - "tag": "c:dusts/yttrium" + "ingredient": "#c:dusts/yttrium" }, { "amount": 1, - "item": "modern_industrialization:packer_block_template", + "ingredient": "modern_industrialization:packer_block_template", "probability": 0.0 } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:yttrium_block" + "id": "modern_industrialization:yttrium_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/dust.json index 7c77d399c..b3a041fba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/packer/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 9, - "tag": "c:tiny_dusts/yttrium" + "ingredient": "#c:tiny_dusts/yttrium" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:yttrium_dust" + "id": "modern_industrialization:yttrium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/dust.json index 48c4131f9..6180f3c19 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:storage_blocks/yttrium" + "ingredient": "#c:storage_blocks/yttrium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:yttrium_dust" + "id": "modern_industrialization:yttrium_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/tiny_dust.json b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/tiny_dust.json index 8d3b5d6f2..c7143de39 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/tiny_dust.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/yttrium/unpacker/tiny_dust.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:dusts/yttrium" + "ingredient": "#c:dusts/yttrium" } ], "item_outputs": [ { "amount": 9, - "item": "modern_industrialization:yttrium_tiny_dust" + "id": "modern_industrialization:yttrium_tiny_dust" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/misc/forge_hammer.json b/src/generated/resources/data/modern_industrialization/recipe/misc/forge_hammer.json new file mode 100644 index 000000000..54ec0b560 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/misc/forge_hammer.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "_": "minecraft:heavy_weighted_pressure_plate", + "i": "minecraft:iron_ingot" + }, + "pattern": [ + "___", + " i ", + "iii" + ], + "result": { + "id": "modern_industrialization:forge_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/misc/guide_book.json b/src/generated/resources/data/modern_industrialization/recipe/misc/guide_book.json new file mode 100644 index 000000000..26b540a37 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/misc/guide_book.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "minecraft:book", + "c": "#c:nuggets/copper" + }, + "pattern": [ + "ccc", + "cbc", + "ccc" + ], + "result": { + "id": "modern_industrialization:guidebook" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/misc/packer_block_template.json b/src/generated/resources/data/modern_industrialization/recipe/misc/packer_block_template.json new file mode 100644 index 000000000..8d1c8c85c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/misc/packer_block_template.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "minecraft:bricks", + "p": "#c:plates/steel" + }, + "pattern": [ + "b", + "p" + ], + "result": { + "id": "modern_industrialization:packer_block_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/misc/packer_double_ingot_template.json b/src/generated/resources/data/modern_industrialization/recipe/misc/packer_double_ingot_template.json new file mode 100644 index 000000000..aa0cfb152 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/misc/packer_double_ingot_template.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:iron_double_ingot", + "p": "#c:plates/steel" + }, + "pattern": [ + "b", + "p" + ], + "result": { + "id": "modern_industrialization:packer_double_ingot_template" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/misc/trash_can.json b/src/generated/resources/data/modern_industrialization/recipe/misc/trash_can.json new file mode 100644 index 000000000..36aaaa915 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/misc/trash_can.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": "minecraft:lava_bucket", + "P": "#c:plates/steel" + }, + "pattern": [ + "PPP", + "PLP", + "PPP" + ], + "result": { + "id": "modern_industrialization:trash_can" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/misc/trash_can_assembler.json b/src/generated/resources/data/modern_industrialization/recipe/misc/trash_can_assembler.json new file mode 100644 index 000000000..82b3be00d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/misc/trash_can_assembler.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:lava" + } + ], + "item_inputs": [ + { + "amount": 8, + "ingredient": "#c:plates/steel" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:trash_can" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json b/src/generated/resources/data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json new file mode 100644 index 000000000..f85b80087 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:blast_furnace", + "duration": 50, + "eu": 32, + "fluid_inputs": [ + { + "amount": 200, + "ingredient": "modern_industrialization:methane" + } + ], + "fluid_outputs": [ + { + "amount": 200, + "id": "modern_industrialization:acetylene" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json new file mode 100644 index 000000000..fe8f68779 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json @@ -0,0 +1,24 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 80, + "eu": 10, + "fluid_inputs": [ + { + "amount": 25, + "ingredient": "modern_industrialization:acrylic_glue" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:slime_ball", + "probability": 0.0 + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:slime_ball" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json new file mode 100644 index 000000000..0982ba152 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 12, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:acetylene" + } + ], + "fluid_outputs": [ + { + "amount": 2000, + "id": "modern_industrialization:hydrogen" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/coal" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json new file mode 100644 index 000000000..86aaf0b23 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 300, + "eu": 12, + "fluid_inputs": [ + { + "amount": 750, + "ingredient": "modern_industrialization:benzene" + }, + { + "amount": 750, + "ingredient": "modern_industrialization:ethylene" + }, + { + "amount": 100, + "ingredient": "modern_industrialization:hydrochloric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 750, + "id": "modern_industrialization:ethylbenzene" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json new file mode 100644 index 000000000..a4eb9cbe7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 300, + "eu": 16, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:benzene" + }, + { + "amount": 750, + "ingredient": "modern_industrialization:hydrogen" + } + ], + "fluid_outputs": [ + { + "amount": 600, + "id": "modern_industrialization:caprolactam" + } + ], + "item_inputs": [ + { + "amount": 4, + "ingredient": "#c:tiny_dusts/nickel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json new file mode 100644 index 000000000..0b85b88e0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 300, + "eu": 16, + "fluid_inputs": [ + { + "amount": 750, + "ingredient": "modern_industrialization:ethanol" + } + ], + "fluid_outputs": [ + { + "amount": 375, + "id": "modern_industrialization:butadiene" + }, + { + "amount": 750, + "id": "minecraft:water" + }, + { + "amount": 250, + "id": "modern_industrialization:hydrogen" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:tiny_dusts/aluminum" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json new file mode 100644 index 000000000..cbab4ecf7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 300, + "eu": 20, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:ethanol" + }, + { + "amount": 25, + "ingredient": "modern_industrialization:acrylic_acid" + } + ], + "fluid_outputs": [ + { + "amount": 250, + "id": "modern_industrialization:diethyl_ether" + }, + { + "amount": 250, + "id": "minecraft:water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json new file mode 100644 index 000000000..8eb962e64 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 280, + "eu": 10, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:ethanol" + } + ], + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:ethylene" + }, + { + "amount": 400, + "id": "modern_industrialization:sulfuric_acid" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/sulfur" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json new file mode 100644 index 000000000..67f458cbb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 240, + "eu": 20, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:ethylbenzene" + }, + { + "amount": 2000, + "ingredient": "modern_industrialization:steam" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:styrene" + }, + { + "amount": 500, + "id": "modern_industrialization:hydrogen" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/iron" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json new file mode 100644 index 000000000..6924b8deb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 140, + "eu": 10, + "fluid_inputs": [ + { + "amount": 200, + "ingredient": "modern_industrialization:ethylene" + }, + { + "amount": 200, + "ingredient": "minecraft:water" + }, + { + "amount": 35, + "ingredient": "modern_industrialization:sulfuric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 200, + "id": "modern_industrialization:ethanol" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json new file mode 100644 index 000000000..5101727a5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json @@ -0,0 +1,24 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 100, + "eu": 8, + "fluid_inputs": [ + { + "amount": 20, + "ingredient": "modern_industrialization:nylon" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:string", + "probability": 0.0 + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:string" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json new file mode 100644 index 000000000..c87a2769c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 300, + "eu": 12, + "fluid_inputs": [ + { + "amount": 6000, + "ingredient": "modern_industrialization:plant_oil" + }, + { + "amount": 400, + "ingredient": "modern_industrialization:ethanol" + }, + { + "amount": 100, + "ingredient": "modern_industrialization:sodium_hydroxide" + } + ], + "fluid_outputs": [ + { + "amount": 1500, + "id": "modern_industrialization:raw_biodiesel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json new file mode 100644 index 000000000..127e5fe52 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 240, + "eu": 10, + "fluid_inputs": [ + { + "amount": 400, + "ingredient": "modern_industrialization:propene" + }, + { + "amount": 600, + "ingredient": "modern_industrialization:oxygen" + } + ], + "fluid_outputs": [ + { + "amount": 400, + "id": "modern_industrialization:acrylic_acid" + }, + { + "amount": 400, + "id": "minecraft:water" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json new file mode 100644 index 000000000..3830d94b5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 200, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:raw_biodiesel" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:steam" + } + ], + "fluid_outputs": [ + { + "amount": 700, + "id": "modern_industrialization:biodiesel" + }, + { + "amount": 250, + "id": "modern_industrialization:ethanol" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json new file mode 100644 index 000000000..80466bb34 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 150, + "eu": 10, + "fluid_inputs": [ + { + "amount": 500, + "ingredient": "modern_industrialization:styrene" + }, + { + "amount": 500, + "ingredient": "modern_industrialization:butadiene" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:styrene_butadiene" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json new file mode 100644 index 000000000..813821c29 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 500, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:acetylene" + }, + { + "amount": 1000, + "ingredient": "modern_industrialization:hydrochloric_acid" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:vinyl_chloride" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/crude_oil.json b/src/generated/resources/data/modern_industrialization/recipe/oil/crude_oil.json new file mode 100644 index 000000000..7e43fcc3c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/crude_oil.json @@ -0,0 +1,18 @@ +{ + "type": "modern_industrialization:oil_drilling_rig", + "duration": 200, + "eu": 8, + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:crude_oil" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:aluminum_drill", + "probability": 0.04 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json b/src/generated/resources/data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json new file mode 100644 index 000000000..425118240 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:distillery", + "duration": 800, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:sugar_solution" + } + ], + "fluid_outputs": [ + { + "amount": 10, + "id": "modern_industrialization:ethanol" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diesel.json b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diesel.json new file mode 100644 index 000000000..c59a88fa9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diesel.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 600, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:heavy_fuel" + }, + { + "amount": 5000, + "ingredient": "modern_industrialization:light_fuel" + } + ], + "fluid_outputs": [ + { + "amount": 6000, + "id": "modern_industrialization:diesel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json new file mode 100644 index 000000000..328a4df4f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 450, + "eu": 12, + "fluid_inputs": [ + { + "amount": 2000, + "ingredient": "modern_industrialization:biodiesel" + }, + { + "amount": 250, + "ingredient": "modern_industrialization:diethyl_ether" + } + ], + "fluid_outputs": [ + { + "amount": 1500, + "id": "modern_industrialization:boosted_diesel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json new file mode 100644 index 000000000..4afcd4823 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 300, + "eu": 12, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:diesel" + }, + { + "amount": 250, + "ingredient": "modern_industrialization:diethyl_ether" + } + ], + "fluid_outputs": [ + { + "amount": 1200, + "id": "modern_industrialization:boosted_diesel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json new file mode 100644 index 000000000..ef4da8dca --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 200, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "modern_industrialization:plant_oil" + } + ], + "fluid_outputs": [ + { + "amount": 500, + "id": "modern_industrialization:lubricant" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:redstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/sugar_solution.json b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/sugar_solution.json new file mode 100644 index 000000000..882457c14 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/mixer/sugar_solution.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 200, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 1000, + "id": "modern_industrialization:sugar_solution" + } + ], + "item_inputs": [ + { + "amount": 8, + "ingredient": "minecraft:sugar" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/oil_drilling_rig.json b/src/generated/resources/data/modern_industrialization/recipe/oil/oil_drilling_rig.json new file mode 100644 index 000000000..65c553b2e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/oil_drilling_rig.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "modern_industrialization:electronic_circuit", + "H": "modern_industrialization:advanced_machine_hull", + "L": "modern_industrialization:steel_large_plate", + "P": "modern_industrialization:large_pump", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "LGL", + "PHP", + "LpL" + ], + "result": { + "id": "modern_industrialization:oil_drilling_rig" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/shale_oil.json b/src/generated/resources/data/modern_industrialization/recipe/oil/shale_oil.json new file mode 100644 index 000000000..14e982c73 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/shale_oil.json @@ -0,0 +1,18 @@ +{ + "type": "modern_industrialization:oil_drilling_rig", + "duration": 200, + "eu": 32, + "fluid_outputs": [ + { + "amount": 4000, + "id": "modern_industrialization:shale_oil" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:stainless_steel_drill", + "probability": 0.02 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json b/src/generated/resources/data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json new file mode 100644 index 000000000..a4249fff6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:vacuum_freezer", + "duration": 300, + "eu": 128, + "fluid_inputs": [ + { + "amount": 200, + "ingredient": "modern_industrialization:styrene_butadiene_rubber" + } + ], + "item_outputs": [ + { + "amount": 64, + "id": "modern_industrialization:rubber_sheet" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/oil/water.json b/src/generated/resources/data/modern_industrialization/recipe/oil/water.json new file mode 100644 index 000000000..76167caea --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/oil/water.json @@ -0,0 +1,18 @@ +{ + "type": "modern_industrialization:oil_drilling_rig", + "duration": 100, + "eu": 2, + "fluid_outputs": [ + { + "amount": 16000, + "id": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:copper_drill", + "probability": 0.02 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/acacia.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/acacia.json index 7e6f0d650..ea7725d65 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/acacia.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/acacia.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_acacia_log" + "ingredient": "minecraft:stripped_acacia_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_acacia_wood" + "id": "minecraft:stripped_acacia_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/birch.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/birch.json index 87043a372..d230fd6d4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/birch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/birch.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_birch_log" + "ingredient": "minecraft:stripped_birch_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_birch_wood" + "id": "minecraft:stripped_birch_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/cherry.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/cherry.json index 4f577c4c9..5f8964b3e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/cherry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/cherry.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_cherry_log" + "ingredient": "minecraft:stripped_cherry_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_cherry_wood" + "id": "minecraft:stripped_cherry_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/crimson.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/crimson.json index a24eb5d97..c08bd45ef 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/crimson.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/crimson.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_crimson_stem" + "ingredient": "minecraft:stripped_crimson_stem" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_crimson_hyphae" + "id": "minecraft:stripped_crimson_hyphae" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/dark_oak.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/dark_oak.json index 8f53e65de..27f5f31e3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/dark_oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/dark_oak.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_dark_oak_log" + "ingredient": "minecraft:stripped_dark_oak_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_dark_oak_wood" + "id": "minecraft:stripped_dark_oak_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/jungle.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/jungle.json index a3665411b..466792763 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/jungle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/jungle.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_jungle_log" + "ingredient": "minecraft:stripped_jungle_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_jungle_wood" + "id": "minecraft:stripped_jungle_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/mangrove.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/mangrove.json index fc42b1cbd..9b96df8df 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/mangrove.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/mangrove.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_mangrove_log" + "ingredient": "minecraft:stripped_mangrove_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_mangrove_wood" + "id": "minecraft:stripped_mangrove_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/oak.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/oak.json index aca3f05f2..eafa1200f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/oak.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_oak_log" + "ingredient": "minecraft:stripped_oak_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_oak_wood" + "id": "minecraft:stripped_oak_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/spruce.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/spruce.json index 39810b86b..9a900ff5a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/spruce.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/spruce.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_spruce_log" + "ingredient": "minecraft:stripped_spruce_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_spruce_wood" + "id": "minecraft:stripped_spruce_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/warped.json b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/warped.json index 069587dc9..3e5510c6c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/warped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/stripped_wood/warped.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:stripped_warped_stem" + "ingredient": "minecraft:stripped_warped_stem" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:stripped_warped_hyphae" + "id": "minecraft:stripped_warped_hyphae" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/acacia.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/acacia.json index f2cac3f9b..e33936299 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/acacia.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/acacia.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:acacia_log" + "ingredient": "minecraft:acacia_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:acacia_wood" + "id": "minecraft:acacia_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/birch.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/birch.json index db3ee30f4..fb9004fc4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/birch.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/birch.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:birch_log" + "ingredient": "minecraft:birch_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:birch_wood" + "id": "minecraft:birch_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/cherry.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/cherry.json index b68a9eb30..5a5785c9d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/cherry.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/cherry.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:cherry_log" + "ingredient": "minecraft:cherry_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:cherry_wood" + "id": "minecraft:cherry_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/crimson.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/crimson.json index 52d5a0691..0b938b6b0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/crimson.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/crimson.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:crimson_stem" + "ingredient": "minecraft:crimson_stem" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:crimson_hyphae" + "id": "minecraft:crimson_hyphae" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/dark_oak.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/dark_oak.json index 6961156d7..042d695f2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/dark_oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/dark_oak.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:dark_oak_log" + "ingredient": "minecraft:dark_oak_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:dark_oak_wood" + "id": "minecraft:dark_oak_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/jungle.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/jungle.json index 7d6ffc264..28a92b868 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/jungle.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/jungle.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:jungle_log" + "ingredient": "minecraft:jungle_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:jungle_wood" + "id": "minecraft:jungle_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/mangrove.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/mangrove.json index b4c3833a7..5badc4aa4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/mangrove.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/mangrove.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:mangrove_log" + "ingredient": "minecraft:mangrove_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:mangrove_wood" + "id": "minecraft:mangrove_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/oak.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/oak.json index 9f642daaf..da132dcbd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/oak.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/oak.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:oak_log" + "ingredient": "minecraft:oak_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:oak_wood" + "id": "minecraft:oak_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/spruce.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/spruce.json index 05ee0de48..122f57989 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/spruce.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/spruce.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:spruce_log" + "ingredient": "minecraft:spruce_log" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:spruce_wood" + "id": "minecraft:spruce_wood" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/warped.json b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/warped.json index fc3187f22..c9295875c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/packer/wood/warped.json +++ b/src/generated/resources/data/modern_industrialization/recipe/packer/wood/warped.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 4, - "item": "minecraft:warped_stem" + "ingredient": "minecraft:warped_stem" } ], "item_outputs": [ { "amount": 3, - "item": "minecraft:warped_hyphae" + "id": "minecraft:warped_hyphae" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_0.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_0.json index db48cfdac..a4fee2bc7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_0.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_0.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:crude_oil" + "ingredient": "modern_industrialization:crude_oil" } ], "fluid_outputs": [ { "amount": 500, - "fluid": "modern_industrialization:sulfuric_light_fuel" + "id": "modern_industrialization:sulfuric_light_fuel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_1.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_1.json index 467825f7a..9e3d56001 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_1.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:crude_oil" + "ingredient": "modern_industrialization:crude_oil" } ], "fluid_outputs": [ { "amount": 200, - "fluid": "modern_industrialization:sulfuric_heavy_fuel" + "id": "modern_industrialization:sulfuric_heavy_fuel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_2.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_2.json index 95ba5836c..24e1c354c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_2.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_2.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:crude_oil" + "ingredient": "modern_industrialization:crude_oil" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:sulfuric_naphtha" + "id": "modern_industrialization:sulfuric_naphtha" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_full.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_full.json index 03b2503e4..4deb73997 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_full.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/crude_oil_full.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:crude_oil" + "ingredient": "modern_industrialization:crude_oil" } ], "fluid_outputs": [ { "amount": 500, - "fluid": "modern_industrialization:sulfuric_light_fuel" + "id": "modern_industrialization:sulfuric_light_fuel" }, { "amount": 200, - "fluid": "modern_industrialization:sulfuric_heavy_fuel" + "id": "modern_industrialization:sulfuric_heavy_fuel" }, { "amount": 300, - "fluid": "modern_industrialization:sulfuric_naphtha" + "id": "modern_industrialization:sulfuric_naphtha" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_0.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_0.json index 9ed4c9403..7875ac990 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_0.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_0.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:shale_oil" + "ingredient": "modern_industrialization:shale_oil" } ], "fluid_outputs": [ { "amount": 50, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_1.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_1.json index ef5c98edf..c978e4e82 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_1.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:shale_oil" + "ingredient": "modern_industrialization:shale_oil" } ], "fluid_outputs": [ { "amount": 450, - "fluid": "modern_industrialization:sulfuric_crude_oil" + "id": "modern_industrialization:sulfuric_crude_oil" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_2.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_2.json index 3f940b871..53c9b1cba 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_2.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_2.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:shale_oil" + "ingredient": "modern_industrialization:shale_oil" } ], "fluid_outputs": [ { "amount": 500, - "fluid": "modern_industrialization:sulfuric_naphtha" + "id": "modern_industrialization:sulfuric_naphtha" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_full.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_full.json index d5e83f2a2..4eb807e3a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_full.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/shale_oil_full.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:shale_oil" + "ingredient": "modern_industrialization:shale_oil" } ], "fluid_outputs": [ { "amount": 50, - "fluid": "modern_industrialization:helium" + "id": "modern_industrialization:helium" }, { "amount": 450, - "fluid": "modern_industrialization:sulfuric_crude_oil" + "id": "modern_industrialization:sulfuric_crude_oil" }, { "amount": 500, - "fluid": "modern_industrialization:sulfuric_naphtha" + "id": "modern_industrialization:sulfuric_naphtha" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_0.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_0.json index 3a2735d9d..419ba7b7c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_0.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_0.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_heavy_fuel" + "ingredient": "modern_industrialization:steam_cracked_heavy_fuel" } ], "fluid_outputs": [ { "amount": 500, - "fluid": "modern_industrialization:light_fuel" + "id": "modern_industrialization:light_fuel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_1.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_1.json index dcbdff4c2..059ba5d3d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_1.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_heavy_fuel" + "ingredient": "modern_industrialization:steam_cracked_heavy_fuel" } ], "fluid_outputs": [ { "amount": 100, - "fluid": "modern_industrialization:methane" + "id": "modern_industrialization:methane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_2.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_2.json index eaa46be36..382369f6b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_2.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_2.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_heavy_fuel" + "ingredient": "modern_industrialization:steam_cracked_heavy_fuel" } ], "fluid_outputs": [ { "amount": 250, - "fluid": "modern_industrialization:butadiene" + "id": "modern_industrialization:butadiene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_3.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_3.json index 656e43bca..d171c1fdb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_3.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_3.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_heavy_fuel" + "ingredient": "modern_industrialization:steam_cracked_heavy_fuel" } ], "fluid_outputs": [ { "amount": 150, - "fluid": "modern_industrialization:benzene" + "id": "modern_industrialization:benzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_full.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_full.json index 4d28066a9..ea5442278 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_full.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_heavy_fuel_full.json @@ -5,25 +5,25 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_heavy_fuel" + "ingredient": "modern_industrialization:steam_cracked_heavy_fuel" } ], "fluid_outputs": [ { "amount": 500, - "fluid": "modern_industrialization:light_fuel" + "id": "modern_industrialization:light_fuel" }, { "amount": 100, - "fluid": "modern_industrialization:methane" + "id": "modern_industrialization:methane" }, { "amount": 250, - "fluid": "modern_industrialization:butadiene" + "id": "modern_industrialization:butadiene" }, { "amount": 150, - "fluid": "modern_industrialization:benzene" + "id": "modern_industrialization:benzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_0.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_0.json index 4fc75c785..c20db9c9d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_0.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_0.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "ingredient": "modern_industrialization:steam_cracked_light_fuel" } ], "fluid_outputs": [ { "amount": 200, - "fluid": "modern_industrialization:methane" + "id": "modern_industrialization:methane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_1.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_1.json index 2e636aeb3..2f8344128 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_1.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "ingredient": "modern_industrialization:steam_cracked_light_fuel" } ], "fluid_outputs": [ { "amount": 100, - "fluid": "modern_industrialization:acetylene" + "id": "modern_industrialization:acetylene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_2.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_2.json index 92ace20e9..10b84fcdf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_2.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_2.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "ingredient": "modern_industrialization:steam_cracked_light_fuel" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:ethylene" + "id": "modern_industrialization:ethylene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_3.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_3.json index 2472b2279..a61853309 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_3.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_3.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "ingredient": "modern_industrialization:steam_cracked_light_fuel" } ], "fluid_outputs": [ { "amount": 200, - "fluid": "modern_industrialization:butadiene" + "id": "modern_industrialization:butadiene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_4.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_4.json index 029b5d7d1..a2ea589d8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_4.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_4.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "ingredient": "modern_industrialization:steam_cracked_light_fuel" } ], "fluid_outputs": [ { "amount": 200, - "fluid": "modern_industrialization:benzene" + "id": "modern_industrialization:benzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_full.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_full.json index c450bbf0d..0c9829b16 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_full.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_light_fuel_full.json @@ -5,29 +5,29 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "ingredient": "modern_industrialization:steam_cracked_light_fuel" } ], "fluid_outputs": [ { "amount": 200, - "fluid": "modern_industrialization:methane" + "id": "modern_industrialization:methane" }, { "amount": 100, - "fluid": "modern_industrialization:acetylene" + "id": "modern_industrialization:acetylene" }, { "amount": 300, - "fluid": "modern_industrialization:ethylene" + "id": "modern_industrialization:ethylene" }, { "amount": 200, - "fluid": "modern_industrialization:butadiene" + "id": "modern_industrialization:butadiene" }, { "amount": 200, - "fluid": "modern_industrialization:benzene" + "id": "modern_industrialization:benzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_0.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_0.json index cd63cbd88..7a9abef7d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_0.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_0.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 150, - "fluid": "modern_industrialization:methane" + "id": "modern_industrialization:methane" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_1.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_1.json index 63274c09b..386cf85e2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_1.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_1.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 50, - "fluid": "modern_industrialization:acetylene" + "id": "modern_industrialization:acetylene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_2.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_2.json index 3a4a6e4bc..18554c3fb 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_2.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_2.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 250, - "fluid": "modern_industrialization:ethylene" + "id": "modern_industrialization:ethylene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_3.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_3.json index 9c5d54a26..584e4793e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_3.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_3.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 75, - "fluid": "modern_industrialization:propene" + "id": "modern_industrialization:propene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_4.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_4.json index 1c979eb83..f71b4bde9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_4.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_4.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 125, - "fluid": "modern_industrialization:butadiene" + "id": "modern_industrialization:butadiene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_5.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_5.json index 8a32f9e31..d6a116780 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_5.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_5.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 150, - "fluid": "modern_industrialization:benzene" + "id": "modern_industrialization:benzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_6.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_6.json index aabaf09d7..11c12394b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_6.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_6.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 100, - "fluid": "modern_industrialization:toluene" + "id": "modern_industrialization:toluene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_7.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_7.json index 4df3d2b95..02e177b23 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_7.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_7.json @@ -5,13 +5,13 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 100, - "fluid": "modern_industrialization:ethylbenzene" + "id": "modern_industrialization:ethylbenzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_full.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_full.json index 992b5e80d..b892633f1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_full.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/distillation/steam_cracked_naphtha_full.json @@ -5,41 +5,41 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "ingredient": "modern_industrialization:steam_cracked_naphtha" } ], "fluid_outputs": [ { "amount": 150, - "fluid": "modern_industrialization:methane" + "id": "modern_industrialization:methane" }, { "amount": 50, - "fluid": "modern_industrialization:acetylene" + "id": "modern_industrialization:acetylene" }, { "amount": 250, - "fluid": "modern_industrialization:ethylene" + "id": "modern_industrialization:ethylene" }, { "amount": 75, - "fluid": "modern_industrialization:propene" + "id": "modern_industrialization:propene" }, { "amount": 125, - "fluid": "modern_industrialization:butadiene" + "id": "modern_industrialization:butadiene" }, { "amount": 150, - "fluid": "modern_industrialization:benzene" + "id": "modern_industrialization:benzene" }, { "amount": 100, - "fluid": "modern_industrialization:toluene" + "id": "modern_industrialization:toluene" }, { "amount": 100, - "fluid": "modern_industrialization:ethylbenzene" + "id": "modern_industrialization:ethylbenzene" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_chromium.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_chromium.json index 68cf4876e..ac04176e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_chromium.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_chromium.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:acrylic_acid" + "ingredient": "modern_industrialization:acrylic_acid" } ], "fluid_outputs": [ { "amount": 700, - "fluid": "modern_industrialization:acrylic_glue" + "id": "modern_industrialization:acrylic_glue" } ], "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_lead.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_lead.json index 1d160f926..36bb07d3f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_lead.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/acrylic_acid_lead.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:acrylic_acid" + "ingredient": "modern_industrialization:acrylic_acid" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:acrylic_glue" + "id": "modern_industrialization:acrylic_glue" } ], "item_inputs": [ { "amount": 4, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_chromium.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_chromium.json index 037483075..d4870233b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_chromium.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_chromium.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:caprolactam" + "ingredient": "modern_industrialization:caprolactam" } ], "fluid_outputs": [ { "amount": 700, - "fluid": "modern_industrialization:nylon" + "id": "modern_industrialization:nylon" } ], "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_lead.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_lead.json index 1336855a0..2fe7463d3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_lead.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/caprolactam_lead.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:caprolactam" + "ingredient": "modern_industrialization:caprolactam" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:nylon" + "id": "modern_industrialization:nylon" } ], "item_inputs": [ { "amount": 4, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_chromium.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_chromium.json index 1b20b9ebc..4467c7545 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_chromium.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_chromium.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:ethylene" + "ingredient": "modern_industrialization:ethylene" } ], "fluid_outputs": [ { "amount": 700, - "fluid": "modern_industrialization:polyethylene" + "id": "modern_industrialization:polyethylene" } ], "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_lead.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_lead.json index 1628e6128..20e623446 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_lead.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/ethylene_lead.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:ethylene" + "ingredient": "modern_industrialization:ethylene" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:polyethylene" + "id": "modern_industrialization:polyethylene" } ], "item_inputs": [ { "amount": 4, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_chromium.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_chromium.json index a77a4ec2e..8f9cd2615 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_chromium.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_chromium.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:styrene_butadiene" + "ingredient": "modern_industrialization:styrene_butadiene" } ], "fluid_outputs": [ { "amount": 700, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "id": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_lead.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_lead.json index 4ca492c29..3ea7b7fec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_lead.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/styrene_butadiene_lead.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:styrene_butadiene" + "ingredient": "modern_industrialization:styrene_butadiene" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:styrene_butadiene_rubber" + "id": "modern_industrialization:styrene_butadiene_rubber" } ], "item_inputs": [ { "amount": 4, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_chromium.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_chromium.json index 67af90e5d..2f5bde39b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_chromium.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_chromium.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:vinyl_chloride" + "ingredient": "modern_industrialization:vinyl_chloride" } ], "fluid_outputs": [ { "amount": 700, - "fluid": "modern_industrialization:polyvinyl_chloride" + "id": "modern_industrialization:polyvinyl_chloride" } ], "item_inputs": [ { "amount": 1, - "tag": "c:tiny_dusts/chromium" + "ingredient": "#c:tiny_dusts/chromium" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_lead.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_lead.json index 08884132c..89ed1fbb3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_lead.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/polymerization/vinyl_chloride_lead.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 500, - "fluid": "modern_industrialization:vinyl_chloride" + "ingredient": "modern_industrialization:vinyl_chloride" } ], "fluid_outputs": [ { "amount": 300, - "fluid": "modern_industrialization:polyvinyl_chloride" + "id": "modern_industrialization:polyvinyl_chloride" } ], "item_inputs": [ { "amount": 4, - "tag": "c:tiny_dusts/lead" + "ingredient": "#c:tiny_dusts/lead" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/heavy_fuel.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/heavy_fuel.json index 2bf776500..f204be7e1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/heavy_fuel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/heavy_fuel.json @@ -5,17 +5,17 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:heavy_fuel" + "ingredient": "modern_industrialization:heavy_fuel" }, { "amount": 100, - "fluid": "modern_industrialization:steam" + "ingredient": "modern_industrialization:steam" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_heavy_fuel" + "id": "modern_industrialization:steam_cracked_heavy_fuel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/light_fuel.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/light_fuel.json index 23908115d..197e6c2f0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/light_fuel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/light_fuel.json @@ -5,17 +5,17 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:light_fuel" + "ingredient": "modern_industrialization:light_fuel" }, { "amount": 100, - "fluid": "modern_industrialization:steam" + "ingredient": "modern_industrialization:steam" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_light_fuel" + "id": "modern_industrialization:steam_cracked_light_fuel" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/naphtha.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/naphtha.json index 2d4f76b76..21052dd92 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/naphtha.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/steam_cracking/naphtha.json @@ -5,17 +5,17 @@ "fluid_inputs": [ { "amount": 1000, - "fluid": "modern_industrialization:naphtha" + "ingredient": "modern_industrialization:naphtha" }, { "amount": 100, - "fluid": "modern_industrialization:steam" + "ingredient": "modern_industrialization:steam" } ], "fluid_outputs": [ { "amount": 1000, - "fluid": "modern_industrialization:steam_cracked_naphtha" + "id": "modern_industrialization:steam_cracked_naphtha" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/crude_oil.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/crude_oil.json index 89ee9bf51..fd088e090 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/crude_oil.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/crude_oil.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 12000, - "fluid": "modern_industrialization:sulfuric_crude_oil" + "ingredient": "modern_industrialization:sulfuric_crude_oil" }, { "amount": 2000, - "fluid": "modern_industrialization:hydrogen" + "ingredient": "modern_industrialization:hydrogen" } ], "fluid_outputs": [ { "amount": 12000, - "fluid": "modern_industrialization:crude_oil" + "id": "modern_industrialization:crude_oil" }, { "amount": 2000, - "fluid": "modern_industrialization:sulfuric_acid" + "id": "modern_industrialization:sulfuric_acid" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/heavy_fuel.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/heavy_fuel.json index 7b0ed1282..b52c3d69d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/heavy_fuel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/heavy_fuel.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 12000, - "fluid": "modern_industrialization:sulfuric_heavy_fuel" + "ingredient": "modern_industrialization:sulfuric_heavy_fuel" }, { "amount": 2000, - "fluid": "modern_industrialization:hydrogen" + "ingredient": "modern_industrialization:hydrogen" } ], "fluid_outputs": [ { "amount": 12000, - "fluid": "modern_industrialization:heavy_fuel" + "id": "modern_industrialization:heavy_fuel" }, { "amount": 2000, - "fluid": "modern_industrialization:sulfuric_acid" + "id": "modern_industrialization:sulfuric_acid" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/light_fuel.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/light_fuel.json index 4aec1d2ac..0428e158b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/light_fuel.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/light_fuel.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 12000, - "fluid": "modern_industrialization:sulfuric_light_fuel" + "ingredient": "modern_industrialization:sulfuric_light_fuel" }, { "amount": 2000, - "fluid": "modern_industrialization:hydrogen" + "ingredient": "modern_industrialization:hydrogen" } ], "fluid_outputs": [ { "amount": 12000, - "fluid": "modern_industrialization:light_fuel" + "id": "modern_industrialization:light_fuel" }, { "amount": 2000, - "fluid": "modern_industrialization:sulfuric_acid" + "id": "modern_industrialization:sulfuric_acid" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/naphtha.json b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/naphtha.json index c340558fb..cc1f0921a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/naphtha.json +++ b/src/generated/resources/data/modern_industrialization/recipe/petrochem/sulfuric_purification/naphtha.json @@ -5,21 +5,21 @@ "fluid_inputs": [ { "amount": 12000, - "fluid": "modern_industrialization:sulfuric_naphtha" + "ingredient": "modern_industrialization:sulfuric_naphtha" }, { "amount": 2000, - "fluid": "modern_industrialization:hydrogen" + "ingredient": "modern_industrialization:hydrogen" } ], "fluid_outputs": [ { "amount": 12000, - "fluid": "modern_industrialization:naphtha" + "id": "modern_industrialization:naphtha" }, { "amount": 2000, - "fluid": "modern_industrialization:sulfuric_acid" + "id": "modern_industrialization:sulfuric_acid" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/aluminum_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/aluminum_drill.json new file mode 100644 index 000000000..10d81d7a4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/aluminum_drill.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:electronic_circuit", + "c": "modern_industrialization:electrum_cable", + "d": "modern_industrialization:aluminum_drill_head", + "g": "#c:gears/iron", + "m": "modern_industrialization:pump", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "gpd", + "mCp", + "cmg" + ], + "result": { + "count": 4, + "id": "modern_industrialization:aluminum_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/bronze_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/bronze_drill.json new file mode 100644 index 000000000..cabae016a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/bronze_drill.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "d": "modern_industrialization:bronze_drill_head", + "f": "#modern_industrialization:fluid_pipes", + "g": "#c:gears/iron", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + " d", + "gp ", + "fg " + ], + "result": { + "count": 4, + "id": "modern_industrialization:bronze_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/copper_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/copper_drill.json new file mode 100644 index 000000000..e1f076eaf --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/copper_drill.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "d": "modern_industrialization:copper_drill_head", + "f": "#modern_industrialization:fluid_pipes", + "g": "#c:gears/iron", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + " d", + "gp ", + "fg " + ], + "result": { + "count": 4, + "id": "modern_industrialization:copper_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/gold_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/gold_drill.json new file mode 100644 index 000000000..00573e51c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/gold_drill.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "c": "modern_industrialization:tin_cable", + "d": "modern_industrialization:gold_drill_head", + "g": "#c:gears/iron", + "m": "modern_industrialization:motor", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "gpd", + "mCp", + "cmg" + ], + "result": { + "count": 4, + "id": "modern_industrialization:gold_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill.json new file mode 100644 index 000000000..44532b9d7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:digital_circuit", + "P": "modern_industrialization:advanced_pump", + "c": "modern_industrialization:aluminum_cable", + "d": "modern_industrialization:stainless_steel_drill_head", + "f": "#modern_industrialization:fluid_pipes", + "g": "#c:gears/iron", + "m": "modern_industrialization:advanced_motor", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "gpd", + "mCf", + "cPg" + ], + "result": { + "count": 4, + "id": "modern_industrialization:stainless_steel_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/steel_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/steel_drill.json new file mode 100644 index 000000000..8331b92eb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/steel_drill.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:analog_circuit", + "c": "modern_industrialization:tin_cable", + "d": "modern_industrialization:steel_drill_head", + "g": "#c:gears/iron", + "m": "modern_industrialization:motor", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "gpd", + "mCp", + "cmg" + ], + "result": { + "count": 4, + "id": "modern_industrialization:steel_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/titanium_drill.json b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/titanium_drill.json new file mode 100644 index 000000000..a271b3406 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/quarry/drill/titanium_drill.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:processing_unit", + "c": "modern_industrialization:annealed_copper_cable", + "d": "modern_industrialization:titanium_drill_head", + "g": "#c:gears/iron", + "m": "modern_industrialization:large_advanced_motor", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "gpd", + "mCp", + "cmg" + ], + "result": { + "count": 4, + "id": "modern_industrialization:titanium_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/boiler.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/boiler.json new file mode 100644 index 000000000..2113baed4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/boiler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "#c:plates/bronze", + "B": "modern_industrialization:fire_clay_bricks", + "F": "minecraft:furnace", + "T": "modern_industrialization:bronze_tank" + }, + "pattern": [ + "#T#", + "#F#", + "BBB" + ], + "result": { + "id": "modern_industrialization:bronze_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/casing_pipe.json new file mode 100644 index 000000000..4fe42f5e7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/casing_pipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "modern_industrialization:bronze_machine_casing", + "p": "modern_industrialization:bronze_curved_plate" + }, + "pattern": [ + "p p", + "p#p", + "p p" + ], + "result": { + "count": 2, + "id": "modern_industrialization:bronze_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/compressor.json new file mode 100644 index 000000000..7f99cb443 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/compressor.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_machine_casing", + "F": "modern_industrialization:forge_hammer", + "G": "#c:gears/copper", + "p": "#modern_industrialization:fluid_pipes", + "r": "#c:rods/copper" + }, + "pattern": [ + "rFr", + "GCG", + "ppp" + ], + "result": { + "id": "modern_industrialization:bronze_compressor" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/cutting_machine.json new file mode 100644 index 000000000..c51d3ade7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/cutting_machine.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_machine_casing", + "G": "#c:gears/copper", + "d": "minecraft:diamond", + "g": "#c:glass_blocks", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "gdg", + "GCG", + "ppp" + ], + "result": { + "id": "modern_industrialization:bronze_cutting_machine" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/furnace.json new file mode 100644 index 000000000..931d50a70 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/furnace.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "#c:plates/bronze", + "B": "modern_industrialization:fire_clay_bricks", + "F": "minecraft:furnace" + }, + "pattern": [ + "###", + "#F#", + "BBB" + ], + "result": { + "id": "modern_industrialization:bronze_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/macerator.json new file mode 100644 index 000000000..e5bc65ba6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/macerator.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_machine_casing", + "G": "#c:gears/copper", + "d": "minecraft:diamond", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "dGd", + "GCG", + "ppp" + ], + "result": { + "id": "modern_industrialization:bronze_macerator" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/machine_casing.json new file mode 100644 index 000000000..719d1c7d8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "#c:gears/bronze", + "P": "#c:plates/bronze" + }, + "pattern": [ + "PPP", + "PGP", + "PPP" + ], + "result": { + "id": "modern_industrialization:bronze_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/mixer.json new file mode 100644 index 000000000..dec0990e8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/mixer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_machine_casing", + "G": "#c:gears/copper", + "g": "#c:glass_blocks", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:copper_rotor" + }, + "pattern": [ + "gGg", + "rCr", + "ppp" + ], + "result": { + "id": "modern_industrialization:bronze_mixer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/water_pump.json new file mode 100644 index 000000000..838572e95 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/bronze/water_pump.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_machine_casing", + "G": "#c:gears/copper", + "T": "modern_industrialization:bronze_tank", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:copper_rotor" + }, + "pattern": [ + "rTr", + "GCG", + "ppp" + ], + "result": { + "id": "modern_industrialization:bronze_water_pump" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json new file mode 100644 index 000000000..bf5478390 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "minecraft:water_bucket", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "ppp", + "pbp", + "ppp" + ], + "result": { + "count": 8, + "id": "modern_industrialization:fluid_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json new file mode 100644 index 000000000..498f2ac63 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "minecraft:water_bucket", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "ppp", + "pbp", + "ppp" + ], + "result": { + "count": 8, + "id": "modern_industrialization:item_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json new file mode 100644 index 000000000..bb959f424 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "minecraft:water_bucket", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "pb" + ], + "result": { + "id": "modern_industrialization:fluid_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json new file mode 100644 index 000000000..cf09f712c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "minecraft:water_bucket", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "pb" + ], + "result": { + "id": "modern_industrialization:item_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json new file mode 100644 index 000000000..e951e0ee5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 125, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#modern_industrialization:fluid_pipes" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:fluid_pipe" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json new file mode 100644 index 000000000..83c75f809 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 125, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#modern_industrialization:item_pipes" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:item_pipe" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json new file mode 100644 index 000000000..83225e863 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "minecraft:bricks", + "F": "minecraft:furnace" + }, + "pattern": [ + "BBB", + "BFB", + "BBB" + ], + "result": { + "id": "modern_industrialization:coke_oven" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json new file mode 100644 index 000000000..5eb47e39f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:furnace" + }, + { + "amount": 8, + "ingredient": "minecraft:bricks" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:coke_oven" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json new file mode 100644 index 000000000..1c0fe6789 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blast_furnace" + }, + { + "amount": 8, + "ingredient": "modern_industrialization:fire_clay_bricks" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "modern_industrialization:steam_blast_furnace" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json new file mode 100644 index 000000000..4b3c94e9b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "modern_industrialization:fire_clay_bricks", + "F": "minecraft:blast_furnace" + }, + "pattern": [ + "BBB", + "BFB", + "BBB" + ], + "result": { + "id": "modern_industrialization:steam_blast_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/fluid_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fluid_pipe.json new file mode 100644 index 000000000..65d843c95 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/fluid_pipe.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_curved_plate", + "P": "minecraft:glass_pane", + "r": "modern_industrialization:copper_rotor" + }, + "pattern": [ + "CCC", + "rPr", + "CCC" + ], + "result": { + "count": 16, + "id": "modern_industrialization:fluid_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/item_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/item_pipe.json new file mode 100644 index 000000000..6afb2508c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/item_pipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:bronze_curved_plate", + "G": "#c:gears/steel" + }, + "pattern": [ + "CCC", + "G G", + "CCC" + ], + "result": { + "count": 16, + "id": "modern_industrialization:item_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/boiler.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/boiler.json new file mode 100644 index 000000000..a6f8150a1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/boiler.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "#c:plates/steel", + "B": "modern_industrialization:fire_clay_bricks", + "F": "minecraft:furnace", + "T": "modern_industrialization:steel_tank" + }, + "pattern": [ + "#T#", + "#F#", + "BBB" + ], + "result": { + "id": "modern_industrialization:steel_boiler" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/casing_pipe.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/casing_pipe.json new file mode 100644 index 000000000..5565af3be --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/casing_pipe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "modern_industrialization:steel_machine_casing", + "p": "modern_industrialization:steel_curved_plate" + }, + "pattern": [ + "p p", + "p#p", + "p p" + ], + "result": { + "count": 2, + "id": "modern_industrialization:steel_machine_casing_pipe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/furnace.json new file mode 100644 index 000000000..3a2e4827a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/furnace.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "#c:plates/steel", + "B": "modern_industrialization:fire_clay_bricks", + "F": "minecraft:furnace" + }, + "pattern": [ + "###", + "#F#", + "BBB" + ], + "result": { + "id": "modern_industrialization:steel_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/machine_casing.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/machine_casing.json new file mode 100644 index 000000000..8a3c016ac --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/machine_casing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "#c:gears/steel", + "P": "#c:plates/steel" + }, + "pattern": [ + "PPP", + "PGP", + "PPP" + ], + "result": { + "id": "modern_industrialization:steel_machine_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/packer.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/packer.json new file mode 100644 index 000000000..56d4b1a7a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/packer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:steel_machine_casing", + "G": "#c:gears/bronze", + "P": "#modern_industrialization:item_pipes", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "PGP", + "GCG", + "ppp" + ], + "result": { + "id": "modern_industrialization:steel_packer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/quarry.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/quarry.json new file mode 100644 index 000000000..5df6c2bb9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/quarry.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:steel_machine_casing", + "G": "#c:gears/steel", + "L": "modern_industrialization:steel_large_plate", + "P": "modern_industrialization:invar_rotary_blade", + "p": "#modern_industrialization:item_pipes" + }, + "pattern": [ + "LpL", + "GCG", + "LPL" + ], + "result": { + "id": "modern_industrialization:steam_quarry" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/steel_upgrade.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/steel_upgrade.json new file mode 100644 index 000000000..229932003 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/steel_upgrade.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:steel_machine_casing", + "F": "modern_industrialization:fire_clay_bricks", + "G": "#c:gears/bronze", + "R": "modern_industrialization:bronze_rotor", + "p": "#modern_industrialization:fluid_pipes", + "r": "#c:rods/bronze" + }, + "pattern": [ + "rRr", + "GCG", + "pFp" + ], + "result": { + "count": 2, + "id": "modern_industrialization:steel_upgrade" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/unpacker.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/unpacker.json new file mode 100644 index 000000000..83c97ecde --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/unpacker.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:steel_machine_casing", + "G": "#c:gears/bronze", + "P": "#modern_industrialization:item_pipes", + "R": "#c:rods/bronze", + "p": "#modern_industrialization:fluid_pipes" + }, + "pattern": [ + "PGP", + "RCR", + "ppp" + ], + "result": { + "id": "modern_industrialization:steel_unpacker" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/wiremill.json b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/wiremill.json new file mode 100644 index 000000000..e38aa2a05 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/steam_age/steel/wiremill.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "G": "#c:gears/bronze", + "H": "modern_industrialization:steel_machine_casing", + "p": "#modern_industrialization:fluid_pipes", + "r": "modern_industrialization:bronze_rotor" + }, + "pattern": [ + "GpG", + "rHr", + "GpG" + ], + "result": { + "id": "modern_industrialization:steel_wiremill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/tools/config_card.json b/src/generated/resources/data/modern_industrialization/recipe/tools/config_card.json new file mode 100644 index 000000000..88ec876ff --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/tools/config_card.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "modern_industrialization:analog_circuit_board", + "c": "modern_industrialization:capacitor", + "g": "minecraft:glass_pane", + "i": "modern_industrialization:inductor", + "r": "modern_industrialization:resistor" + }, + "pattern": [ + "ggg", + "rcr", + "ibi" + ], + "result": { + "id": "modern_industrialization:config_card" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/tools/diesel_chainsaw.json b/src/generated/resources/data/modern_industrialization/recipe/tools/diesel_chainsaw.json new file mode 100644 index 000000000..e98648c92 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/tools/diesel_chainsaw.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": "modern_industrialization:large_motor", + "R": "modern_industrialization:rubber_sheet", + "r": "modern_industrialization:invar_rotary_blade", + "t": "modern_industrialization:aluminum_tank" + }, + "pattern": [ + " Rr", + "MrR", + "tM " + ], + "result": { + "id": "modern_industrialization:diesel_chainsaw" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/tools/diesel_mining_drill.json b/src/generated/resources/data/modern_industrialization/recipe/tools/diesel_mining_drill.json new file mode 100644 index 000000000..d5b89e038 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/tools/diesel_mining_drill.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "H": "modern_industrialization:aluminum_drill_head", + "M": "modern_industrialization:large_motor", + "P": "modern_industrialization:large_pump", + "c": "modern_industrialization:electronic_circuit", + "r": "modern_industrialization:invar_rotary_blade", + "t": "modern_industrialization:aluminum_tank" + }, + "pattern": [ + "crH", + "MPr", + "tMc" + ], + "result": { + "id": "modern_industrialization:diesel_mining_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json b/src/generated/resources/data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json new file mode 100644 index 000000000..d99383193 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smithing_transform", + "addition": "minecraft:netherite_ingot", + "base": "modern_industrialization:diamond_hammer", + "result": { + "id": "modern_industrialization:netherite_hammer" + }, + "template": "minecraft:netherite_upgrade_smithing_template" +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/tools/steam_mining_drill.json b/src/generated/resources/data/modern_industrialization/recipe/tools/steam_mining_drill.json new file mode 100644 index 000000000..6d626771a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/tools/steam_mining_drill.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": "modern_industrialization:copper_drill_head", + "P": "modern_industrialization:iron_large_plate", + "b": "minecraft:bucket", + "d": "minecraft:diamond", + "f": "minecraft:furnace" + }, + "pattern": [ + "fdd", + "PDd", + "bPf" + ], + "result": { + "id": "modern_industrialization:steam_mining_drill" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/tools/wrench.json b/src/generated/resources/data/modern_industrialization/recipe/tools/wrench.json new file mode 100644 index 000000000..c53eedb78 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/tools/wrench.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "b": "#c:plates/bronze" + }, + "pattern": [ + "b b", + "bbb", + " b " + ], + "result": { + "id": "modern_industrialization:wrench" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/boiler.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/boiler.json index ea4b32689..c69e44551 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/boiler.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_boiler" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_boiler", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_boiler" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/compressor.json index 5bc3a3db9..38d4f5af3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/compressor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/compressor.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_compressor" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_compressor", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_compressor" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/cutting_machine.json index 69211e7b5..170e36a71 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/cutting_machine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/cutting_machine.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_cutting_machine" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_cutting_machine", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_cutting_machine" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/furnace.json index 55b3dc82a..1af1612f6 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/furnace.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_furnace" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_furnace", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_furnace" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/macerator.json index 048a4c3db..f585a4793 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/macerator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/macerator.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_macerator" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_macerator", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_macerator" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/mixer.json index f15cd23dc..1ce9cb668 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/mixer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/mixer.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_mixer" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_mixer", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_mixer" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/water_pump.json index 5377e0e4b..edf9ed254 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/water_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/craft/steel/water_pump.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "modern_industrialization:bronze_water_pump" - }, - { - "item": "modern_industrialization:steel_upgrade" - } + "modern_industrialization:bronze_water_pump", + "modern_industrialization:steel_upgrade" ], "result": { - "count": 1, "id": "modern_industrialization:steel_water_pump" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/boots.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/boots.json index 36f6cb149..ec7fa0c99 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/boots.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/boots.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:netherite_boots" + "ingredient": "minecraft:netherite_boots" }, { "amount": 1, - "item": "modern_industrialization:quantum_upgrade" + "ingredient": "modern_industrialization:quantum_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_boots" + "id": "modern_industrialization:quantum_boots" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/chestplate.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/chestplate.json index dfdbe1043..789b09ba1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/chestplate.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/chestplate.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:netherite_chestplate" + "ingredient": "minecraft:netherite_chestplate" }, { "amount": 1, - "item": "modern_industrialization:quantum_upgrade" + "ingredient": "modern_industrialization:quantum_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_chestplate" + "id": "modern_industrialization:quantum_chestplate" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/helmet.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/helmet.json index 40a6dcf47..7cb58f187 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/helmet.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/helmet.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:netherite_helmet" + "ingredient": "minecraft:netherite_helmet" }, { "amount": 1, - "item": "modern_industrialization:quantum_upgrade" + "ingredient": "modern_industrialization:quantum_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_helmet" + "id": "modern_industrialization:quantum_helmet" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/leggings.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/leggings.json index 3c0e91806..9f64297e0 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/leggings.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/leggings.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:netherite_leggings" + "ingredient": "minecraft:netherite_leggings" }, { "amount": 1, - "item": "modern_industrialization:quantum_upgrade" + "ingredient": "modern_industrialization:quantum_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_leggings" + "id": "modern_industrialization:quantum_leggings" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/sword.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/sword.json index 48faf87be..5e97f7475 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/sword.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/quantum/sword.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:netherite_sword" + "ingredient": "minecraft:netherite_sword" }, { "amount": 1, - "item": "modern_industrialization:quantum_upgrade" + "ingredient": "modern_industrialization:quantum_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:quantum_sword" + "id": "modern_industrialization:quantum_sword" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/boiler.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/boiler.json index 357cc8779..ea01ae89e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/boiler.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/boiler.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_boiler" + "ingredient": "modern_industrialization:bronze_boiler" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_boiler" + "id": "modern_industrialization:steel_boiler" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/compressor.json index 1f959876e..00a5ce886 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/compressor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/compressor.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_compressor" + "ingredient": "modern_industrialization:bronze_compressor" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_compressor" + "id": "modern_industrialization:steel_compressor" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/cutting_machine.json index 8852cee08..f8116a95a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/cutting_machine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/cutting_machine.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_cutting_machine" + "ingredient": "modern_industrialization:bronze_cutting_machine" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_cutting_machine" + "id": "modern_industrialization:steel_cutting_machine" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/furnace.json index 266cc8e9b..304aade0a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/furnace.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/furnace.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_furnace" + "ingredient": "modern_industrialization:bronze_furnace" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_furnace" + "id": "modern_industrialization:steel_furnace" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/macerator.json index ef72d5de3..218c7221e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/macerator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/macerator.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_macerator" + "ingredient": "modern_industrialization:bronze_macerator" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_macerator" + "id": "modern_industrialization:steel_macerator" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/mixer.json index b8cf6ded2..8c2fdd905 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/mixer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/mixer.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_mixer" + "ingredient": "modern_industrialization:bronze_mixer" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_mixer" + "id": "modern_industrialization:steel_mixer" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/water_pump.json index 7456ee094..1e14882c5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/water_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/packer/steel/water_pump.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_water_pump" + "ingredient": "modern_industrialization:bronze_water_pump" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "ingredient": "modern_industrialization:steel_upgrade" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:steel_water_pump" + "id": "modern_industrialization:steel_water_pump" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/compressor.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/compressor.json index 8021aaae8..1aa43ac8c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/compressor.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/compressor.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_compressor" + "ingredient": "modern_industrialization:steel_compressor" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_compressor" + "id": "modern_industrialization:bronze_compressor" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "id": "modern_industrialization:steel_upgrade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/cutting_machine.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/cutting_machine.json index a4b4b23cf..6b95e3c37 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/cutting_machine.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/cutting_machine.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_cutting_machine" + "ingredient": "modern_industrialization:steel_cutting_machine" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_cutting_machine" + "id": "modern_industrialization:bronze_cutting_machine" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "id": "modern_industrialization:steel_upgrade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/macerator.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/macerator.json index d6487e0eb..d47cbf6da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/macerator.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/macerator.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_macerator" + "ingredient": "modern_industrialization:steel_macerator" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_macerator" + "id": "modern_industrialization:bronze_macerator" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "id": "modern_industrialization:steel_upgrade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/mixer.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/mixer.json index 66fe2b28a..168e8311d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/mixer.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/mixer.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_mixer" + "ingredient": "modern_industrialization:steel_mixer" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_mixer" + "id": "modern_industrialization:bronze_mixer" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "id": "modern_industrialization:steel_upgrade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/water_pump.json b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/water_pump.json index c42802079..c8dcdf4fd 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/water_pump.json +++ b/src/generated/resources/data/modern_industrialization/recipe/upgrade/unpacker/steel/water_pump.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "modern_industrialization:steel_water_pump" + "ingredient": "modern_industrialization:steel_water_pump" } ], "item_outputs": [ { "amount": 1, - "item": "modern_industrialization:bronze_water_pump" + "id": "modern_industrialization:bronze_water_pump" }, { "amount": 1, - "item": "modern_industrialization:steel_upgrade" + "id": "modern_industrialization:steel_upgrade" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json new file mode 100644 index 000000000..167ea97e6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 6, + "ingredient": "#minecraft:planks" + }, + { + "amount": 2, + "ingredient": "#minecraft:wooden_slabs" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:barrel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json new file mode 100644 index 000000000..3948385a0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json @@ -0,0 +1,22 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 8, + "ingredient": "#minecraft:planks" + }, + { + "amount": 1, + "ingredient": "minecraft:chest", + "probability": 0.0 + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:chest" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json new file mode 100644 index 000000000..ebea1a37a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 5, + "ingredient": "#c:plates/steel" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:motor" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:hopper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json new file mode 100644 index 000000000..6156e10c4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:creosote" + } + ], + "item_inputs": [ + { + "amount": 6, + "ingredient": "#c:rods/gold" + }, + { + "amount": 1, + "ingredient": "minecraft:stick" + }, + { + "amount": 1, + "ingredient": "minecraft:redstone" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:powered_rail" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json new file mode 100644 index 000000000..4ca4621a9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json @@ -0,0 +1,27 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:creosote" + } + ], + "item_inputs": [ + { + "amount": 6, + "ingredient": "#c:rods/steel" + }, + { + "amount": 1, + "ingredient": "minecraft:stick" + } + ], + "item_outputs": [ + { + "amount": 16, + "id": "minecraft:rail" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json new file mode 100644 index 000000000..f4ea291f2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:assembler", + "duration": 200, + "eu": 8, + "item_inputs": [ + { + "amount": 5, + "ingredient": "minecraft:prismarine_crystals" + }, + { + "amount": 4, + "ingredient": "minecraft:prismarine_shard" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:sea_lantern" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/blast_furnace.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/blast_furnace.json new file mode 100644 index 000000000..a3ac65dcd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/blast_furnace.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "f": "minecraft:furnace", + "p": "#c:plates/steel", + "s": "minecraft:smooth_stone" + }, + "pattern": [ + "ppp", + "pfp", + "sss" + ], + "result": { + "count": 2, + "id": "minecraft:blast_furnace" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json new file mode 100644 index 000000000..158aac5ad --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:centrifuge", + "duration": 600, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:lava" + } + ], + "item_outputs": [ + { + "amount": 17, + "id": "modern_industrialization:sulfur_dust" + }, + { + "amount": 11, + "id": "modern_industrialization:copper_nugget" + }, + { + "amount": 3, + "id": "modern_industrialization:aluminum_nugget", + "probability": 0.5 + }, + { + "amount": 1, + "id": "modern_industrialization:chromium_nugget", + "probability": 0.25 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json new file mode 100644 index 000000000..b3c1ae511 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "x": "modern_industrialization:iron_ring" + }, + "pattern": [ + "x x", + "x x" + ], + "result": { + "id": "minecraft:chainmail_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json new file mode 100644 index 000000000..0a34d1332 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "x": "modern_industrialization:iron_ring" + }, + "pattern": [ + "x x", + "xxx", + "xxx" + ], + "result": { + "id": "minecraft:chainmail_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json new file mode 100644 index 000000000..4d32c9ba4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "x": "modern_industrialization:iron_ring" + }, + "pattern": [ + "xxx", + "x x" + ], + "result": { + "id": "minecraft:chainmail_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json new file mode 100644 index 000000000..90487cb10 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "x": "modern_industrialization:iron_ring" + }, + "pattern": [ + "xxx", + "x x", + "x x" + ], + "result": { + "id": "minecraft:chainmail_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chains.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chains.json new file mode 100644 index 000000000..95409d525 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chains.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "R": "modern_industrialization:steel_ring" + }, + "pattern": [ + " R ", + " R ", + " R " + ], + "result": { + "count": 6, + "id": "minecraft:iron_chain" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json new file mode 100644 index 000000000..4c3ff9c72 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json @@ -0,0 +1,31 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 400, + "eu": 4, + "fluid_inputs": [ + { + "amount": 250, + "ingredient": "minecraft:water" + }, + { + "amount": 500, + "ingredient": "modern_industrialization:sodium_hydroxide" + } + ], + "item_inputs": [ + { + "amount": 4, + "ingredient": "#c:dusts/quartz" + }, + { + "amount": 1, + "ingredient": "#c:tiny_dusts/iron" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:amethyst_shard" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json new file mode 100644 index 000000000..f1bf57060 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json @@ -0,0 +1,45 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 6000, + "eu": 2, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 6000, + "id": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:brain_coral_block" + }, + { + "amount": 4, + "ingredient": "minecraft:bone_meal" + }, + { + "amount": 4, + "ingredient": "#c:dusts/salt" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:brain_coral_block" + }, + { + "amount": 2, + "id": "minecraft:brain_coral" + }, + { + "amount": 2, + "id": "minecraft:brain_coral_fan" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json new file mode 100644 index 000000000..ebcfc80fc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json @@ -0,0 +1,45 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 6000, + "eu": 2, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 6000, + "id": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:bubble_coral_block" + }, + { + "amount": 4, + "ingredient": "minecraft:bone_meal" + }, + { + "amount": 4, + "ingredient": "#c:dusts/salt" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:bubble_coral_block" + }, + { + "amount": 2, + "id": "minecraft:bubble_coral_fan" + }, + { + "amount": 2, + "id": "minecraft:bubble_coral" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json new file mode 100644 index 000000000..8ab73df43 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json @@ -0,0 +1,45 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 6000, + "eu": 2, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 6000, + "id": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:fire_coral_block" + }, + { + "amount": 4, + "ingredient": "minecraft:bone_meal" + }, + { + "amount": 4, + "ingredient": "#c:dusts/salt" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:fire_coral_block" + }, + { + "amount": 2, + "id": "minecraft:fire_coral_fan" + }, + { + "amount": 2, + "id": "minecraft:fire_coral" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json new file mode 100644 index 000000000..9aa52a631 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json @@ -0,0 +1,45 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 6000, + "eu": 2, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 6000, + "id": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:horn_coral_block" + }, + { + "amount": 4, + "ingredient": "minecraft:bone_meal" + }, + { + "amount": 4, + "ingredient": "#c:dusts/salt" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:horn_coral_block" + }, + { + "amount": 2, + "id": "minecraft:horn_coral_fan" + }, + { + "amount": 2, + "id": "minecraft:horn_coral" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json new file mode 100644 index 000000000..e68296819 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 100, + "eu": 8, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "modern_industrialization:oxygen" + } + ], + "item_inputs": [ + { + "amount": 5, + "ingredient": "minecraft:rotten_flesh" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:leather" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json new file mode 100644 index 000000000..a1e6c39b4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json @@ -0,0 +1,39 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 400, + "eu": 4, + "fluid_inputs": [ + { + "amount": 4000, + "ingredient": "modern_industrialization:hydrogen" + }, + { + "amount": 4000, + "ingredient": "modern_industrialization:sodium_hydroxide" + }, + { + "amount": 250, + "ingredient": "modern_industrialization:chlorine" + } + ], + "item_inputs": [ + { + "amount": 4, + "ingredient": "#c:dusts/quartz" + }, + { + "amount": 3, + "ingredient": "#c:tiny_dusts/beryllium" + }, + { + "amount": 2, + "ingredient": "#c:tiny_dusts/aluminum" + } + ], + "item_outputs": [ + { + "amount": 16, + "id": "minecraft:prismarine_crystals" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json new file mode 100644 index 000000000..330946a7d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json @@ -0,0 +1,45 @@ +{ + "type": "modern_industrialization:chemical_reactor", + "duration": 6000, + "eu": 2, + "fluid_inputs": [ + { + "amount": 9000, + "ingredient": "minecraft:water" + } + ], + "fluid_outputs": [ + { + "amount": 6000, + "id": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:tube_coral_block" + }, + { + "amount": 4, + "ingredient": "minecraft:bone_meal" + }, + { + "amount": 4, + "ingredient": "#c:dusts/salt" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:tube_coral_block" + }, + { + "amount": 2, + "id": "minecraft:tube_coral_fan" + }, + { + "amount": 2, + "id": "minecraft:tube_coral" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/copper_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/copper_block.json index 310fe6234..bed3afbae 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/copper_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/copper_block.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:copper_block" + "ingredient": "minecraft:copper_block" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_copper_block" + "id": "minecraft:waxed_copper_block" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper.json index 3208dbd12..b41e0f0d1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:cut_copper" + "ingredient": "minecraft:cut_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_cut_copper" + "id": "minecraft:waxed_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_slab.json index 1b5d34d04..a7e0032f3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_slab.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:cut_copper_slab" + "ingredient": "minecraft:cut_copper_slab" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_cut_copper_slab" + "id": "minecraft:waxed_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_stairs.json index 5fa844109..1224cb2b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/cut_copper_stairs.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:cut_copper_stairs" + "ingredient": "minecraft:cut_copper_stairs" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_cut_copper_stairs" + "id": "minecraft:waxed_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_copper.json index a7e2dd10c..8ba512fb9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_copper" + "ingredient": "minecraft:exposed_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_copper" + "id": "minecraft:waxed_exposed_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper.json index 9316455ec..578aadfa3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper" + "ingredient": "minecraft:exposed_cut_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper" + "id": "minecraft:waxed_exposed_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_slab.json index b4c8645a6..70549a5ed 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_slab.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper_slab" + "ingredient": "minecraft:exposed_cut_copper_slab" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper_slab" + "id": "minecraft:waxed_exposed_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_stairs.json index 2c2d570f4..c531f6b49 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/exposed_cut_copper_stairs.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper_stairs" + "ingredient": "minecraft:exposed_cut_copper_stairs" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper_stairs" + "id": "minecraft:waxed_exposed_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_copper.json index 2910fc3e7..de56bb163 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:oxidized_copper" + "ingredient": "minecraft:oxidized_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_copper" + "id": "minecraft:waxed_oxidized_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper.json index 91e4a9606..77bdcd0f4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:oxidized_cut_copper" + "ingredient": "minecraft:oxidized_cut_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_cut_copper" + "id": "minecraft:waxed_oxidized_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_slab.json index e5068bea5..f49fdbb2a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_slab.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:oxidized_cut_copper_slab" + "ingredient": "minecraft:oxidized_cut_copper_slab" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_cut_copper_slab" + "id": "minecraft:waxed_oxidized_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_stairs.json index 597f07189..28d536588 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/oxidized_cut_copper_stairs.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:oxidized_cut_copper_stairs" + "ingredient": "minecraft:oxidized_cut_copper_stairs" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_cut_copper_stairs" + "id": "minecraft:waxed_oxidized_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_copper.json index 4b98a0a83..610bb2804 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_copper" + "ingredient": "minecraft:weathered_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_copper" + "id": "minecraft:waxed_weathered_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper.json index a5f1fd236..0de238362 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper" + "ingredient": "minecraft:weathered_cut_copper" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper" + "id": "minecraft:waxed_weathered_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_slab.json index 4eeb9214b..7b1187a4f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_slab.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper_slab" + "ingredient": "minecraft:weathered_cut_copper_slab" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper_slab" + "id": "minecraft:waxed_weathered_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_stairs.json index aa1cc8de3..5bec34c9f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/waxing/weathered_cut_copper_stairs.json @@ -5,17 +5,17 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper_stairs" + "ingredient": "minecraft:weathered_cut_copper_stairs" }, { "amount": 1, - "item": "modern_industrialization:wax" + "ingredient": "modern_industrialization:wax" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper_stairs" + "id": "minecraft:waxed_weathered_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json new file mode 100644 index 000000000..29dcaf80a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "minecraft:clay" + }, + "pattern": [ + "C" + ], + "result": { + "count": 4, + "id": "minecraft:clay_ball" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json new file mode 100644 index 000000000..d61755269 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:compressor", + "duration": 6000, + "eu": 4, + "item_inputs": [ + { + "amount": 16, + "ingredient": "minecraft:coal_block" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:diamond" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json new file mode 100644 index 000000000..d9ec31b17 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:compressor", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:glass_blocks" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:glass_bottle" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json new file mode 100644 index 000000000..00d2572c3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:compressor", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:mud" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:packed_mud" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json new file mode 100644 index 000000000..f4f49ab25 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:compressor", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:sugar_cane" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:paper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json new file mode 100644 index 000000000..a86dbbce5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:cutting_machine", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:lubricant" + } + ], + "item_inputs": [ + { + "amount": 6, + "ingredient": "minecraft:glass" + } + ], + "item_outputs": [ + { + "amount": 16, + "id": "minecraft:glass_pane" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json new file mode 100644 index 000000000..6b13d6423 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:cutting_machine", + "duration": 50, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:lubricant" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "#minecraft:planks" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:stick" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json new file mode 100644 index 000000000..d75f7fe88 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "l": "#minecraft:logs" + }, + "pattern": [ + "lll", + "l l", + "lll" + ], + "result": { + "count": 4, + "id": "minecraft:chest" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json new file mode 100644 index 000000000..b201a21cb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json @@ -0,0 +1,9 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 45, + "ingredient": "minecraft:bone_block", + "result": { + "count": 9, + "id": "minecraft:bone_meal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json new file mode 100644 index 000000000..e6a51861a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json @@ -0,0 +1,9 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 30, + "ingredient": "minecraft:bone", + "result": { + "count": 6, + "id": "minecraft:bone_meal" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json new file mode 100644 index 000000000..ca6041cd8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json @@ -0,0 +1,8 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 10, + "ingredient": "minecraft:cobblestone", + "result": { + "id": "minecraft:gravel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json new file mode 100644 index 000000000..cea3b5e08 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json @@ -0,0 +1,8 @@ +{ + "type": "modern_industrialization:forge_hammer", + "damage": 10, + "ingredient": "minecraft:gravel", + "result": { + "id": "minecraft:sand" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json new file mode 100644 index 000000000..ac9ca0fc0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 1, + "item_inputs": [ + { + "amount": 64, + "ingredient": "#c:storage_blocks/gold" + }, + { + "amount": 1, + "ingredient": "minecraft:apple" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:industrial_tnt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:enchanted_golden_apple" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json new file mode 100644 index 000000000..85e1b5a16 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:implosion_compressor", + "duration": 10, + "eu": 64, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:singularity" + }, + { + "amount": 1, + "ingredient": "minecraft:lava_bucket" + }, + { + "amount": 64, + "ingredient": "modern_industrialization:nuke" + }, + { + "amount": 64, + "ingredient": "modern_industrialization:nuke" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:nether_star" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json new file mode 100644 index 000000000..5172ce306 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "minecraft:stick", + "X": "modern_industrialization:lignite_coal" + }, + "pattern": [ + "X", + "#" + ], + "result": { + "count": 4, + "id": "minecraft:torch" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json new file mode 100644 index 000000000..fc3cb1210 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blaze_rod" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:blaze_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json new file mode 100644 index 000000000..f3121a20e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#c:dusts/lapis" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json new file mode 100644 index 000000000..60d2e5713 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:bone_block" + } + ], + "item_outputs": [ + { + "amount": 9, + "id": "minecraft:bone_meal" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json new file mode 100644 index 000000000..3f934f893 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:bone" + } + ], + "item_outputs": [ + { + "amount": 6, + "id": "minecraft:bone_meal" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json new file mode 100644 index 000000000..f7ba71f16 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:clay" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:clay_ball" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json new file mode 100644 index 000000000..d067d10b3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:deepslate" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:cobbled_deepslate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json new file mode 100644 index 000000000..73084b352 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:gilded_blackstone" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:gold_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json new file mode 100644 index 000000000..fa9c1bddc --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:glowstone" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:glowstone_dust" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json new file mode 100644 index 000000000..603239755 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:cobblestone" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:gravel" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json new file mode 100644 index 000000000..efd481c48 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 800, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:ancient_debris" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:netherite_scrap" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json new file mode 100644 index 000000000..afe23f380 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:red_sandstone" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:red_sand" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json new file mode 100644 index 000000000..fe830bf4c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:gravel" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:sand" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json new file mode 100644 index 000000000..aa51547d8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:sandstone" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:sand" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/stone_to_cobblestone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/stone_to_cobblestone.json index d4b97917d..c9343f079 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/stone_to_cobblestone.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/stone_to_cobblestone.json @@ -5,13 +5,13 @@ "item_inputs": [ { "amount": 1, - "item": "minecraft:stone" + "ingredient": "minecraft:stone" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:cobblestone" + "id": "minecraft:cobblestone" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json new file mode 100644 index 000000000..100f34e7c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "#minecraft:wool" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:string" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json new file mode 100644 index 000000000..e9d15d887 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:sugar_cane" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "minecraft:sugar" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json new file mode 100644 index 000000000..48bf54d2b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:andesite" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:andesite" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json new file mode 100644 index 000000000..6b84ca82b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:calcite" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:calcite" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json new file mode 100644 index 000000000..2fe841aa3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:sand" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:clay" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json new file mode 100644 index 000000000..0fe8cde7d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:dirt" + }, + { + "amount": 1, + "ingredient": "minecraft:gravel" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:coarse_dirt" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json new file mode 100644 index 000000000..269e24dd3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:cobbled_deepslate" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:cobbled_deepslate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json new file mode 100644 index 000000000..598c94ff9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:cobblestone" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:cobblestone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json new file mode 100644 index 000000000..4d827bbfa --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:black_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:black_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json new file mode 100644 index 000000000..2df984842 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:black_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:black_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json new file mode 100644 index 000000000..66a974ba9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blue_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:blue_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json new file mode 100644 index 000000000..a4175d2f1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:blue_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:blue_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json new file mode 100644 index 000000000..ced3171c4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:brown_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:brown_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json new file mode 100644 index 000000000..1b9bd5d24 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:brown_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:brown_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json new file mode 100644 index 000000000..1f139555e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:cyan_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:cyan_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json new file mode 100644 index 000000000..656602af7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:cyan_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:cyan_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json new file mode 100644 index 000000000..7ecd6677b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:gray_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:gray_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json new file mode 100644 index 000000000..6df4ce71f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:gray_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:gray_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json new file mode 100644 index 000000000..35f030b22 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:green_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:green_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json new file mode 100644 index 000000000..6a92e6f18 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:green_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:green_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json new file mode 100644 index 000000000..96a04de04 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:light_blue_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:light_blue_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json new file mode 100644 index 000000000..2d4da2096 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:light_blue_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:light_blue_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json new file mode 100644 index 000000000..4b474f309 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:light_gray_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:light_gray_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json new file mode 100644 index 000000000..cfe7c57f0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:light_gray_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:light_gray_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json new file mode 100644 index 000000000..7e652b2b7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:lime_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:lime_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json new file mode 100644 index 000000000..e39e338bd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:lime_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:lime_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json new file mode 100644 index 000000000..a2637d166 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:magenta_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:magenta_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json new file mode 100644 index 000000000..789910823 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:magenta_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:magenta_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json new file mode 100644 index 000000000..18de7b078 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:orange_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:orange_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json new file mode 100644 index 000000000..baa2bd006 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:orange_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:orange_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json new file mode 100644 index 000000000..fc0ad945c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:pink_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:pink_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json new file mode 100644 index 000000000..a2d65e597 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:pink_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:pink_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json new file mode 100644 index 000000000..e490546a4 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:purple_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:purple_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json new file mode 100644 index 000000000..4efc93844 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:purple_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:purple_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json new file mode 100644 index 000000000..760f6e129 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:red_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:red_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json new file mode 100644 index 000000000..8c8533971 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:red_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:red_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json new file mode 100644 index 000000000..460ce345e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:white_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:white_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json new file mode 100644 index 000000000..98ed9ebec --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:white_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json new file mode 100644 index 000000000..afc28feb3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:yellow_concrete_powder" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:yellow_concrete" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json new file mode 100644 index 000000000..32197d067 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + }, + { + "amount": 4, + "ingredient": "minecraft:gravel" + }, + { + "amount": 1, + "ingredient": "minecraft:yellow_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:yellow_concrete_powder" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json new file mode 100644 index 000000000..732c84cec --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 8, + "ingredient": "minecraft:prismarine" + }, + { + "amount": 1, + "ingredient": "minecraft:black_dye" + } + ], + "item_outputs": [ + { + "amount": 8, + "id": "minecraft:dark_prismarine" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json new file mode 100644 index 000000000..7b89b1614 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:diorite" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:diorite" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json new file mode 100644 index 000000000..d9b7aa26f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 600, + "eu": 2, + "fluid_inputs": [ + { + "amount": 6000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:coarse_dirt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:dirt" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json new file mode 100644 index 000000000..6940362fe --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:dripstone_block" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:dripstone_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json new file mode 100644 index 000000000..6014512c5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 50, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:coal_dust" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json new file mode 100644 index 000000000..b6796aea6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:ink_sac" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json new file mode 100644 index 000000000..70c9fdf96 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:wither_rose" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:black_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json new file mode 100644 index 000000000..45156f4e7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:cornflower" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json new file mode 100644 index 000000000..17161726f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:cocoa_beans" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:brown_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json new file mode 100644 index 000000000..ab23a1c17 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:green_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:blue_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:cyan_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json new file mode 100644 index 000000000..7f3443be9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:black_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json new file mode 100644 index 000000000..5f79bf2fb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blue_orchid" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:light_blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json new file mode 100644 index 000000000..4fd6bd384 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blue_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:light_blue_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json new file mode 100644 index 000000000..9812aee1b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:azure_bluet" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json new file mode 100644 index 000000000..04193b340 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:oxeye_daisy" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json new file mode 100644 index 000000000..02057c41f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:white_tulip" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json new file mode 100644 index 000000000..92ad8fa7f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:gray_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json new file mode 100644 index 000000000..1fe2f7523 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:black_dye" + }, + { + "amount": 2, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "minecraft:light_gray_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json new file mode 100644 index 000000000..0ab8ba15f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:green_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:lime_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json new file mode 100644 index 000000000..047f0b350 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:allium" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:magenta_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json new file mode 100644 index 000000000..abc649179 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:lilac" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:magenta_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json new file mode 100644 index 000000000..8018bb9ae --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:purple_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:pink_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:magenta_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json new file mode 100644 index 000000000..af2107b0e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blue_dye" + }, + { + "amount": 2, + "ingredient": "minecraft:red_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:magenta_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json new file mode 100644 index 000000000..1a44afe50 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blue_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:red_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:pink_dye" + } + ], + "item_outputs": [ + { + "amount": 3, + "id": "minecraft:magenta_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json new file mode 100644 index 000000000..cab1e271f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:orange_tulip" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json new file mode 100644 index 000000000..f9213eeb9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:yellow_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:red_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:orange_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json new file mode 100644 index 000000000..9c02e64be --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:peony" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json new file mode 100644 index 000000000..336165004 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:pink_tulip" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json new file mode 100644 index 000000000..6d1caabe1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:red_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:white_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:pink_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json new file mode 100644 index 000000000..263af7cce --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:red_dye" + }, + { + "amount": 1, + "ingredient": "minecraft:blue_dye" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:purple_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json new file mode 100644 index 000000000..ffabcfc68 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:beetroot" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json new file mode 100644 index 000000000..53e72f0d9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:poppy" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json new file mode 100644 index 000000000..7f51fe94e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:rose_bush" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json new file mode 100644 index 000000000..1aef290af --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:red_tulip" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:red_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json new file mode 100644 index 000000000..8d480d581 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:bone_meal" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:white_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json new file mode 100644 index 000000000..224f37668 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:lily_of_the_valley" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:white_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json new file mode 100644 index 000000000..40c16aa96 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:sunflower" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:yellow_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json new file mode 100644 index 000000000..8ab0481f8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:macerator", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:dandelion" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:yellow_dye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json new file mode 100644 index 000000000..9eddc5f44 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json @@ -0,0 +1,28 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 200, + "eu": 8, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:heavy_water" + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:end_stone" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:end_stone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json new file mode 100644 index 000000000..65d5bcb3e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:spider_eye" + }, + { + "amount": 1, + "ingredient": "minecraft:brown_mushroom" + }, + { + "amount": 1, + "ingredient": "minecraft:sugar" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:fermented_spider_eye" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json new file mode 100644 index 000000000..acdcdfc76 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json @@ -0,0 +1,29 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:water", + "probability": 0.0 + }, + { + "amount": 1, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:granite" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:granite" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json new file mode 100644 index 000000000..c55880049 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json @@ -0,0 +1,24 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 1250, + "eu": 32, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:lava", + "probability": 0.0 + } + ], + "fluid_outputs": [ + { + "amount": 50, + "id": "minecraft:lava" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:stone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json new file mode 100644 index 000000000..223268149 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:dirt" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:mud" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json new file mode 100644 index 000000000..74b5f8463 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 200, + "eu": 16, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:netherite_scrap" + }, + { + "amount": 4, + "ingredient": "minecraft:gold_ingot" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:netherite_ingot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json new file mode 100644 index 000000000..846d89966 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json @@ -0,0 +1,23 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "fluid_inputs": [ + { + "amount": 100, + "ingredient": "minecraft:water" + } + ], + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:wood_pulp" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:paper" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json new file mode 100644 index 000000000..83daf8991 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:redstone" + }, + { + "amount": 1, + "ingredient": "minecraft:sand" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:red_sand" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json new file mode 100644 index 000000000..ccdef49cd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:mixer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "#minecraft:sand" + }, + { + "amount": 5, + "ingredient": "minecraft:gunpowder" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:tnt" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/copper_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/copper_block.json index 8a573ca4f..89973b55d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/copper_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/copper_block.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:copper_block" + "ingredient": "minecraft:copper_block" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:exposed_copper" + "id": "minecraft:exposed_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper.json index eed67509f..7eab14e8b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cut_copper" + "ingredient": "minecraft:cut_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper" + "id": "minecraft:exposed_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_slab.json index d69a5fe7c..a38b27b23 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_slab.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cut_copper_slab" + "ingredient": "minecraft:cut_copper_slab" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper_slab" + "id": "minecraft:exposed_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_stairs.json index 61aca56a6..5ffc081db 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/cut_copper_stairs.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:cut_copper_stairs" + "ingredient": "minecraft:cut_copper_stairs" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper_stairs" + "id": "minecraft:exposed_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_copper.json index 2dc244f26..68da067e4 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_copper" + "ingredient": "minecraft:exposed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:weathered_copper" + "id": "minecraft:weathered_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper.json index 2e9234b84..12d93d396 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper" + "ingredient": "minecraft:exposed_cut_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper" + "id": "minecraft:weathered_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_slab.json index 6680f87fb..103ee4eee 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_slab.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper_slab" + "ingredient": "minecraft:exposed_cut_copper_slab" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper_slab" + "id": "minecraft:weathered_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_stairs.json index 43f93238d..07c68c983 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/exposed_cut_copper_stairs.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:exposed_cut_copper_stairs" + "ingredient": "minecraft:exposed_cut_copper_stairs" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper_stairs" + "id": "minecraft:weathered_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_copper_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_copper_block.json index e29693e72..64d9e9d9c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_copper_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_copper_block.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_copper_block" + "ingredient": "minecraft:waxed_copper_block" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_copper" + "id": "minecraft:waxed_exposed_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper.json index 441ac0d93..c8a31f78c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_cut_copper" + "ingredient": "minecraft:waxed_cut_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper" + "id": "minecraft:waxed_exposed_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_slab.json index 890bb746e..8a750bf1c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_slab.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_cut_copper_slab" + "ingredient": "minecraft:waxed_cut_copper_slab" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper_slab" + "id": "minecraft:waxed_exposed_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_stairs.json index 8f6d64429..c7d175be1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_cut_copper_stairs.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_cut_copper_stairs" + "ingredient": "minecraft:waxed_cut_copper_stairs" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper_stairs" + "id": "minecraft:waxed_exposed_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_copper.json index e21c1bb25..bda5e2ee1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_copper" + "ingredient": "minecraft:waxed_exposed_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_copper" + "id": "minecraft:waxed_weathered_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper.json index af16092f0..b78425f3f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper" + "ingredient": "minecraft:waxed_exposed_cut_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper" + "id": "minecraft:waxed_weathered_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_slab.json index 270cc09a5..3333b30fa 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_slab.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper_slab" + "ingredient": "minecraft:waxed_exposed_cut_copper_slab" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper_slab" + "id": "minecraft:waxed_weathered_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_stairs.json index 6ff78c285..e869698b2 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_exposed_cut_copper_stairs.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_exposed_cut_copper_stairs" + "ingredient": "minecraft:waxed_exposed_cut_copper_stairs" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper_stairs" + "id": "minecraft:waxed_weathered_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_copper.json index c2faa8ff2..b12c34ad1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_copper" + "ingredient": "minecraft:waxed_weathered_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_copper" + "id": "minecraft:waxed_oxidized_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper.json index 83d07687c..4c9195dec 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper" + "ingredient": "minecraft:waxed_weathered_cut_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_cut_copper" + "id": "minecraft:waxed_oxidized_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_slab.json index bac4f0bfa..860bd5b8e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_slab.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper_slab" + "ingredient": "minecraft:waxed_weathered_cut_copper_slab" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_cut_copper_slab" + "id": "minecraft:waxed_oxidized_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_stairs.json index 0f3a04635..d8fcc91b9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/waxed_weathered_cut_copper_stairs.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:waxed_weathered_cut_copper_stairs" + "ingredient": "minecraft:waxed_weathered_cut_copper_stairs" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:waxed_oxidized_cut_copper_stairs" + "id": "minecraft:waxed_oxidized_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_copper.json index 0a7f9746d..2a84fe868 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_copper" + "ingredient": "minecraft:weathered_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:oxidized_copper" + "id": "minecraft:oxidized_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper.json index b9c5cf879..9ceff6fe5 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper" + "ingredient": "minecraft:weathered_cut_copper" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:oxidized_cut_copper" + "id": "minecraft:oxidized_cut_copper" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_slab.json index 777d89c2c..a9565816a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_slab.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper_slab" + "ingredient": "minecraft:weathered_cut_copper_slab" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:oxidized_cut_copper_slab" + "id": "minecraft:oxidized_cut_copper_slab" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_stairs.json index e64fda5e7..e3cd6057c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/oxidation/weathered_cut_copper_stairs.json @@ -5,19 +5,19 @@ "fluid_inputs": [ { "amount": 100, - "fluid": "modern_industrialization:oxygen" + "ingredient": "modern_industrialization:oxygen" } ], "item_inputs": [ { "amount": 1, - "item": "minecraft:weathered_cut_copper_stairs" + "ingredient": "minecraft:weathered_cut_copper_stairs" } ], "item_outputs": [ { "amount": 1, - "item": "minecraft:oxidized_cut_copper_stairs" + "id": "minecraft:oxidized_cut_copper_stairs" } ] } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json new file mode 100644 index 000000000..3a6620587 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:rail" + }, + { + "amount": 1, + "ingredient": "minecraft:redstone_torch" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:activator_rail" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json new file mode 100644 index 000000000..ed8204d83 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:amethyst_shard" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:amethyst_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json new file mode 100644 index 000000000..b01b5826d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:packed_ice" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:blue_ice" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json new file mode 100644 index 000000000..31e99bcb6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:bone_meal" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:bone_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json new file mode 100644 index 000000000..87a44030b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:brick" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:bricks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json new file mode 100644 index 000000000..38872c51d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 3, + "ingredient": "modern_industrialization:steel_curved_plate" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:bucket" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json new file mode 100644 index 000000000..b410282bd --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:string" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:wax" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:candle" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json new file mode 100644 index 000000000..a543fa26f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 3, + "ingredient": "modern_industrialization:steel_ring" + } + ], + "item_outputs": [ + { + "amount": 6, + "id": "minecraft:iron_chain" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json new file mode 100644 index 000000000..fbf75ff29 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:chest" + }, + { + "amount": 1, + "ingredient": "minecraft:minecart" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:chest_minecart" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json new file mode 100644 index 000000000..5560202d2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json @@ -0,0 +1,25 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:rail" + }, + { + "amount": 1, + "ingredient": "minecraft:stone_pressure_plate" + }, + { + "amount": 1, + "ingredient": "minecraft:redstone" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:detector_rail" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json new file mode 100644 index 000000000..d61401b1a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:dried_kelp" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:dried_kelp_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json new file mode 100644 index 000000000..e87842db5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:pointed_dripstone" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:dripstone_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json new file mode 100644 index 000000000..5f6b4f0ce --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 8, + "ingredient": "#minecraft:stone_crafting_materials" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:furnace" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json new file mode 100644 index 000000000..3f48b877b --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:furnace" + }, + { + "amount": 1, + "ingredient": "minecraft:minecart" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:furnace_minecart" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json new file mode 100644 index 000000000..6a34cc1c7 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:gold_nugget" + }, + { + "amount": 1, + "ingredient": "minecraft:melon_slice" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:glistering_melon_slice" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json new file mode 100644 index 000000000..e0f123d4a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:glowstone_dust" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:glowstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json new file mode 100644 index 000000000..c528a98a3 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:gold_nugget" + }, + { + "amount": 1, + "ingredient": "minecraft:carrot" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:golden_carrot" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json new file mode 100644 index 000000000..8dfa15b5a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:wheat" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:hay_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json new file mode 100644 index 000000000..7694a5d8e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:honeycomb" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:honeycomb_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json new file mode 100644 index 000000000..3283a0bd5 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:hopper" + }, + { + "amount": 1, + "ingredient": "minecraft:minecart" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:hopper_minecart" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json new file mode 100644 index 000000000..7ede5b15a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:magma_cream" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:magma_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json new file mode 100644 index 000000000..069a3409a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:blaze_powder" + }, + { + "amount": 1, + "ingredient": "minecraft:slime_ball" + } + ], + "item_outputs": [ + { + "amount": 2, + "id": "minecraft:magma_cream" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json new file mode 100644 index 000000000..7c85b3572 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:melon_slice" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:melon" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json new file mode 100644 index 000000000..74bad079a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "modern_industrialization:steel_large_plate" + }, + { + "amount": 1, + "ingredient": "minecraft:rail" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:minecart" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json new file mode 100644 index 000000000..810dd86ae --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:packed_mud" + } + ], + "item_outputs": [ + { + "amount": 4, + "id": "minecraft:mud_bricks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json new file mode 100644 index 000000000..83dbb6da0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:nether_brick" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:nether_bricks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json new file mode 100644 index 000000000..8892f7148 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:nether_wart" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:nether_wart_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json new file mode 100644 index 000000000..df7da69b8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 200, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:netherite_ingot" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:netherite_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json new file mode 100644 index 000000000..6190445a0 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:ice" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:packed_ice" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json new file mode 100644 index 000000000..b1caa1f51 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:prismarine_shard" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:prismarine" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json new file mode 100644 index 000000000..a00c8656e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json @@ -0,0 +1,22 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:prismarine_shard" + }, + { + "amount": 1, + "ingredient": "modern_industrialization:packer_block_template", + "probability": 0.0 + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:prismarine_bricks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json new file mode 100644 index 000000000..4b79490ba --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:popped_chorus_fruit" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:purpur_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json new file mode 100644 index 000000000..b415d84ba --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:quartz" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:quartz_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json new file mode 100644 index 000000000..8f3140970 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:red_sand" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:red_sandstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json new file mode 100644 index 000000000..04c3a6eeb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:sand" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:sandstone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json new file mode 100644 index 000000000..196e21c47 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 9, + "ingredient": "minecraft:slime_ball" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:slime_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json new file mode 100644 index 000000000..2562d12c1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 4, + "ingredient": "minecraft:snowball" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:snow_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json new file mode 100644 index 000000000..e0b69f8ba --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json @@ -0,0 +1,21 @@ +{ + "type": "modern_industrialization:packer", + "duration": 100, + "eu": 2, + "item_inputs": [ + { + "amount": 1, + "ingredient": "minecraft:tnt" + }, + { + "amount": 1, + "ingredient": "minecraft:minecart" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:tnt_minecart" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json new file mode 100644 index 000000000..a8414fb48 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json @@ -0,0 +1,19 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:mod_loaded", + "modid": "dehydration" + } + } + ], + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 500, + "experience": 0.0, + "ingredient": "minecraft:water_bucket", + "result": { + "id": "modern_industrialization:steam_bucket" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_anvil.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_anvil.json new file mode 100644 index 000000000..96b5f942d --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_anvil.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": "modern_industrialization:steel_block", + "i": "modern_industrialization:steel_ingot" + }, + "pattern": [ + "III", + " i ", + "iii" + ], + "result": { + "count": 2, + "id": "minecraft:anvil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer.json new file mode 100644 index 000000000..49e549307 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "_": "#c:plates/steel", + "i": "#c:ingots/steel" + }, + "pattern": [ + "___", + " i ", + "iii" + ], + "result": { + "count": 2, + "id": "modern_industrialization:forge_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_hopper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_hopper.json new file mode 100644 index 000000000..58c3e9f1f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_hopper.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "c": "minecraft:chest", + "p": "#c:plates/steel" + }, + "pattern": [ + "p p", + "pcp", + " p " + ], + "result": { + "count": 2, + "id": "minecraft:hopper" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/torch.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/torch.json new file mode 100644 index 000000000..3ffc51037 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/torch.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "modern_industrialization:coke", + "s": "minecraft:stick" + }, + "pattern": [ + "C", + "s" + ], + "result": { + "count": 8, + "id": "minecraft:torch" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json new file mode 100644 index 000000000..002c9e98f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:vacuum_freezer", + "duration": 200, + "eu": 16, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:water" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:ice" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json new file mode 100644 index 000000000..68e7931c1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json @@ -0,0 +1,17 @@ +{ + "type": "modern_industrialization:vacuum_freezer", + "duration": 2400, + "eu": 2, + "fluid_inputs": [ + { + "amount": 1000, + "ingredient": "minecraft:lava" + } + ], + "item_outputs": [ + { + "amount": 1, + "id": "minecraft:obsidian" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/copper_block.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/copper_block.json index 088ad0846..ed56415e7 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/copper_block.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/copper_block.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:copper_block" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:copper_block", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper.json index 800666eec..a952538c3 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:cut_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:cut_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_cut_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_slab.json index 05ab02562..053f662bf 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_slab.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:cut_copper_slab" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:cut_copper_slab", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_cut_copper_slab" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_stairs.json index 6fa5591a7..c66c5160d 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/cut_copper_stairs.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:cut_copper_stairs" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:cut_copper_stairs", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_cut_copper_stairs" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_copper.json index d4259a9f0..b855dde1f 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:exposed_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:exposed_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_exposed_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper.json index 3b86acbce..874ebd0da 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:exposed_cut_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:exposed_cut_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_exposed_cut_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_slab.json index 3d6bec517..fd6b922c1 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_slab.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:exposed_cut_copper_slab" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:exposed_cut_copper_slab", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_exposed_cut_copper_slab" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_stairs.json index f64613796..68127f1f8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/exposed_cut_copper_stairs.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:exposed_cut_copper_stairs" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:exposed_cut_copper_stairs", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_exposed_cut_copper_stairs" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_copper.json index 8bef35c19..4f8b2089a 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:oxidized_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:oxidized_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_oxidized_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper.json index 2f2f49d44..989b0e191 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:oxidized_cut_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:oxidized_cut_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_oxidized_cut_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_slab.json index 6870f6c77..792a0f5f9 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_slab.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:oxidized_cut_copper_slab" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:oxidized_cut_copper_slab", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_oxidized_cut_copper_slab" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_stairs.json index c1d668ad3..d64ba5d63 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/oxidized_cut_copper_stairs.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:oxidized_cut_copper_stairs" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:oxidized_cut_copper_stairs", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_oxidized_cut_copper_stairs" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_copper.json index 2b3ecdadb..209825d4e 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:weathered_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:weathered_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_weathered_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper.json index 2c90ea564..a77bfb28c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:weathered_cut_copper" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:weathered_cut_copper", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_weathered_cut_copper" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_slab.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_slab.json index ccca83b3d..98769ac1c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_slab.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_slab.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:weathered_cut_copper_slab" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:weathered_cut_copper_slab", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_weathered_cut_copper_slab" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_stairs.json b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_stairs.json index eb5764ff6..a1bb9ae06 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_stairs.json +++ b/src/generated/resources/data/modern_industrialization/recipe/vanilla_recipes/waxing/weathered_cut_copper_stairs.json @@ -2,15 +2,10 @@ "type": "minecraft:crafting_shapeless", "category": "misc", "ingredients": [ - { - "item": "minecraft:weathered_cut_copper_stairs" - }, - { - "item": "modern_industrialization:wax" - } + "minecraft:weathered_cut_copper_stairs", + "modern_industrialization:wax" ], "result": { - "count": 1, "id": "minecraft:waxed_weathered_cut_copper_stairs" } } \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/structure/empty.nbt b/src/generated/resources/data/modern_industrialization/structure/empty.nbt index 7486ec986..82c0e1114 100644 Binary files a/src/generated/resources/data/modern_industrialization/structure/empty.nbt and b/src/generated/resources/data/modern_industrialization/structure/empty.nbt differ diff --git a/src/generated/resources/data/modern_industrialization/tags/item/me_wires.json b/src/generated/resources/data/modern_industrialization/tags/item/me_wires.json deleted file mode 100644 index 46f21c833..000000000 --- a/src/generated/resources/data/modern_industrialization/tags/item/me_wires.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "values": [ - { - "id": "modern_industrialization:me_wire", - "required": false - }, - { - "id": "modern_industrialization:white_me_wire", - "required": false - }, - { - "id": "modern_industrialization:light_gray_me_wire", - "required": false - }, - { - "id": "modern_industrialization:gray_me_wire", - "required": false - }, - { - "id": "modern_industrialization:black_me_wire", - "required": false - }, - { - "id": "modern_industrialization:brown_me_wire", - "required": false - }, - { - "id": "modern_industrialization:red_me_wire", - "required": false - }, - { - "id": "modern_industrialization:orange_me_wire", - "required": false - }, - { - "id": "modern_industrialization:yellow_me_wire", - "required": false - }, - { - "id": "modern_industrialization:lime_me_wire", - "required": false - }, - { - "id": "modern_industrialization:green_me_wire", - "required": false - }, - { - "id": "modern_industrialization:cyan_me_wire", - "required": false - }, - { - "id": "modern_industrialization:light_blue_me_wire", - "required": false - }, - { - "id": "modern_industrialization:blue_me_wire", - "required": false - }, - { - "id": "modern_industrialization:purple_me_wire", - "required": false - }, - { - "id": "modern_industrialization:magenta_me_wire", - "required": false - }, - { - "id": "modern_industrialization:pink_me_wire", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/tags/item/p2p_attunements/energy_p2p_tunnel.json b/src/generated/resources/data/modern_industrialization/tags/item/p2p_attunements/energy_p2p_tunnel.json deleted file mode 100644 index f89c9c4ac..000000000 --- a/src/generated/resources/data/modern_industrialization/tags/item/p2p_attunements/energy_p2p_tunnel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "modern_industrialization:superconductor_cable" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_1.json b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_1.json new file mode 100644 index 000000000..4bc4008a9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_1.json @@ -0,0 +1,9 @@ +{ + "values": [ + "modern_industrialization:industrialist/1/lignite_emerald", + "modern_industrialization:industrialist/1/emerald_fire_clay", + "modern_industrialization:industrialist/1/emerald_steel_hammer", + "modern_industrialization:industrialist/1/emerald_copper", + "modern_industrialization:industrialist/1/emerald_tin" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_2.json b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_2.json new file mode 100644 index 000000000..133e97081 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_2.json @@ -0,0 +1,9 @@ +{ + "values": [ + "modern_industrialization:industrialist/2/emerald_copper_gear", + "modern_industrialization:industrialist/2/emerald_copper_rotor", + "modern_industrialization:industrialist/2/emerald_bronze_ingot", + "modern_industrialization:industrialist/2/emerald_rubber_sheet", + "modern_industrialization:industrialist/2/sulfur_dust_emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_3.json b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_3.json new file mode 100644 index 000000000..8f938769f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_3.json @@ -0,0 +1,9 @@ +{ + "values": [ + "modern_industrialization:industrialist/3/emerald_bronze_gear", + "modern_industrialization:industrialist/3/emerald_bronze_rotor", + "modern_industrialization:industrialist/3/emerald_steel_ingot", + "modern_industrialization:industrialist/3/item_pipe_emerald", + "modern_industrialization:industrialist/3/fluid_pipe_emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_4.json b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_4.json new file mode 100644 index 000000000..dd1e6cfce --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_4.json @@ -0,0 +1,9 @@ +{ + "values": [ + "modern_industrialization:industrialist/4/emerald_steel_gear", + "modern_industrialization:industrialist/4/emerald_steel_plate", + "modern_industrialization:industrialist/4/emerald_steel_upgrade", + "modern_industrialization:industrialist/4/copper_cable_emerald", + "modern_industrialization:industrialist/4/tin_cable_emerald" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_5.json b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_5.json new file mode 100644 index 000000000..8a0d138f2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/tags/villager_trade/industrialist/level_5.json @@ -0,0 +1,7 @@ +{ + "values": [ + "modern_industrialization:industrialist/5/emerald_analog_circuit", + "modern_industrialization:industrialist/5/emerald_motor", + "modern_industrialization:industrialist/5/emerald_bronze_drill" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_1.json b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_1.json new file mode 100644 index 000000000..eef10c418 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_1.json @@ -0,0 +1,5 @@ +{ + "amount": 2.0, + "random_sequence": "modern_industrialization:trade_set/industrialist/level_1", + "trades": "#modern_industrialization:industrialist/level_1" +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_2.json b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_2.json new file mode 100644 index 000000000..179bcad08 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_2.json @@ -0,0 +1,5 @@ +{ + "amount": 2.0, + "random_sequence": "modern_industrialization:trade_set/industrialist/level_2", + "trades": "#modern_industrialization:industrialist/level_2" +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_3.json b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_3.json new file mode 100644 index 000000000..4a55281a9 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_3.json @@ -0,0 +1,5 @@ +{ + "amount": 2.0, + "random_sequence": "modern_industrialization:trade_set/industrialist/level_3", + "trades": "#modern_industrialization:industrialist/level_3" +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_4.json b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_4.json new file mode 100644 index 000000000..b35eac980 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_4.json @@ -0,0 +1,5 @@ +{ + "amount": 2.0, + "random_sequence": "modern_industrialization:trade_set/industrialist/level_4", + "trades": "#modern_industrialization:industrialist/level_4" +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_5.json b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_5.json new file mode 100644 index 000000000..d4f664ceb --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/trade_set/industrialist/level_5.json @@ -0,0 +1,5 @@ +{ + "amount": 2.0, + "random_sequence": "modern_industrialization:trade_set/industrialist/level_5", + "trades": "#modern_industrialization:industrialist/level_5" +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_copper.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_copper.json new file mode 100644 index 000000000..1768f2ff2 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_copper.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 8, + "id": "minecraft:copper_ingot" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_fire_clay.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_fire_clay.json new file mode 100644 index 000000000..0dff8c3ee --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_fire_clay.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 6, + "id": "modern_industrialization:fire_clay_brick" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 2.0, + "id": "minecraft:emerald" + }, + "xp": 2.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_steel_hammer.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_steel_hammer.json new file mode 100644 index 000000000..be60d0537 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_steel_hammer.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:steel_hammer" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 8.0, + "id": "minecraft:emerald" + }, + "xp": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_tin.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_tin.json new file mode 100644 index 000000000..dbb37a2a6 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/emerald_tin.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 3, + "id": "modern_industrialization:tin_ingot" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/lignite_emerald.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/lignite_emerald.json new file mode 100644 index 000000000..010998c02 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/1/lignite_emerald.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "minecraft:emerald" + }, + "max_uses": 16.0, + "reputation_discount": 0.05, + "wants": { + "count": 15.0, + "id": "modern_industrialization:lignite_coal" + }, + "xp": 2.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_bronze_ingot.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_bronze_ingot.json new file mode 100644 index 000000000..dd8da9d7c --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_bronze_ingot.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 3, + "id": "modern_industrialization:bronze_ingot" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 2.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_gear.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_gear.json new file mode 100644 index 000000000..92e5bdb13 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_gear.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:copper_gear" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_rotor.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_rotor.json new file mode 100644 index 000000000..124127161 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_copper_rotor.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:copper_rotor" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_rubber_sheet.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_rubber_sheet.json new file mode 100644 index 000000000..2f45ab233 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/emerald_rubber_sheet.json @@ -0,0 +1,12 @@ +{ + "gives": { + "count": 6, + "id": "modern_industrialization:rubber_sheet" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "id": "minecraft:emerald" + }, + "xp": 2.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/sulfur_dust_emerald.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/sulfur_dust_emerald.json new file mode 100644 index 000000000..a8595c8ff --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/2/sulfur_dust_emerald.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "minecraft:emerald" + }, + "max_uses": 16.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "modern_industrialization:sulfur_dust" + }, + "xp": 2.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_gear.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_gear.json new file mode 100644 index 000000000..7407aa299 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_gear.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:bronze_gear" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_rotor.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_rotor.json new file mode 100644 index 000000000..7f8a78a4f --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_bronze_rotor.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:bronze_rotor" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_steel_ingot.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_steel_ingot.json new file mode 100644 index 000000000..7efed8737 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/emerald_steel_ingot.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 3, + "id": "modern_industrialization:steel_ingot" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 6.0, + "id": "minecraft:emerald" + }, + "xp": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/fluid_pipe_emerald.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/fluid_pipe_emerald.json new file mode 100644 index 000000000..1e4b72394 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/fluid_pipe_emerald.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "minecraft:emerald" + }, + "max_uses": 20.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "modern_industrialization:fluid_pipe" + }, + "xp": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/item_pipe_emerald.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/item_pipe_emerald.json new file mode 100644 index 000000000..54dc941f1 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/3/item_pipe_emerald.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "minecraft:emerald" + }, + "max_uses": 20.0, + "reputation_discount": 0.05, + "wants": { + "count": 4.0, + "id": "modern_industrialization:item_pipe" + }, + "xp": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/copper_cable_emerald.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/copper_cable_emerald.json new file mode 100644 index 000000000..16072035a --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/copper_cable_emerald.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "minecraft:emerald" + }, + "max_uses": 16.0, + "reputation_discount": 0.05, + "wants": { + "count": 8.0, + "id": "modern_industrialization:copper_cable" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_gear.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_gear.json new file mode 100644 index 000000000..2fa06d7df --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_gear.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:steel_gear" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 5.0, + "id": "minecraft:emerald" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_plate.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_plate.json new file mode 100644 index 000000000..6423080c8 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_plate.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 3, + "id": "modern_industrialization:steel_plate" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 6.0, + "id": "minecraft:emerald" + }, + "xp": 10.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_upgrade.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_upgrade.json new file mode 100644 index 000000000..274820e92 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/emerald_steel_upgrade.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:steel_upgrade" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 20.0, + "id": "minecraft:emerald" + }, + "xp": 20.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/tin_cable_emerald.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/tin_cable_emerald.json new file mode 100644 index 000000000..2b0e0b826 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/4/tin_cable_emerald.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "minecraft:emerald" + }, + "max_uses": 16.0, + "reputation_discount": 0.05, + "wants": { + "count": 8.0, + "id": "modern_industrialization:tin_cable" + }, + "xp": 5.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_analog_circuit.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_analog_circuit.json new file mode 100644 index 000000000..029c1e159 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_analog_circuit.json @@ -0,0 +1,12 @@ +{ + "gives": { + "id": "modern_industrialization:analog_circuit" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 12.0, + "id": "minecraft:emerald" + }, + "xp": 20.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_bronze_drill.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_bronze_drill.json new file mode 100644 index 000000000..9f9fd7684 --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_bronze_drill.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 4, + "id": "modern_industrialization:bronze_drill" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 18.0, + "id": "minecraft:emerald" + }, + "xp": 20.0 +} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_motor.json b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_motor.json new file mode 100644 index 000000000..146c0542e --- /dev/null +++ b/src/generated/resources/data/modern_industrialization/villager_trade/industrialist/5/emerald_motor.json @@ -0,0 +1,13 @@ +{ + "gives": { + "count": 2, + "id": "modern_industrialization:motor" + }, + "max_uses": 12.0, + "reputation_discount": 0.05, + "wants": { + "count": 8.0, + "id": "minecraft:emerald" + }, + "xp": 10.0 +} \ No newline at end of file diff --git a/src/main/java/aztech/modern_industrialization/MI.java b/src/main/java/aztech/modern_industrialization/MI.java index 1f2f77e0c..ad7047122 100644 --- a/src/main/java/aztech/modern_industrialization/MI.java +++ b/src/main/java/aztech/modern_industrialization/MI.java @@ -59,7 +59,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.PackLocationInfo; import net.minecraft.server.packs.PackSelectionConfig; @@ -75,6 +75,7 @@ import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.inventory.AnvilMenu; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModContainer; @@ -87,12 +88,12 @@ import net.neoforged.neoforge.data.event.GatherDataEvent; import net.neoforged.neoforge.event.AddPackFindersEvent; import net.neoforged.neoforge.event.AnvilUpdateEvent; +import net.neoforged.neoforge.event.OnDatapackSyncEvent; import net.neoforged.neoforge.event.RegisterGameTestsEvent; import net.neoforged.neoforge.event.entity.EntityAttributeModificationEvent; import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; -import net.neoforged.neoforge.event.village.VillagerTradesEvent; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import net.neoforged.neoforge.registries.datamaps.RegisterDataMapTypesEvent; import org.slf4j.Logger; @@ -103,8 +104,8 @@ public class MI { public static final String ID = "modern_industrialization"; public static final Logger LOGGER = LoggerFactory.getLogger("Modern Industrialization"); - public static ResourceLocation id(String path) { - return ResourceLocation.fromNamespaceAndPath(ID, path); + public static Identifier id(String path) { + return Identifier.fromNamespaceAndPath(ID, path); } public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { @@ -119,7 +120,6 @@ public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { MIBlock.init(modBus); MIItem.init(modBus); MIRegistries.init(modBus); - MIArmorMaterials.init(modBus); MIMaterials.init(); MIMachineRecipeTypes.init(); @@ -142,10 +142,15 @@ public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { NeoForge.EVENT_BUS.addListener(PlayerEvent.PlayerLoggedOutEvent.class, event -> MIKeyMap.clear(event.getEntity())); NeoForge.EVENT_BUS.addListener(PlayerEvent.PlayerLoggedInEvent.class, event -> { var player = (ServerPlayer) event.getEntity(); - var server = Objects.requireNonNull(player.getServer()); + var server = Objects.requireNonNull(player.level().getServer()); PlayerStatisticsData.get(server).get(player).onPlayerJoin(player); }); - NeoForge.EVENT_BUS.addListener(VillagerTradesEvent.class, MIVillager::init); + NeoForge.EVENT_BUS.addListener(OnDatapackSyncEvent.class, event -> { + for (var entry : MIRegistries.RECIPE_TYPES.getEntries()) { + event.sendRecipes(entry.value()); + } + event.sendRecipes(RecipeType.SMELTING, RecipeType.STONECUTTING); + }); NeoForge.EVENT_BUS.addListener(PlayerInteractEvent.RightClickBlock.class, event -> { if (event.getUseBlock().isFalse()) { @@ -165,7 +170,7 @@ public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { if (world.getBlockEntity(hitResult.getBlockPos()) instanceof WrenchableBlockEntity wrenchable) { if (wrenchable.useWrench(player, hand, hitResult)) { event.setCanceled(true); - event.setCancellationResult(InteractionResult.sidedSuccess(world.isClientSide())); + event.setCancellationResult(InteractionResult.SUCCESS); } } } @@ -179,12 +184,6 @@ public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { if ((event.getLeft().getItem() instanceof DynamicToolItem && !event.getRight().isEmpty()) || (!event.getLeft().isEmpty() && event.getRight().getItem() instanceof DynamicToolItem)) { event.setCanceled(true); - // According to the documentation setCanceled should be all we need, but unfortunately we have to manually override the output and - // cost too?? - if (event.getPlayer().containerMenu instanceof AnvilMenu anvilMenu) { - anvilMenu.getSlot(2).set(ItemStack.EMPTY); - anvilMenu.setMaximumCost(0); - } } }); @@ -208,12 +207,10 @@ public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { FluidNuclearComponent.init(); }); - modBus.addListener(GatherDataEvent.class, event -> { + modBus.addListener(GatherDataEvent.Client.class, event -> { MIDatagenServer.configure( event.getGenerator(), - event.getExistingFileHelper(), event.getLookupProvider(), - event.includeServer(), false); }); @@ -260,7 +257,8 @@ public MI(ModContainer modContainer, IEventBus modBus, Dist dist) { }); modBus.addListener(RegisterGameTestsEvent.class, event -> { - event.register(MIGameTests.class); + // TODO 26.1 +// event.register(MIGameTests.class); }); LOGGER.info("Modern Industrialization setup done!"); diff --git a/src/main/java/aztech/modern_industrialization/MIAdvancementTriggers.java b/src/main/java/aztech/modern_industrialization/MIAdvancementTriggers.java index bcdd883dd..6359c4722 100644 --- a/src/main/java/aztech/modern_industrialization/MIAdvancementTriggers.java +++ b/src/main/java/aztech/modern_industrialization/MIAdvancementTriggers.java @@ -26,7 +26,7 @@ import java.util.function.Supplier; import net.minecraft.advancements.CriterionTrigger; -import net.minecraft.advancements.critereon.PlayerTrigger; +import net.minecraft.advancements.criterion.PlayerTrigger; import net.minecraft.core.registries.Registries; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredRegister; diff --git a/src/main/java/aztech/modern_industrialization/MIBlock.java b/src/main/java/aztech/modern_industrialization/MIBlock.java index d5ca8d2ce..6c1660a4a 100644 --- a/src/main/java/aztech/modern_industrialization/MIBlock.java +++ b/src/main/java/aztech/modern_industrialization/MIBlock.java @@ -37,40 +37,50 @@ import aztech.modern_industrialization.blocks.storage.tank.TankItem; import aztech.modern_industrialization.blocks.storage.tank.creativetank.CreativeTankBlockEntity; import aztech.modern_industrialization.datagen.loot.MIBlockLoot; -import aztech.modern_industrialization.datagen.model.BaseModelProvider; import aztech.modern_industrialization.definition.BlockDefinition; -import aztech.modern_industrialization.items.ContainerItem; import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.materials.part.TankPart; + +import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Function; -import java.util.function.Supplier; + +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.model.ModelLocationUtils; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.data.models.model.TextureSlot; +import net.minecraft.client.data.models.model.TexturedModel; +import net.minecraft.client.renderer.item.BlockModelWrapper; +import net.minecraft.client.renderer.item.CompositeModel; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.SpecialModelWrapper; +import net.minecraft.client.renderer.special.SpecialModelRenderer; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.client.model.generators.ItemModelProvider; -import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.registries.DeferredRegister; import org.jspecify.annotations.Nullable; @SuppressWarnings("unused") public class MIBlock { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MI.ID); - public static final SortedMap> BLOCK_DEFINITIONS = new TreeMap<>(); + public static final SortedMap> BLOCK_DEFINITIONS = new TreeMap<>(); public static void init(IEventBus modBus) { BLOCKS.register(modBus); @@ -79,7 +89,11 @@ public static void init(IEventBus modBus) { // @formatter:off // Forge hammer public static final BlockDefinition FORGE_HAMMER = block("Forge Hammer", "forge_hammer", - BlockDefinitionParams.defaultStone().withBlockConstructor(ForgeHammerBlock::new).sortOrder(SortOrder.FORGE_HAMMER).noModel().destroyTime(6.0f).explosionResistance(1200) + BlockDefinitionParams.defaultStone().withBlockConstructor(ForgeHammerBlock::new).sortOrder(SortOrder.FORGE_HAMMER) + .withModel((block, gen) -> { + gen.createNonTemplateModelBlock(block); + }) + .destroyTime(6.0f).explosionResistance(1200) .sound(SoundType.ANVIL)); // Bronze stuff @@ -88,11 +102,11 @@ public static void init(IEventBus modBus) { .withBlockRegistrationEvent(TrashCanBlock::onRegister); // Other - public static final BlockDefinition BASIC_MACHINE_HULL = nonConductorBlock("Basic Machine Hull", MIBlockKeys.BASIC_MACHINE_HULL.location().getPath()); - public static final BlockDefinition ADVANCED_MACHINE_HULL = nonConductorBlock("Advanced Machine Hull", MIBlockKeys.ADVANCED_MACHINE_HULL.location().getPath()); - public static final BlockDefinition TURBO_MACHINE_HULL = nonConductorBlock("Turbo Machine Hull", MIBlockKeys.TURBO_MACHINE_HULL.location().getPath()); - public static final BlockDefinition HIGHLY_ADVANCED_MACHINE_HULL = nonConductorBlock("Highly Advanced Machine Hull", MIBlockKeys.HIGHLY_ADVANCED_MACHINE_HULL.location().getPath()); - public static final BlockDefinition QUANTUM_MACHINE_HULL = block("Quantum Machine Hull", MIBlockKeys.QUANTUM_MACHINE_HULL.location().getPath(), BlockDefinitionParams.defaultStone().explosionResistance(6000f).dontConductRedstone()); + public static final BlockDefinition BASIC_MACHINE_HULL = nonConductorBlock("Basic Machine Hull", MIBlockKeys.BASIC_MACHINE_HULL.identifier().getPath()); + public static final BlockDefinition ADVANCED_MACHINE_HULL = nonConductorBlock("Advanced Machine Hull", MIBlockKeys.ADVANCED_MACHINE_HULL.identifier().getPath()); + public static final BlockDefinition TURBO_MACHINE_HULL = nonConductorBlock("Turbo Machine Hull", MIBlockKeys.TURBO_MACHINE_HULL.identifier().getPath()); + public static final BlockDefinition HIGHLY_ADVANCED_MACHINE_HULL = nonConductorBlock("Highly Advanced Machine Hull", MIBlockKeys.HIGHLY_ADVANCED_MACHINE_HULL.identifier().getPath()); + public static final BlockDefinition QUANTUM_MACHINE_HULL = block("Quantum Machine Hull", MIBlockKeys.QUANTUM_MACHINE_HULL.identifier().getPath(), BlockDefinitionParams.defaultStone().explosionResistance(6000f).dontConductRedstone()); public static final BlockDefinition FUSION_CHAMBER = nonConductorBlock("Fusion Chamber", "fusion_chamber"); public static final BlockDefinition INDUSTRIAL_TNT = blockExplosive("Industrial TNT", "industrial_tnt"); @@ -102,7 +116,7 @@ public static void init(IEventBus modBus) { "Creative Tank", "creative_tank", BlockDefinitionParams.defaultStone() - .withBlockConstructor(() -> new TankBlock(CreativeTankBlockEntity::new, StorageBehaviour.creative())) + .withBlockConstructor(p -> new TankBlock(p, CreativeTankBlockEntity::new, StorageBehaviour.creative())) .withBlockItemConstructor(TankItem::new) .withModel(TankPart.MODEL_GENERATOR) .withBlockEntityRendererItemModel() @@ -110,7 +124,8 @@ public static void init(IEventBus modBus) { ) .withBlockRegistrationEvent((block, item) -> { MICapabilities.onEvent(event -> { - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, vd) -> new ContainerItem.FluidHandler(stack, (TankItem) item), item); + // TODO 26.1 +// event.registerItem(Capabilities.FluidHandler.ITEM, (stack, vd) -> new ContainerItem.FluidHandler(stack, (TankItem) item), item); }); }); @@ -118,11 +133,10 @@ public static void init(IEventBus modBus) { "Creative Barrel", "creative_barrel", BlockDefinitionParams.defaultStone() - .withBlockConstructor((p) -> new BarrelBlock(CreativeBarrelBlockEntity::new, StorageBehaviour.creative())) + .withBlockConstructor((p) -> new BarrelBlock(p, CreativeBarrelBlockEntity::new, StorageBehaviour.creative())) .withBlockItemConstructor(BarrelItem::new) .withModel((block, gen) -> { - String name = gen.name(block); - gen.simpleBlock(block, gen.models().cubeColumn(name, gen.blockTexture(name + "_side"), gen.blockTexture(name + "_top"))); + gen.createTrivialBlock(block, TexturedModel.COLUMN); }) .withBlockEntityRendererItemModel() .noLootTable() @@ -133,14 +147,14 @@ public static void init(IEventBus modBus) { "creative_storage_unit", BlockDefinitionParams.defaultStone().withBlockConstructor(CreativeStorageUnitBlock::new).dontConductRedstone()); // Materials - public static final BlockDefinition BLOCK_FIRE_CLAY_BRICKS = block("Fire Clay Bricks", "fire_clay_bricks", + public static final BlockDefinition FIRE_CLAY_BRICKS = block("Fire Clay Bricks", "fire_clay_bricks", BlockDefinitionParams.of(BlockBehaviour.Properties.of().mapColor(STONE)).sortOrder(SortOrder.MATERIALS.and("fire_clay")).destroyTime(2.0f).explosionResistance(6.0f).requiresCorrectToolForDrops()); // @formatter:on public static BlockDefinition block( String englishName, String id, BlockDefinitionParams params) { - var holder = BLOCKS.registerBlock(id, params.ctor, params.props); + var holder = BLOCKS.register(id, () -> params.ctor.apply(params.props.setId(ResourceKey.create(Registries.BLOCK, MI.id(id))))); var def = new BlockDefinition<>( englishName, holder, @@ -168,15 +182,23 @@ public static BlockDefinition blockExplosive(String englishName, String i id, BlockDefinitionParams.of( BlockBehaviour.Properties.of().mapColor(MapColor.FIRE).ignitedByLava().instabreak().sound(SoundType.GRASS)) - .clearTags().noModel()); - - // TODO : Datagen model + .clearTags() + .withModel((block, gen) -> { + var mapping = new TextureMapping() + .put(TextureSlot.TOP, TextureMapping.getBlockTexture(Blocks.TNT, "_top")) + .put(TextureSlot.BOTTOM, TextureMapping.getBlockTexture(Blocks.TNT, "_bottom")) + .put(TextureSlot.SIDE, TextureMapping.getBlockTexture(block)); + + gen.createTrivialBlock(block, b -> new TexturedModel(mapping, ModelTemplates.CUBE_BOTTOM_TOP)); + })); } + // TODO: try to clean this up public static class BlockDefinitionParams { public final BlockBehaviour.Properties props; - public BiConsumer modelGenerator; - public BiConsumer itemModelGenerator = (item, gen) -> {}; + // TODO: these need to go into the client sourceset + public BiConsumer modelGenerator; + public BiConsumer itemModelGenerator = (item, gen) -> {}; @Nullable public MIBlockLoot blockLoot; public final ArrayList> tags = new ArrayList<>(); @@ -188,7 +210,7 @@ public static class BlockDefinitionParams { protected BlockDefinitionParams(BlockBehaviour.Properties properties, Function ctor, BiFunction blockItemCtor, - BiConsumer modelGenerator, + BiConsumer modelGenerator, @Nullable MIBlockLoot blockLoot, List> tags) { this.props = properties; @@ -205,7 +227,8 @@ public static BlockDefinitionParams of() { public static BlockDefinitionParams of(BlockBehaviour.Properties properties) { return new BlockDefinitionParams<>(properties, Block::new, BlockItem::new, - (block, modelGenerator) -> modelGenerator.simpleBlockWithItem(block, modelGenerator.cubeAll(block)), + // TODO 26.1 - need to generate the item model as well? + (block, modelGenerator) -> modelGenerator.createTrivialCube(block), new MIBlockLoot.DropSelf(), List.of(BlockTags.NEEDS_STONE_TOOL, BlockTags.MINEABLE_WITH_PICKAXE)); } @@ -218,60 +241,64 @@ public BlockDefinitionParams withBlockConstructor(Function< return new BlockDefinitionParams<>(props, ctor, (BiFunction) this.blockItemCtor, this.modelGenerator, this.blockLoot, this.tags); } - public BlockDefinitionParams withBlockConstructor(Supplier ctor) { - return new BlockDefinitionParams<>(props, - p -> ctor.get(), - (BiFunction) this.blockItemCtor, - this.modelGenerator, - this.blockLoot, - this.tags); - } - public BlockDefinitionParams withBlockItemConstructor(BiFunction blockItemCtor) { this.blockItemCtor = blockItemCtor; return this; } - public BlockDefinitionParams withModel(BiConsumer modelGenerator) { + public BlockDefinitionParams withModel(BiConsumer modelGenerator) { this.modelGenerator = modelGenerator; return this; } - public BlockDefinitionParams withItemModel(BiConsumer itemModelGenerator) { + public BlockDefinitionParams withItemModel(BiConsumer itemModelGenerator) { this.itemModelGenerator = itemModelGenerator; return this; } public BlockDefinitionParams withBlockEntityRendererItemModel() { return withItemModel((item, gen) -> { - var builder = gen.getBuilder(BuiltInRegistries.ITEM.getKey(item).toString()) - .parent(new ModelFile.UncheckedModelFile("builtin/entity")); - var transforms = builder.transforms(); - transforms.transform(ItemDisplayContext.GUI) - .rotation(30, 225, 0) - .translation(0, 0, 0) - .scale(0.625f, 0.625f, 0.625f); - transforms.transform(ItemDisplayContext.GROUND) - .rotation(0, 0, 0) - .translation(0, 3, 0) - .scale(0.25f, 0.25f, 0.25f); - transforms.transform(ItemDisplayContext.FIXED) - .rotation(0, 0, 0) - .translation(0, 0, 0) - .scale(0.5f, 0.5f, 0.5f); - transforms.transform(ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) - .rotation(75, 45, 0) - .translation(0, 2.5f, 0) - .scale(0.375f, 0.375f, 0.375f); - transforms.transform(ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) - .rotation(0, 45, 0) - .translation(0, 0, 0) - .scale(0.4f, 0.4f, 0.4f); - transforms.transform(ItemDisplayContext.FIRST_PERSON_LEFT_HAND) - .rotation(0, 225, 0) - .translation(0, 0, 0) - .scale(0.4f, 0.4f, 0.4f); + var baseBlockModel = BuiltInRegistries.ITEM.getKey(item).withPrefix("block/"); + try { + gen.itemModelOutput.accept(item, new CompositeModel.Unbaked(List.of( + new BlockModelWrapper.Unbaked(baseBlockModel, List.of()), + // TODO: temporary reflection hack + new SpecialModelWrapper.Unbaked(baseBlockModel, (SpecialModelRenderer.Unbaked) Class.forName("aztech.modern_industrialization.client.util.UseBlockEntityRenderer$Unbaked").getConstructor().newInstance())) + )); + } catch (ReflectiveOperationException e) { + throw new RuntimeException(e); + } }); + // TODO 26.1: what about this stuff? +// return withItemModel((item, gen) -> { +// var builder = gen.getBuilder(BuiltInRegistries.ITEM.getKey(item).toString()) +// .parent(new ModelFile.UncheckedModelFile("builtin/entity")); +// var transforms = builder.transforms(); +// transforms.transform(ItemDisplayContext.GUI) +// .rotation(30, 225, 0) +// .translation(0, 0, 0) +// .scale(0.625f, 0.625f, 0.625f); +// transforms.transform(ItemDisplayContext.GROUND) +// .rotation(0, 0, 0) +// .translation(0, 3, 0) +// .scale(0.25f, 0.25f, 0.25f); +// transforms.transform(ItemDisplayContext.FIXED) +// .rotation(0, 0, 0) +// .translation(0, 0, 0) +// .scale(0.5f, 0.5f, 0.5f); +// transforms.transform(ItemDisplayContext.THIRD_PERSON_RIGHT_HAND) +// .rotation(75, 45, 0) +// .translation(0, 2.5f, 0) +// .scale(0.375f, 0.375f, 0.375f); +// transforms.transform(ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) +// .rotation(0, 45, 0) +// .translation(0, 0, 0) +// .scale(0.4f, 0.4f, 0.4f); +// transforms.transform(ItemDisplayContext.FIRST_PERSON_LEFT_HAND) +// .rotation(0, 225, 0) +// .translation(0, 0, 0) +// .scale(0.4f, 0.4f, 0.4f); +// }); } public BlockDefinitionParams withLoot(MIBlockLoot blockLoot) { @@ -279,12 +306,6 @@ public BlockDefinitionParams withLoot(MIBlockLoot blockLoot) { return this; } - public BlockDefinitionParams noModel() { - this.modelGenerator = (block, modelGenerator) -> modelGenerator.existingModelWithItem(block); - // still creating the blockstate - return this; - } - public BlockDefinitionParams noLootTable() { this.blockLoot = null; return this; diff --git a/src/main/java/aztech/modern_industrialization/MICapabilities.java b/src/main/java/aztech/modern_industrialization/MICapabilities.java index 3a8f1cc0c..b2fd5dfc0 100644 --- a/src/main/java/aztech/modern_industrialization/MICapabilities.java +++ b/src/main/java/aztech/modern_industrialization/MICapabilities.java @@ -25,8 +25,6 @@ package aztech.modern_industrialization; import aztech.modern_industrialization.api.energy.EnergyApi; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge.SlotFluidHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge.SlotItemHandler; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -37,6 +35,7 @@ import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.fluids.capability.wrappers.FluidBucketWrapper; +import net.neoforged.neoforge.transfer.fluid.BucketResourceHandler; public class MICapabilities { private static final List> processors = new ArrayList<>(); @@ -44,15 +43,16 @@ public class MICapabilities { public static void init(RegisterCapabilitiesEvent event) { // Fluids for (var fluid : MIFluids.FLUID_DEFINITIONS.values()) { - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidBucketWrapper(stack), fluid.getBucket()); + event.registerItem(Capabilities.Fluid.ITEM, (stack, access) -> new BucketResourceHandler(access), fluid.getBucket()); } // Delayed processors processors.forEach(c -> c.accept(event)); // Misc - event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MIRegistries.CREATIVE_BARREL_BE.get(), (be, side) -> new SlotItemHandler(be)); - event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, MIRegistries.CREATIVE_TANK_BE.get(), (be, side) -> new SlotFluidHandler(be)); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, MIRegistries.CREATIVE_BARREL_BE.get(), (be, side) -> new SlotItemHandler(be)); +// event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, MIRegistries.CREATIVE_TANK_BE.get(), (be, side) -> new SlotFluidHandler(be)); event.registerBlockEntity(EnergyApi.SIDED, MIRegistries.CREATIVE_STORAGE_UNIT_BE.get(), (be, side) -> EnergyApi.CREATIVE); // Energy compat diff --git a/src/main/java/aztech/modern_industrialization/MICommonProxy.java b/src/main/java/aztech/modern_industrialization/MICommonProxy.java index 9d4d76bf2..4f78e518a 100644 --- a/src/main/java/aztech/modern_industrialization/MICommonProxy.java +++ b/src/main/java/aztech/modern_industrialization/MICommonProxy.java @@ -27,8 +27,6 @@ import aztech.modern_industrialization.blocks.storage.barrel.BarrelBlockEntity; import aztech.modern_industrialization.blocks.storage.tank.AbstractTankBlockEntity; import aztech.modern_industrialization.machines.gui.MachineMenuCommon; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariantAttributes; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -37,16 +35,21 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeMap; import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLLoader; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; import net.neoforged.neoforge.event.server.ServerStoppedEvent; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jspecify.annotations.Nullable; /** @@ -56,7 +59,7 @@ public class MICommonProxy { public static MICommonProxy INSTANCE = instantiateProxy(); private static MICommonProxy instantiateProxy() { - if (FMLEnvironment.dist.isClient()) { + if (FMLLoader.getCurrent().getDist().isClient()) { try { Class clientProxy = Class.forName("aztech.modern_industrialization.client.MIClientProxy"); return (MICommonProxy) clientProxy.getConstructor().newInstance(); @@ -106,9 +109,10 @@ public boolean hasShiftDown() { } // In case there is ever a client-side specific version of this... - public List getFluidTooltip(FluidVariant variant) { + // TODO 26.1: now there is + public List getFluidTooltip(FluidResource variant) { List list = new ArrayList<>(); - list.add(FluidVariantAttributes.getName(variant)); + list.add(variant.toStack(1).getHoverName()); return list; } @@ -125,4 +129,12 @@ public MachineMenuCommon createClientMachineMenu(int syncId, Inventory playerInv public BlockState getMachineCasingBlockState(BlockState state, BlockAndTintGetter renderView, BlockPos pos) { return state; } + + public RecipeMap getRecipeMap(Level level) { + if (level instanceof ServerLevel serverLevel) { + return serverLevel.recipeAccess().recipeMap(); + } else { + return RecipeMap.EMPTY; + } + } } diff --git a/src/main/java/aztech/modern_industrialization/MIComponents.java b/src/main/java/aztech/modern_industrialization/MIComponents.java index 9afd659f0..e78197e8c 100644 --- a/src/main/java/aztech/modern_industrialization/MIComponents.java +++ b/src/main/java/aztech/modern_industrialization/MIComponents.java @@ -27,8 +27,6 @@ import aztech.modern_industrialization.blocks.storage.ResourceStorage; import aztech.modern_industrialization.items.SteamDrillFuel; import aztech.modern_industrialization.pipes.item.SavedItemPipeConfig; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.MIExtraCodecs; import com.mojang.serialization.Codec; import java.util.function.Supplier; @@ -40,6 +38,8 @@ import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.fluids.SimpleFluidContent; import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; public final class MIComponents { private static final DeferredRegister.DataComponents COMPONENTS = DeferredRegister.createDataComponents(Registries.DATA_COMPONENT_TYPE, MI.ID); @@ -65,10 +65,10 @@ public final class MIComponents { public static final Supplier> FLUID_CONTENT = COMPONENTS.registerComponentType("fluid_content", builder -> builder.persistent(SimpleFluidContent.CODEC).networkSynchronized(SimpleFluidContent.STREAM_CODEC)); - public static final Supplier>> FLUID_STORAGE = COMPONENTS.registerComponentType("fluid_storage", - ResourceStorage.component(FluidVariant.CODEC, FluidVariant.STREAM_CODEC)); - public static final Supplier>> ITEM_STORAGE = COMPONENTS.registerComponentType("item_storage", - ResourceStorage.component(ItemVariant.CODEC, ItemVariant.STREAM_CODEC)); + public static final Supplier>> FLUID_STORAGE = COMPONENTS.registerComponentType("fluid_storage", + ResourceStorage.component(FluidResource.OPTIONAL_CODEC, FluidResource.STREAM_CODEC)); + public static final Supplier>> ITEM_STORAGE = COMPONENTS.registerComponentType("item_storage", + ResourceStorage.component(ItemResource.OPTIONAL_CODEC, ItemResource.STREAM_CODEC)); public static void init(IEventBus modEventBus) { COMPONENTS.register(modEventBus); diff --git a/src/main/java/aztech/modern_industrialization/MIFluids.java b/src/main/java/aztech/modern_industrialization/MIFluids.java index b87b9c18d..8d34d23a4 100644 --- a/src/main/java/aztech/modern_industrialization/MIFluids.java +++ b/src/main/java/aztech/modern_industrialization/MIFluids.java @@ -32,7 +32,7 @@ import java.util.SortedMap; import java.util.TreeMap; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.material.Fluid; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.fluids.FluidType; @@ -44,7 +44,7 @@ public class MIFluids { public static final DeferredRegister FLUIDS = DeferredRegister.create(Registries.FLUID, MI.ID); public static final DeferredRegister FLUID_TYPES = DeferredRegister.create(NeoForgeRegistries.FLUID_TYPES, MI.ID); - public static final SortedMap FLUID_DEFINITIONS = new TreeMap<>(); + public static final SortedMap FLUID_DEFINITIONS = new TreeMap<>(); public static void init(IEventBus modBus) { FLUIDS.register(modBus); diff --git a/src/main/java/aztech/modern_industrialization/MIItem.java b/src/main/java/aztech/modern_industrialization/MIItem.java index 855faa38d..628360c9d 100644 --- a/src/main/java/aztech/modern_industrialization/MIItem.java +++ b/src/main/java/aztech/modern_industrialization/MIItem.java @@ -39,23 +39,33 @@ import aztech.modern_industrialization.nuclear.NeutronBehaviour; import aztech.modern_industrialization.nuclear.NuclearComponentItem; import aztech.modern_industrialization.nuclear.NuclearConstant; -import dev.technici4n.grandpower.api.ISimpleEnergyItem; + +import java.util.List; +import java.util.Optional; import java.util.SortedMap; import java.util.TreeMap; import java.util.function.BiConsumer; import java.util.function.Function; -import net.minecraft.resources.ResourceLocation; + +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.data.models.model.TextureSlot; +import net.minecraft.client.renderer.item.BlockModelWrapper; +import net.minecraft.client.renderer.item.SelectItemModel; +import net.minecraft.client.renderer.item.properties.select.ComponentContents; +import net.minecraft.resources.Identifier; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.*; +import net.minecraft.world.item.equipment.ArmorType; import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.transfer.item.ItemResource; @SuppressWarnings("unused") public final class MIItem { private static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MI.ID); - public static final SortedMap> ITEM_DEFINITIONS = new TreeMap<>(); + public static final SortedMap> ITEM_DEFINITIONS = new TreeMap<>(); public static void init(IEventBus modBus) { ITEMS.register(modBus); @@ -63,13 +73,13 @@ public static void init(IEventBus modBus) { // @formatter:off // Guide book first so people read it! - public static final ItemDefinition GUIDE_BOOK = item("MI Guidebook", "guidebook", GuideBookItem::new, SortOrder.GUIDE_BOOK); + public static final ItemDefinition GUIDEBOOK = item("MI Guidebook", "guidebook", GuideBookItem::new, SortOrder.GUIDE_BOOK); // Forge hammer, then the various hammers! - public static final ItemDefinition IRON_HAMMER = itemHandheld("Iron Hammer", "iron_hammer", p -> new ForgeTool(Tiers.IRON, p), ITEMS_ORDERED.next()); - public static final ItemDefinition STEEL_HAMMER = itemHandheld("Steel Hammer", "steel_hammer", p -> new ForgeTool(ForgeTool.STEEL, p), ITEMS_ORDERED.next()); - public static final ItemDefinition DIAMOND_HAMMER = itemHandheld("Diamond Hammer", "diamond_hammer", p -> new ForgeTool(Tiers.DIAMOND, p), ITEMS_ORDERED.next()); - public static final ItemDefinition NETHERITE_HAMMER = itemHandheld("Netherite Hammer", "netherite_hammer", p -> new ForgeTool(Tiers.NETHERITE, p), ITEMS_ORDERED.next()); + public static final ItemDefinition IRON_HAMMER = itemHandheld("Iron Hammer", "iron_hammer", p -> new ForgeTool(p, ToolMaterial.IRON.durability(), ToolMaterial.IRON.durability()), ITEMS_ORDERED.next()); + public static final ItemDefinition STEEL_HAMMER = itemHandheld("Steel Hammer", "steel_hammer", p -> new ForgeTool(p, 650, 16), ITEMS_ORDERED.next()); + public static final ItemDefinition DIAMOND_HAMMER = itemHandheld("Diamond Hammer", "diamond_hammer", p -> new ForgeTool(p, ToolMaterial.DIAMOND.durability(), ToolMaterial.DIAMOND.enchantmentValue()), ITEMS_ORDERED.next()); + public static final ItemDefinition NETHERITE_HAMMER = itemHandheld("Netherite Hammer", "netherite_hammer", p -> new ForgeTool(p, ToolMaterial.NETHERITE.durability(), ToolMaterial.NETHERITE.enchantmentValue()), ITEMS_ORDERED.next()); // Steam tier stuff public static final ItemDefinition STEEL_UPGRADE = item("Steel Upgrade", "steel_upgrade", SteelUpgradeItem::new, ITEMS_ORDERED.next()); @@ -93,7 +103,7 @@ public static void init(IEventBus modBus) { public static final ItemDefinition ROBOT_ARM = item("Robot Arm", "robot_arm", ITEMS_ORDERED.next()); // Circuits - public static final ItemDefinition CIRCUIT_BOARD = item("Analog Circuit Board", "analog_circuit_board", ITEMS_ORDERED.next()); + public static final ItemDefinition ANALOG_CIRCUIT_BOARD = item("Analog Circuit Board", "analog_circuit_board", ITEMS_ORDERED.next()); public static final ItemDefinition ANALOG_CIRCUIT = item("Analog Circuit", "analog_circuit", ITEMS_ORDERED.next()); public static final ItemDefinition ELECTRONIC_CIRCUIT_BOARD = item("Electronic Circuit Board", "electronic_circuit_board", ITEMS_ORDERED.next()); public static final ItemDefinition ELECTRONIC_CIRCUIT = item("Electronic Circuit", "electronic_circuit", ITEMS_ORDERED.next()); @@ -136,7 +146,28 @@ public static void init(IEventBus modBus) { public static final ItemDefinition SINGULARITY = item("Singularity", "singularity", p -> new Item(p.rarity(Rarity.EPIC)), ITEMS_ORDERED.next()); // Upgrades - public static final ItemDefinition REDSTONE_CONTROL_MODULE = item("Redstone Control Module", "redstone_control_module", RedstoneControlModuleItem::new, (item, itemModelGenerators) -> {}, ITEMS_ORDERED.next()); + public static final ItemDefinition REDSTONE_CONTROL_MODULE = item( + "Redstone Control Module", "redstone_control_module", RedstoneControlModuleItem::new, + (item, itemModelGenerators) -> { + var highModelId = MI.id("item/redstone_control_module_high"); + ModelTemplates.FLAT_ITEM.create( + highModelId, + new TextureMapping().put(TextureSlot.LAYER0, MI.id("item/redstone_control_module_high")), + itemModelGenerators.modelOutput); + var lowModelId = MI.id("item/redstone_control_module_low"); + ModelTemplates.FLAT_ITEM.create( + lowModelId, + new TextureMapping().put(TextureSlot.LAYER0, MI.id("item/redstone_control_module_low")), + itemModelGenerators.modelOutput); + itemModelGenerators.itemModelOutput.accept(item, new SelectItemModel.Unbaked( + new SelectItemModel.UnbakedSwitch<>( + new ComponentContents<>(MIComponents.LOW_SIGNAL.get()), + List.of( + new SelectItemModel.SwitchCase<>(List.of(false), new BlockModelWrapper.Unbaked(highModelId, List.of())), + new SelectItemModel.SwitchCase<>(List.of(true), new BlockModelWrapper.Unbaked(lowModelId, List.of())))), + Optional.empty())); + }, + ITEMS_ORDERED.next()); public static final ItemDefinition OVERDRIVE_MODULE = item("Overdrive Module", "overdrive_module", ITEMS_ORDERED.next()); public static final ItemDefinition BASIC_UPGRADE = item("Basic Upgrade", "basic_upgrade", ITEMS_ORDERED.next()); @@ -153,45 +184,58 @@ public static void init(IEventBus modBus) { public static final ItemDefinition DIESEL_MINING_DRILL = itemHandheld("Diesel Mining Drill", "diesel_mining_drill", s -> new DieselToolItem(s, 7), ITEMS_ORDERED.next()) .withItemRegistrationEvent((item) -> { MICapabilities.onEvent(event -> { - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidFuelItemHelper.ItemStorage(stack, DieselToolItem.CAPACITY), item); + // TODO 26.1 +// event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidFuelItemHelper.ItemStorage(stack, DieselToolItem.CAPACITY), item); }); }); public static final ItemDefinition DIESEL_CHAINSAW = itemHandheld("Diesel Chainsaw", "diesel_chainsaw", p -> new DieselToolItem(p, 12), ITEMS_ORDERED.next()) .withItemRegistrationEvent((item) -> { MICapabilities.onEvent(event -> { - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidFuelItemHelper.ItemStorage(stack, DieselToolItem.CAPACITY), item); + // TODO 26.1 +// event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidFuelItemHelper.ItemStorage(stack, DieselToolItem.CAPACITY), item); }); }); public static final ItemDefinition PORTABLE_STORAGE_UNIT = itemHandheld("Portable Storage Unit", "portable_storage_unit", PortableStorageUnit::new, ITEMS_ORDERED.next()) .withItemRegistrationEvent(item -> { MICapabilities.onEvent(event -> { - event.registerItem(EnergyApi.ITEM, (stack, ctx) -> ISimpleEnergyItem.createStorage(stack, MIComponents.ENERGY.get(), item.getEnergyCapacity(stack), item.getEnergyMaxInput(stack), item.getEnergyMaxOutput(stack)), item); + event.registerItem(EnergyApi.ITEM, (stack, itemAccess) -> new ItemEnergyHandler(itemAccess, MIComponents.ENERGY.get(), Integer.MAX_VALUE) { + @Override + protected long getCapacity(ItemResource accessResource) { + return item.getEnergyCapacity(accessResource.toStack()); + } + }, item); }); }); // Armor - public static final ItemDefinition RUBBER_HELMET = item("Rubber Helmet", "rubber_helmet", s -> new ArmorItem(MIArmorMaterials.RUBBER, ArmorItem.Type.HELMET, s.stacksTo(1).durability(400)), ITEMS_ORDERED.next()); - public static final ItemDefinition RUBBER_BOOTS = item("Rubber Boots", "rubber_boots", s -> new ArmorItem(MIArmorMaterials.RUBBER, ArmorItem.Type.BOOTS, s.stacksTo(1).durability(400)), ITEMS_ORDERED.next()); + public static final ItemDefinition RUBBER_HELMET = item("Rubber Helmet", "rubber_helmet", p -> new Item(p.humanoidArmor(MIArmorMaterials.RUBBER, ArmorType.HELMET)), ITEMS_ORDERED.next()); + public static final ItemDefinition RUBBER_BOOTS = item("Rubber Boots", "rubber_boots", p -> new Item(p.humanoidArmor(MIArmorMaterials.RUBBER, ArmorType.BOOTS)), ITEMS_ORDERED.next()); public static final ItemDefinition DIESEL_JETPACK = item("Diesel Jetpack", "diesel_jetpack", JetpackItem::new, ITEMS_ORDERED.next()) .withItemRegistrationEvent(item -> { MICapabilities.onEvent(event -> { - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidFuelItemHelper.ItemStorage(stack, JetpackItem.CAPACITY), item); + // TODO 26.1 +// event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidFuelItemHelper.ItemStorage(stack, JetpackItem.CAPACITY), item); }); }); public static final ItemDefinition GRAVICHESTPLATE = item("Gravichestplate", "gravichestplate", GraviChestPlateItem::new, ITEMS_ORDERED.next()) .withItemRegistrationEvent(item -> { MICapabilities.onEvent(event -> { - event.registerItem(EnergyApi.ITEM, (stack, ctx) -> ISimpleEnergyItem.createStorage(stack, MIComponents.ENERGY.get(), item.getEnergyCapacity(stack), item.getEnergyMaxInput(stack), item.getEnergyMaxOutput(stack)), item); + event.registerItem(EnergyApi.ITEM, (stack, itemAccess) -> new ItemEnergyHandler(itemAccess, MIComponents.ENERGY.get(), Integer.MAX_VALUE) { + @Override + protected long getCapacity(ItemResource accessResource) { + return GraviChestPlateItem.ENERGY_CAPACITY; + } + }, item); }); }); public static final ItemDefinition QUANTUM_SWORD = itemHandheld("Quantum Sword", "quantum_sword", QuantumSword::new, ITEMS_ORDERED.next()); - public static final ItemDefinition QUANTUM_HELMET = item("Quantum Helmet", "quantum_helmet", s -> new QuantumArmorItem(ArmorItem.Type.HELMET, s), ITEMS_ORDERED.next()); - public static final ItemDefinition QUANTUM_CHESTPLATE = item("Quantum Chestplate", "quantum_chestplate", s -> new QuantumArmorItem(ArmorItem.Type.CHESTPLATE, s), ITEMS_ORDERED.next()); - public static final ItemDefinition QUANTUM_LEGGINGS = item("Quantum Leggings", "quantum_leggings", s -> new QuantumArmorItem(ArmorItem.Type.LEGGINGS, s), ITEMS_ORDERED.next()); - public static final ItemDefinition QUANTUM_BOOTS = item("Quantum Boots", "quantum_boots", s -> new QuantumArmorItem(ArmorItem.Type.BOOTS, s), ITEMS_ORDERED.next()); + public static final ItemDefinition QUANTUM_HELMET = item("Quantum Helmet", "quantum_helmet", s -> new QuantumArmorItem(ArmorType.HELMET, s), ITEMS_ORDERED.next()); + public static final ItemDefinition QUANTUM_CHESTPLATE = item("Quantum Chestplate", "quantum_chestplate", s -> new QuantumArmorItem(ArmorType.CHESTPLATE, s), ITEMS_ORDERED.next()); + public static final ItemDefinition QUANTUM_LEGGINGS = item("Quantum Leggings", "quantum_leggings", s -> new QuantumArmorItem(ArmorType.LEGGINGS, s), ITEMS_ORDERED.next()); + public static final ItemDefinition QUANTUM_BOOTS = item("Quantum Boots", "quantum_boots", s -> new QuantumArmorItem(ArmorType.BOOTS, s), ITEMS_ORDERED.next()); // Material-like items public static final ItemDefinition UNCOOKED_STEEL_DUST = item("Uncooked Steel Dust", "uncooked_steel_dust", MATERIALS.and("steel")); @@ -216,7 +260,7 @@ public static ItemDefinition item( String englishName, String path, Function ctor, - BiConsumer modelGenerator, + BiConsumer modelGenerator, SortOrder sortOrder) { var holder = ITEMS.registerItem(path, ctor); var def = new ItemDefinition<>(englishName, holder, modelGenerator, sortOrder); @@ -225,27 +269,27 @@ public static ItemDefinition item( } public static ItemDefinition item(String englishName, String path, SortOrder sortOrder) { - return MIItem.item(englishName, path, Item::new, (item, modelGenerator) -> modelGenerator.basicItem(item), sortOrder); + return MIItem.item(englishName, path, Item::new, (item, modelGenerator) -> modelGenerator.generateFlatItem(item, ModelTemplates.FLAT_ITEM), sortOrder); } public static ItemDefinition item(String englishName, String path, Function ctor, SortOrder sortOrder) { - return MIItem.item(englishName, path, ctor, (item, modelGenerator) -> modelGenerator.basicItem(item), sortOrder); + return MIItem.item(englishName, path, ctor, (item, modelGenerator) -> modelGenerator.generateFlatItem(item, ModelTemplates.FLAT_ITEM), sortOrder); } public static ItemDefinition itemNoModel(String englishName, String path, SortOrder sortOrder) { - return MIItem.item(englishName, path, Item::new, (item, modelGenerator) -> {}, sortOrder); + return MIItem.item(englishName, path, Item::new, (item, modelGenerator) -> modelGenerator.declareCustomModelItem(item), sortOrder); } public static ItemDefinition itemNoModel(String englishName, String path, Function ctor, SortOrder sortOrder) { - return MIItem.item(englishName, path, ctor, (item, modelGenerator) -> {}, sortOrder); + return MIItem.item(englishName, path, ctor, (item, modelGenerator) -> modelGenerator.declareCustomModelItem(item), sortOrder); } public static ItemDefinition itemHandheld(String englishName, String path, Function ctor, SortOrder sortOrder) { return MIItem.item(englishName, path, p -> ctor.apply(p.stacksTo(1)), (item, modelGenerator) -> { - modelGenerator.basicItem(item).parent(modelGenerator.getExistingFile(ResourceLocation.parse("minecraft:item/handheld"))); + modelGenerator.generateFlatItem(item, ModelTemplates.FLAT_HANDHELD_ITEM); }, sortOrder); } diff --git a/src/main/java/aztech/modern_industrialization/MIRegistries.java b/src/main/java/aztech/modern_industrialization/MIRegistries.java index 055f802ad..1d42954ba 100644 --- a/src/main/java/aztech/modern_industrialization/MIRegistries.java +++ b/src/main/java/aztech/modern_industrialization/MIRegistries.java @@ -33,17 +33,21 @@ import aztech.modern_industrialization.blocks.storage.tank.creativetank.CreativeTankBlockEntity; import aztech.modern_industrialization.compat.ae2.AECompatCondition; import aztech.modern_industrialization.machines.gui.MachineMenuCommon; +import aztech.modern_industrialization.trading.MITradeSets; import com.google.common.collect.ImmutableSet; import com.mojang.serialization.MapCodec; import java.util.Comparator; import java.util.Set; import java.util.function.Supplier; + +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.village.poi.PoiType; -import net.minecraft.world.entity.npc.VillagerProfession; +import net.minecraft.world.entity.npc.villager.VillagerProfession; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.CreativeModeTab; @@ -65,14 +69,14 @@ public class MIRegistries { public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, MI.ID); public static final Supplier> CREATIVE_BARREL_BE = BLOCK_ENTITIES.register("creative_barrel", () -> { - return BlockEntityType.Builder.of(CreativeBarrelBlockEntity::new, MIBlock.CREATIVE_BARREL.get()).build(null); + return new BlockEntityType<>(CreativeBarrelBlockEntity::new, MIBlock.CREATIVE_BARREL.get()); }); public static final Supplier> CREATIVE_TANK_BE = BLOCK_ENTITIES.register("creative_tank", () -> { - return BlockEntityType.Builder.of(CreativeTankBlockEntity::new, MIBlock.CREATIVE_TANK.get()).build(null); + return new BlockEntityType<>(CreativeTankBlockEntity::new, MIBlock.CREATIVE_TANK.get()); }); public static final Supplier> CREATIVE_STORAGE_UNIT_BE = BLOCK_ENTITIES .register("creative_storage_unit", () -> { - return BlockEntityType.Builder.of(CreativeStorageUnitBlockEntity::new, MIBlock.CREATIVE_STORAGE_UNIT.get()).build(null); + return new BlockEntityType<>(CreativeStorageUnitBlockEntity::new, MIBlock.CREATIVE_STORAGE_UNIT.get()); }); // Conditions @@ -130,12 +134,19 @@ public class MIRegistries { public static final Holder INDUSTRIALIST = VILLAGER_PROFESSIONS.register("industrialist", () -> { return new VillagerProfession( - INDUSTRIALIST_POI.getId().toString(), + Component.translatable("entity.modern_industrialization.villager.industrialist"), e -> e.is(INDUSTRIALIST_POI.getId()), e -> e.is(INDUSTRIALIST_POI.getId()), ImmutableSet.of(), ImmutableSet.of(), - SoundEvents.VILLAGER_WORK_TOOLSMITH); + SoundEvents.VILLAGER_WORK_TOOLSMITH, + Int2ObjectMap.ofEntries( + Int2ObjectMap.entry(1, MITradeSets.INDUSTRIALIST_LEVEL_1), + Int2ObjectMap.entry(2, MITradeSets.INDUSTRIALIST_LEVEL_2), + Int2ObjectMap.entry(3, MITradeSets.INDUSTRIALIST_LEVEL_3), + Int2ObjectMap.entry(4, MITradeSets.INDUSTRIALIST_LEVEL_4), + Int2ObjectMap.entry(5, MITradeSets.INDUSTRIALIST_LEVEL_5) + )); }); // Attributes diff --git a/src/main/java/aztech/modern_industrialization/MITags.java b/src/main/java/aztech/modern_industrialization/MITags.java index 6879aa276..6666873f1 100644 --- a/src/main/java/aztech/modern_industrialization/MITags.java +++ b/src/main/java/aztech/modern_industrialization/MITags.java @@ -25,13 +25,17 @@ package aztech.modern_industrialization; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; public class MITags { public static final TagKey WRENCHES = item("tools/wrench"); + // TODO 26.1 - add MI.id("rubber_sheet") to it + public static final TagKey REPAIRS_RUBBER_ARMOR = miItem("repairs_rubber_armor"); + public static final TagKey BARRELS = miItem("barrels"); public static final TagKey TANKS = miItem("tanks"); public static final TagKey FLUID_PIPES = miItem("fluid_pipes"); @@ -39,10 +43,14 @@ public class MITags { public static final TagKey ME_WIRES = miItem("me_wires"); public static TagKey item(String path) { - return TagKey.create(BuiltInRegistries.ITEM.key(), ResourceLocation.fromNamespaceAndPath("c", path)); + return ItemTags.create(Identifier.fromNamespaceAndPath("c", path)); } public static TagKey miItem(String path) { - return TagKey.create(BuiltInRegistries.ITEM.key(), MI.id(path)); + return ItemTags.create(MI.id(path)); + } + + public static TagKey convention(String path) { + return ItemTags.create(Identifier.fromNamespaceAndPath("c", path)); } } diff --git a/src/main/java/aztech/modern_industrialization/MITooltips.java b/src/main/java/aztech/modern_industrialization/MITooltips.java index 2e6fb2c7b..63e2d2344 100644 --- a/src/main/java/aztech/modern_industrialization/MITooltips.java +++ b/src/main/java/aztech/modern_industrialization/MITooltips.java @@ -67,6 +67,7 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; +import net.neoforged.neoforge.transfer.access.ItemAccess; @SuppressWarnings("unused") public class MITooltips { @@ -214,7 +215,7 @@ public Component parse(Double ratio) { // Data-driven tooltips public static final TooltipAttachment DATA_DRIVEN = TooltipAttachment.ofMultilines((stack, item) -> { - var dataMap = stack.getItemHolder().getData(MIDataMaps.ITEM_TOOLTIPS); + var dataMap = stack.typeHolder().getData(MIDataMaps.ITEM_TOOLTIPS); if (dataMap != null) { return dataMap.components(); } else { @@ -260,12 +261,12 @@ public Component parse(Double ratio) { public static final TooltipAttachment ENERGY_STORED_ITEM = TooltipAttachment.of( (itemStack, item) -> { if (BuiltInRegistries.ITEM.getKey(item).getNamespace().equals(MI.ID)) { - var energyStorage = itemStack.getCapability(EnergyApi.ITEM); + var energyStorage = ItemAccess.forStack(itemStack).getCapability(EnergyApi.ITEM); if (energyStorage != null) { - long capacity = energyStorage.getCapacity(); + long capacity = energyStorage.getCapacityAsLong(); if (capacity > 0) { return Optional.of(new Line(MIText.EnergyStored) - .arg(new NumberWithMax(energyStorage.getAmount(), capacity), EU_MAXED_PARSER).build()); + .arg(new NumberWithMax(energyStorage.getAmountAsLong(), capacity), EU_MAXED_PARSER).build()); } } } @@ -348,7 +349,7 @@ public Component parse(Double ratio) { public static final TooltipAttachment SPEED_UPGRADES = TooltipAttachment.ofMultilines( (itemStack, item) -> { - var upgrade = itemStack.getItemHolder().getData(MIDataMaps.ITEM_PIPE_UPGRADES); + var upgrade = itemStack.typeHolder().getData(MIDataMaps.ITEM_PIPE_UPGRADES); if (upgrade != null) { List lines = new ArrayList<>(); lines.add(new Line(MIText.TooltipSpeedUpgrade).arg(upgrade.maxExtractedItems()).build()); @@ -459,7 +460,7 @@ private static void add(ItemLike itemLike, String... englishTooltipsLine) { } private static void add(String itemId, String... englishTooltipsLine) { - add(BuiltInRegistries.ITEM.get(MI.id(itemId)), englishTooltipsLine); + add(BuiltInRegistries.ITEM.getValue(MI.id(itemId)), englishTooltipsLine); } static { diff --git a/src/main/java/aztech/modern_industrialization/MIVillager.java b/src/main/java/aztech/modern_industrialization/MIVillager.java deleted file mode 100644 index 957491249..000000000 --- a/src/main/java/aztech/modern_industrialization/MIVillager.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization; - -import aztech.modern_industrialization.config.MIStartupConfig; -import aztech.modern_industrialization.materials.MIMaterials; -import aztech.modern_industrialization.materials.part.MIParts; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.ItemLike; -import net.neoforged.neoforge.event.village.VillagerTradesEvent; - -public class MIVillager { - public static void init(VillagerTradesEvent event) { - if (event.getType() != MIRegistries.INDUSTRIALIST.value()) { - return; - } - - if (!MIStartupConfig.INSTANCE.defaultIndustrialistTrades.getAsBoolean()) - return; - - var level1 = event.getTrades().get(1); - level1.add(sellItemsToVillager(MIMaterials.LIGNITE_COAL.getPart(MIParts.GEM).asItem(), 15, 16, 2)); - level1.add(buyItemsFromVillager(MIMaterials.FIRE_CLAY.getPart(MIParts.INGOT), 2, 6, 2)); - level1.add(buyItemsFromVillager(MIItem.STEEL_HAMMER, 8, 1, 10)); - level1.add(buyItemsFromVillager(Items.COPPER_INGOT, 4, 8, 5)); - level1.add(buyItemsFromVillager(MIMaterials.TIN.getPart(MIParts.INGOT), 4, 3, 5)); - - var level2 = event.getTrades().get(2); - level2.add(buyItemsFromVillager(MIMaterials.COPPER.getPart(MIParts.GEAR), 4, 1, 5)); - level2.add(buyItemsFromVillager(MIMaterials.COPPER.getPart(MIParts.ROTOR), 4, 1, 5)); - level2.add(buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.INGOT), 4, 3, 2)); - level2.add(buyItemsFromVillager(MIItem.RUBBER_SHEET, 1, 6, 2)); - level2.add(sellItemsToVillager(MIMaterials.SULFUR.getPart(MIParts.DUST), 4, 16, 2)); - - var level3 = event.getTrades().get(3); - level3.add(buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.GEAR), 4, 1, 5)); - level3.add(buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.ROTOR), 4, 1, 5)); - level3.add(buyItemsFromVillager(MIMaterials.STEEL.getPart(MIParts.INGOT), 6, 3, 10)); - level3.add(sellItemsToVillager(BuiltInRegistries.ITEM.get(MI.id("item_pipe")), 4, 20, 10)); - level3.add(sellItemsToVillager(BuiltInRegistries.ITEM.get(MI.id("fluid_pipe")), 4, 20, 10)); - - var level4 = event.getTrades().get(4); - level4.add(buyItemsFromVillager(MIMaterials.STEEL.getPart(MIParts.GEAR), 5, 1, 5)); - level4.add(buyItemsFromVillager(MIMaterials.STEEL.getPart(MIParts.PLATE), 6, 3, 10)); - level4.add(buyItemsFromVillager(MIItem.STEEL_UPGRADE, 20, 1, 20)); - level4.add(sellItemsToVillager(MIMaterials.TIN.getPart(MIParts.CABLE), 8, 16, 5)); - level4.add(sellItemsToVillager(MIMaterials.COPPER.getPart(MIParts.CABLE), 8, 16, 5)); - - var level5 = event.getTrades().get(5); - level5.add(buyItemsFromVillager(MIItem.ANALOG_CIRCUIT, 12, 1, 20)); - level5.add(buyItemsFromVillager(MIItem.MOTOR, 8, 2, 10)); - level5.add(buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.DRILL), 18, 4, 20)); - } - - private static VillagerTrades.ItemListing sellItemsToVillager(ItemLike soldItem, int numberOfItems, int maxUses, int xp) { - return new VillagerTrades.EmeraldForItems(soldItem, numberOfItems, maxUses, xp); - } - - private static VillagerTrades.ItemListing buyItemsFromVillager(ItemLike boughtItem, int emeraldCost, int numberOfItems, int xp) { - return new VillagerTrades.ItemsForEmeralds(boughtItem.asItem(), emeraldCost, numberOfItems, xp); - } -} diff --git a/src/main/java/aztech/modern_industrialization/api/energy/CableTier.java b/src/main/java/aztech/modern_industrialization/api/energy/CableTier.java index c6f2dfe0e..612dfcd37 100644 --- a/src/main/java/aztech/modern_industrialization/api/energy/CableTier.java +++ b/src/main/java/aztech/modern_industrialization/api/energy/CableTier.java @@ -29,16 +29,17 @@ import aztech.modern_industrialization.compat.kubejs.KubeJSProxy; import aztech.modern_industrialization.machines.models.MachineCasing; import aztech.modern_industrialization.machines.models.MachineCasings; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StoragePreconditions; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Objects; + +import aztech.modern_industrialization.transfer.MIPreconditions; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.Nullable; @@ -63,7 +64,7 @@ public final class CableTier implements Comparable { * {@code null} for LV only. */ @Nullable - public final ResourceLocation itemKey; + public final Identifier itemKey; /** * {@code true} if this is present in base MI, {@code false} if added using some API. */ @@ -76,8 +77,8 @@ public final class CableTier implements Comparable { public final MachineCasing casing; @ApiStatus.Internal - public CableTier(String name, String shortEnglishName, String longEnglishName, long eu, ResourceLocation itemKey, boolean builtin) { - StoragePreconditions.notNegative(eu); + public CableTier(String name, String shortEnglishName, String longEnglishName, long eu, @Nullable Identifier itemKey, boolean builtin) { + MIPreconditions.checkNonNegative(eu); this.name = name; this.shortEnglishName = shortEnglishName; @@ -89,7 +90,7 @@ public CableTier(String name, String shortEnglishName, String longEnglishName, l } private CableTier(String name, String shortEnglishName, String longEnglishName, long eu, @Nullable ResourceKey key) { - this(name, shortEnglishName, longEnglishName, eu, key == null ? null : key.location(), true); + this(name, shortEnglishName, longEnglishName, eu, key == null ? null : key.identifier(), true); } public String shortEnglishKey() { diff --git a/src/main/java/aztech/modern_industrialization/api/energy/EnergyApi.java b/src/main/java/aztech/modern_industrialization/api/energy/EnergyApi.java index cfad2e154..9330a08e5 100644 --- a/src/main/java/aztech/modern_industrialization/api/energy/EnergyApi.java +++ b/src/main/java/aztech/modern_industrialization/api/energy/EnergyApi.java @@ -27,26 +27,31 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.config.MIServerConfig; import aztech.modern_industrialization.config.MIStartupConfig; -import dev.technici4n.grandpower.api.ILongEnergyStorage; import net.minecraft.core.Direction; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.capabilities.BlockCapability; +import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.ItemCapability; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; +import net.neoforged.neoforge.transfer.access.ItemAccess; +import net.neoforged.neoforge.transfer.energy.EnergyHandler; +import net.neoforged.neoforge.transfer.transaction.Transaction; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.Nullable; /** - * MI's energy API. It uses the same types as GrandPower (i.e. {@link ILongEnergyStorage}, - * however the conversion ratio between EU and GrandPower energy is configurable. + * MI's energy API. It uses the same types as NeoForge (i.e. {@link EnergyHandler}, + * however the conversion ratio between EU and FE is configurable. * So don't mix them up! */ public class EnergyApi { + // TODO: rename to MIEnergyHandler, reorganize to match NeoForge caps public static final BlockCapability SIDED = BlockCapability .createSided(MI.id("sided_mi_energy_storage"), MIEnergyStorage.class); - public static final ItemCapability ITEM = ItemCapability - .createVoid(MI.id("energy_storage"), ILongEnergyStorage.class); + public static final ItemCapability ITEM = ItemCapability + .create(MI.id("energy_storage"), EnergyHandler.class, ItemAccess.class); private static final ThreadLocal IN_COMPAT = ThreadLocal.withInitial(() -> false); @@ -57,22 +62,17 @@ public boolean canConnect(CableTier cableTier) { } @Override - public long extract(long maxAmount, boolean simulate) { - return maxAmount; + public int extract(int amount, TransactionContext transaction) { + return amount; } @Override - public boolean canExtract() { - return true; - } - - @Override - public long getAmount() { + public long getAmountAsLong() { return Long.MAX_VALUE; } @Override - public long getCapacity() { + public long getCapacityAsLong() { return Long.MAX_VALUE; } }; @@ -86,12 +86,12 @@ public boolean canConnect(CableTier cableTier) { } @Override - public long getAmount() { + public long getAmountAsLong() { return 0; } @Override - public long getCapacity() { + public long getCapacityAsLong() { return 0; } } @@ -100,7 +100,7 @@ public long getCapacity() { public static void init(RegisterCapabilitiesEvent event, Block[] allBlocks, Item[] allItems) { // Compat wrapper for TR energy if (MIStartupConfig.INSTANCE.bidirectionalEnergyCompat.getAsBoolean()) { - event.registerBlock(ILongEnergyStorage.BLOCK, (world, pos, state, blockEntity, context) -> { + event.registerBlock(Capabilities.Energy.BLOCK, (world, pos, state, blockEntity, context) -> { if (IN_COMPAT.get()) { return null; } @@ -119,60 +119,60 @@ public static void init(RegisterCapabilitiesEvent event, Block[] allBlocks, Item IN_COMPAT.set(true); try { - return WrappedExternalStorage.of(world.getCapability(ILongEnergyStorage.BLOCK, pos, state, blockEntity, context)); + return WrappedExternalStorage.of(world.getCapability(Capabilities.Energy.BLOCK, pos, state, blockEntity, context)); } finally { IN_COMPAT.set(false); } }, allBlocks); - event.registerItem(ILongEnergyStorage.ITEM, (stack, ignored) -> { + event.registerItem(Capabilities.Energy.ITEM, (stack, itemAccess) -> { if (IN_COMPAT.get()) { return null; } IN_COMPAT.set(true); try { - return WrappedMIStorage.of(stack.getCapability(ITEM)); + return WrappedMIStorage.of(stack.getCapability(ITEM, itemAccess)); } finally { IN_COMPAT.set(false); } }, allItems); - event.registerItem(ITEM, (stack, ctx) -> { + event.registerItem(ITEM, (stack, itemAccess) -> { if (IN_COMPAT.get()) { return null; } IN_COMPAT.set(true); try { - return WrappedExternalStorage.of(stack.getCapability(ILongEnergyStorage.ITEM)); + return WrappedExternalStorage.of(stack.getCapability(Capabilities.Energy.ITEM, itemAccess)); } finally { IN_COMPAT.set(false); } }, allItems); } else { event.registerBlock(SIDED, (world, pos, state, blockEntity, context) -> { - return InsertOnlyExternalStorage.of(world.getCapability(ILongEnergyStorage.BLOCK, pos, state, blockEntity, context)); + return InsertOnlyExternalStorage.of(world.getCapability(Capabilities.Energy.BLOCK, pos, state, blockEntity, context)); }, allBlocks); - event.registerItem(ITEM, (stack, ctx) -> { + event.registerItem(ITEM, (stack, itemAccess) -> { if (IN_COMPAT.get()) { return null; } IN_COMPAT.set(true); try { - return InsertOnlyExternalStorage.of(stack.getCapability(ILongEnergyStorage.ITEM)); + return InsertOnlyExternalStorage.of(stack.getCapability(Capabilities.Energy.ITEM, itemAccess)); } finally { IN_COMPAT.set(false); } }, allItems); - event.registerItem(ILongEnergyStorage.ITEM, (stack, ctx) -> { + event.registerItem(Capabilities.Energy.ITEM, (stack, itemAccess) -> { if (IN_COMPAT.get()) { return null; } IN_COMPAT.set(true); try { - return ExtractOnlyMIStorage.of(stack.getCapability(ITEM)); + return ExtractOnlyMIStorage.of(stack.getCapability(ITEM, itemAccess)); } finally { IN_COMPAT.set(false); } @@ -180,7 +180,7 @@ public static void init(RegisterCapabilitiesEvent event, Block[] allBlocks, Item } } - private static long ratio() { + private static int ratio() { return MIServerConfig.INSTANCE.forgeEnergyPerEu.getAsInt(); } @@ -189,13 +189,13 @@ private static long ratio() { */ private static class WrappedExternalStorage implements MIEnergyStorage { @Nullable - private static WrappedExternalStorage of(@Nullable ILongEnergyStorage externalStorage) { + private static WrappedExternalStorage of(@Nullable EnergyHandler externalStorage) { return externalStorage == null ? null : new WrappedExternalStorage(externalStorage); } - private final ILongEnergyStorage externalStorage; + private final EnergyHandler externalStorage; - private WrappedExternalStorage(ILongEnergyStorage externalStorage) { + private WrappedExternalStorage(EnergyHandler externalStorage) { this.externalStorage = externalStorage; } @@ -205,67 +205,61 @@ public boolean canConnect(CableTier cableTier) { } @Override - public long receive(long maxReceive, boolean simulate) { - long ratio = ratio(); - maxReceive = Math.min(maxReceive, Long.MAX_VALUE / ratio); // avoid overflow - maxReceive *= ratio; + public int insert(int maxInsert, TransactionContext transaction) { + int ratio = ratio(); + maxInsert = Math.min(maxInsert, Integer.MAX_VALUE / ratio); // avoid overflow + maxInsert *= ratio; if (ratio > 1) { // Do a simulate insertion to round down to a multiple of ratio that should be accepted. - maxReceive = externalStorage.receive(maxReceive, true) / ratio * ratio; + try (var nested = Transaction.open(transaction)) { + maxInsert = externalStorage.insert(maxInsert, nested) / ratio * ratio; + } } - return externalStorage.receive(maxReceive, simulate) / ratio; + return externalStorage.insert(maxInsert, transaction) / ratio; } @Override - public long extract(long maxExtract, boolean simulate) { - long ratio = ratio(); - maxExtract = Math.min(maxExtract, Long.MAX_VALUE / ratio); // avoid overflow + public int extract(int maxExtract, TransactionContext transaction) { + int ratio = ratio(); + maxExtract = Math.min(maxExtract, Integer.MAX_VALUE / ratio); // avoid overflow maxExtract *= ratio; if (ratio > 1) { // Do a simulate extraction to round down to a multiple of ratio that should be accepted. - maxExtract = externalStorage.extract(maxExtract, true) / ratio * ratio; + try (var nested = Transaction.open(transaction)) { + maxExtract = externalStorage.extract(maxExtract, nested) / ratio * ratio; + } } - return externalStorage.extract(maxExtract, simulate) / ratio; - } - - @Override - public long getAmount() { - return externalStorage.getAmount() / ratio(); - } - - @Override - public long getCapacity() { - return externalStorage.getCapacity() / ratio(); + return externalStorage.extract(maxExtract, transaction) / ratio; } @Override - public boolean canExtract() { - return externalStorage.canExtract(); + public long getAmountAsLong() { + return externalStorage.getAmountAsLong() / ratio(); } @Override - public boolean canReceive() { - return externalStorage.canReceive(); + public long getCapacityAsLong() { + return externalStorage.getCapacityAsLong() / ratio(); } } private static class InsertOnlyExternalStorage extends WrappedExternalStorage { @Nullable - private static InsertOnlyExternalStorage of(@Nullable ILongEnergyStorage externalStorage) { - return externalStorage == null || !externalStorage.canReceive() ? null : new InsertOnlyExternalStorage(externalStorage); + private static InsertOnlyExternalStorage of(@Nullable EnergyHandler externalStorage) { + return externalStorage == null /*|| !externalStorage.supportsInsertion()*/ ? null : new InsertOnlyExternalStorage(externalStorage); } - private InsertOnlyExternalStorage(ILongEnergyStorage externalStorage) { + private InsertOnlyExternalStorage(EnergyHandler externalStorage) { super(externalStorage); } @Override - public long extract(long maxExtract, boolean simulate) { + public int extract(int maxExtract, TransactionContext transaction) { return 0; } @Override - public boolean canExtract() { + public boolean supportsExtraction() { return false; } } @@ -273,68 +267,68 @@ public boolean canExtract() { /** * An external storage that wraps an MI storage to apply the energy conversion ratio to it. */ - private static class WrappedMIStorage implements ILongEnergyStorage { + private static class WrappedMIStorage implements EnergyHandler { @Nullable - private static WrappedMIStorage of(@Nullable ILongEnergyStorage miStorage) { + private static WrappedMIStorage of(@Nullable EnergyHandler miStorage) { return miStorage == null ? null : new WrappedMIStorage(miStorage); } - private final ILongEnergyStorage miStorage; + private final EnergyHandler miStorage; - private WrappedMIStorage(ILongEnergyStorage miStorage) { + private WrappedMIStorage(EnergyHandler miStorage) { this.miStorage = miStorage; } @Override - public long receive(long maxReceive, boolean simulate) { - long ratio = ratio(); - return miStorage.receive(maxReceive / ratio, simulate) * ratio; - } - - @Override - public long extract(long maxExtract, boolean simulate) { - long ratio = ratio(); - return miStorage.extract(maxExtract / ratio, simulate) * ratio; + public int insert(int maxInsert, TransactionContext transaction) { + int ratio = ratio(); + return miStorage.insert(maxInsert / ratio, transaction) * ratio; } @Override - public long getAmount() { - return miStorage.getAmount() * ratio(); + public int extract(int maxExtract, TransactionContext transaction) { + int ratio = ratio(); + return miStorage.extract(maxExtract / ratio, transaction) * ratio; } @Override - public long getCapacity() { - return miStorage.getCapacity() * ratio(); + public long getAmountAsLong() { + return miStorage.getAmountAsLong() * ratio(); } @Override - public boolean canExtract() { - return miStorage.canExtract(); - } - - @Override - public boolean canReceive() { - return miStorage.canReceive(); - } + public long getCapacityAsLong() { + return miStorage.getCapacityAsLong() * ratio(); + } + +// @Override +// public boolean supportsExtraction() { +// return miStorage.supportsExtraction(); +// } +// +// @Override +// public boolean supportsInsertion() { +// return miStorage.supportsInsertion(); +// } } private static class ExtractOnlyMIStorage extends WrappedMIStorage { - private static EnergyApi.@Nullable ExtractOnlyMIStorage of(@Nullable ILongEnergyStorage miStorage) { - return miStorage == null || !miStorage.canExtract() ? null : new ExtractOnlyMIStorage(miStorage); + private static EnergyApi.@Nullable ExtractOnlyMIStorage of(@Nullable EnergyHandler miStorage) { + return miStorage == null /*|| !miStorage.supportsExtraction()*/ ? null : new ExtractOnlyMIStorage(miStorage); } - private ExtractOnlyMIStorage(ILongEnergyStorage miStorage) { + private ExtractOnlyMIStorage(EnergyHandler miStorage) { super(miStorage); } @Override - public long receive(long maxReceive, boolean simulate) { + public int insert(int maxInsert, TransactionContext transaction) { return 0; } - @Override - public boolean canReceive() { - return false; - } +// @Override +// public boolean supportsInsertion() { +// return false; +// } } } diff --git a/src/main/java/aztech/modern_industrialization/api/energy/MIEnergyStorage.java b/src/main/java/aztech/modern_industrialization/api/energy/MIEnergyStorage.java index 2faa5526d..75eed4a93 100644 --- a/src/main/java/aztech/modern_industrialization/api/energy/MIEnergyStorage.java +++ b/src/main/java/aztech/modern_industrialization/api/energy/MIEnergyStorage.java @@ -24,12 +24,21 @@ package aztech.modern_industrialization.api.energy; -import dev.technici4n.grandpower.api.ILongEnergyStorage; +import net.neoforged.neoforge.transfer.energy.EnergyHandler; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import org.jetbrains.annotations.ApiStatus; -public interface MIEnergyStorage extends ILongEnergyStorage { +public interface MIEnergyStorage extends EnergyHandler { boolean canConnect(CableTier cableTier); + default boolean supportsInsertion() { + return true; + } + + default boolean supportsExtraction() { + return true; + } + /** * Overload of {@link #canConnect(CableTier)} that's easier to access by reflection. */ @@ -47,24 +56,24 @@ default boolean canConnect(String cableTier) { interface NoExtract extends MIEnergyStorage { @Override - default boolean canExtract() { + default boolean supportsExtraction() { return false; } @Override - default long extract(long maxExtract, boolean simulate) { + default int extract(int amount, TransactionContext transaction) { return 0; } } interface NoInsert extends MIEnergyStorage { @Override - default boolean canReceive() { + default boolean supportsInsertion() { return false; } @Override - default long receive(long amount, boolean simulate) { + default int insert(int amount, TransactionContext transaction) { return 0; } } diff --git a/src/main/java/aztech/modern_industrialization/api/machine/component/FluidAccess.java b/src/main/java/aztech/modern_industrialization/api/machine/component/FluidAccess.java index 3bd2867d7..1d77b0812 100644 --- a/src/main/java/aztech/modern_industrialization/api/machine/component/FluidAccess.java +++ b/src/main/java/aztech/modern_industrialization/api/machine/component/FluidAccess.java @@ -24,20 +24,20 @@ package aztech.modern_industrialization.api.machine.component; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import com.google.common.primitives.Ints; import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jetbrains.annotations.ApiStatus; public interface FluidAccess { + // TODO 26.1: rename @ApiStatus.Internal // Don't rely on these types existing forever! - FluidVariant getVariant(); + FluidResource getVariant(); - long getAmount(); + int getAmount(); - long getCapacity(); + int getCapacity(); default FluidStack toStack() { - return getVariant().toStack(Ints.saturatedCast(getAmount())); + return getVariant().toStack(getAmount()); } } diff --git a/src/main/java/aztech/modern_industrialization/api/machine/component/ItemAccess.java b/src/main/java/aztech/modern_industrialization/api/machine/component/ItemAccess.java index bf1b3281c..8f7fdbbb5 100644 --- a/src/main/java/aztech/modern_industrialization/api/machine/component/ItemAccess.java +++ b/src/main/java/aztech/modern_industrialization/api/machine/component/ItemAccess.java @@ -24,16 +24,17 @@ package aztech.modern_industrialization.api.machine.component; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import com.google.common.primitives.Ints; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.jetbrains.annotations.ApiStatus; +// TODO: rename? the conflict with NeoForge's ItemAccess is annoying public interface ItemAccess { @ApiStatus.Internal // Don't rely on these types existing forever! - ItemVariant getVariant(); + ItemResource getVariant(); - long getAmount(); + int getAmount(); default ItemStack toStack() { return getVariant().toStack(Ints.saturatedCast(getAmount())); diff --git a/src/main/java/aztech/modern_industrialization/attributes/InfiniteDamageAttribute.java b/src/main/java/aztech/modern_industrialization/attributes/InfiniteDamageAttribute.java index b4e1c4902..fdcfa8e8d 100644 --- a/src/main/java/aztech/modern_industrialization/attributes/InfiniteDamageAttribute.java +++ b/src/main/java/aztech/modern_industrialization/attributes/InfiniteDamageAttribute.java @@ -29,7 +29,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.Mth; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.item.TooltipFlag; @@ -44,7 +44,7 @@ public InfiniteDamageAttribute() { // Allows a modifier with the base id to render green with the effective value. // Other modifiers still render blue with the additional value. @Override - public ResourceLocation getBaseId() { + public Identifier getBaseId() { return QuantumSword.BASE_INFINITE_DAMAGE; } diff --git a/src/main/java/aztech/modern_industrialization/blocks/OreBlock.java b/src/main/java/aztech/modern_industrialization/blocks/OreBlock.java index 0ae02e8bd..38d0b85c2 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/OreBlock.java +++ b/src/main/java/aztech/modern_industrialization/blocks/OreBlock.java @@ -28,7 +28,7 @@ import aztech.modern_industrialization.materials.part.OrePart; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -54,12 +54,12 @@ public OreBlock(BlockBehaviour.Properties settings, OrePart.OrePartParams params } @Override - protected ItemInteractionResult useItemOn(ItemStack handStack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, - BlockHitResult hit) { + protected InteractionResult useItemOn(ItemStack handStack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { if (handStack.getItem() == Items.BOOK) { handStack.shrink(1); - player.getInventory().placeItemBackInInventory(new ItemStack(MIItem.GUIDE_BOOK)); - return ItemInteractionResult.sidedSuccess(world.isClientSide); + player.getInventory().placeItemBackInInventory(new ItemStack(MIItem.GUIDEBOOK)); + return InteractionResult.SUCCESS; } return super.useItemOn(handStack, state, world, pos, player, hand, hit); } diff --git a/src/main/java/aztech/modern_industrialization/blocks/TrashCanBlock.java b/src/main/java/aztech/modern_industrialization/blocks/TrashCanBlock.java index 0d94452e5..d85a2f9c9 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/TrashCanBlock.java +++ b/src/main/java/aztech/modern_industrialization/blocks/TrashCanBlock.java @@ -29,16 +29,17 @@ import aztech.modern_industrialization.api.energy.EnergyApi; import aztech.modern_industrialization.api.energy.MIEnergyStorage; import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem; -import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.VoidingResourceHandler; +import net.neoforged.neoforge.transfer.energy.VoidingEnergyHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; public class TrashCanBlock extends Block { public TrashCanBlock(Properties properties) { @@ -55,144 +56,29 @@ public void onPlace(BlockState pState, Level pLevel, BlockPos pPos, BlockState p } @Override - public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pMovedByPiston) { - if (!pState.is(pNewState.getBlock())) { - pLevel.invalidateCapabilities(pPos); - } - super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston); - } - - private static class TrashItemHandler implements IItemHandler { - private static final TrashItemHandler INSTANCE = new TrashItemHandler(); - - @Override - public int getSlots() { - return 1; - } - - @Override - public ItemStack getStackInSlot(int slot) { - return ItemStack.EMPTY; - } - - @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - return ItemStack.EMPTY; - } - - @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - return ItemStack.EMPTY; - } - - @Override - public int getSlotLimit(int slot) { - return Integer.MAX_VALUE; - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - return true; - } - } - - private static class TrashFluidHandler implements IFluidHandler { - private static final TrashFluidHandler INSTANCE = new TrashFluidHandler(); - - @Override - public int getTanks() { - return 1; - } - - @Override - public FluidStack getFluidInTank(int tank) { - return FluidStack.EMPTY; - } - - @Override - public int getTankCapacity(int tank) { - return Integer.MAX_VALUE; - } - - @Override - public boolean isFluidValid(int tank, FluidStack stack) { - return true; - } - - @Override - public int fill(FluidStack resource, FluidAction action) { - return resource.getAmount(); - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - return FluidStack.EMPTY; - } - - @Override - public FluidStack drain(int maxDrain, FluidAction action) { - return FluidStack.EMPTY; - } + public void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) { + super.affectNeighborsAfterRemoval(state, level, pos, movedByPiston); + level.invalidateCapabilities(pos); } - private static class TrashFluidHandlerItem extends TrashFluidHandler implements IFluidHandlerItem { - private final ItemStack container; + private static final ResourceHandler FLUID_TRASH = new VoidingResourceHandler<>(FluidResource.EMPTY); + private static final ResourceHandler ITEM_TRASH = new VoidingResourceHandler<>(ItemResource.EMPTY); - private TrashFluidHandlerItem(ItemStack container) { - this.container = container; - } - - @Override - public ItemStack getContainer() { - return container; - } - } - - private static class TrashEnergyStorage implements MIEnergyStorage { + private static class TrashEnergyStorage extends VoidingEnergyHandler implements MIEnergyStorage { private static final TrashEnergyStorage INSTANCE = new TrashEnergyStorage(); @Override public boolean canConnect(CableTier cableTier) { return true; } - - @Override - public long receive(long maxReceive, boolean simulate) { - return maxReceive; - } - - @Override - public long extract(long maxExtract, boolean simulate) { - return 0; - } - - @Override - public long getAmount() { - return 0; - } - - @Override - public long getCapacity() { - return Long.MAX_VALUE; - } - - @Override - public boolean canExtract() { - return false; - } - - @Override - public boolean canReceive() { - return true; - } } public static void onRegister(Block block, Item blockItem) { MICapabilities.onEvent(event -> { - event.registerBlock(Capabilities.ItemHandler.BLOCK, (level, pos, state, be, direction) -> TrashItemHandler.INSTANCE, block); - event.registerItem(Capabilities.ItemHandler.ITEM, (stack, ctx) -> TrashItemHandler.INSTANCE, blockItem); - event.registerBlock(Capabilities.FluidHandler.BLOCK, (level, pos, state, be, direction) -> TrashFluidHandler.INSTANCE, block); - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new TrashFluidHandlerItem(stack), blockItem); + event.registerBlock(Capabilities.Item.BLOCK, (level, pos, state, be, direction) -> ITEM_TRASH, block); + event.registerItem(Capabilities.Item.ITEM, (stack, itemAccess) -> ITEM_TRASH, blockItem); + event.registerBlock(Capabilities.Fluid.BLOCK, (level, pos, state, be, direction) -> FLUID_TRASH, block); + event.registerItem(Capabilities.Fluid.ITEM, (stack, itemAccess) -> FLUID_TRASH, blockItem); event.registerBlock(EnergyApi.SIDED, (level, pos, state, be, direction) -> TrashEnergyStorage.INSTANCE, block); }); } diff --git a/src/main/java/aztech/modern_industrialization/blocks/creativestorageunit/CreativeStorageUnitBlockEntity.java b/src/main/java/aztech/modern_industrialization/blocks/creativestorageunit/CreativeStorageUnitBlockEntity.java index 84d8740e6..8d05f4e2d 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/creativestorageunit/CreativeStorageUnitBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/blocks/creativestorageunit/CreativeStorageUnitBlockEntity.java @@ -34,6 +34,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.capabilities.BlockCapabilityCache; +import net.neoforged.neoforge.transfer.transaction.Transaction; import org.jspecify.annotations.Nullable; public class CreativeStorageUnitBlockEntity extends FastBlockEntity implements Tickable { @@ -46,7 +47,7 @@ public CreativeStorageUnitBlockEntity(BlockPos pos, BlockState state) { @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { var serverWorld = (ServerLevel) level; for (Direction direction : Direction.values()) { @@ -57,7 +58,10 @@ public void tick() { var target = caches[direction.ordinal()].getCapability(); if (target != null) { - target.receive(Long.MAX_VALUE, false); + try (var tx = Transaction.openRoot()) { + target.insert(Integer.MAX_VALUE, tx); + tx.commit(); + } } } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerBlock.java b/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerBlock.java index 06094e152..d597c2df9 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerBlock.java +++ b/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerBlock.java @@ -67,7 +67,7 @@ public ForgeHammerBlock(Properties properties) { @Override protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) { - if (world.isClientSide) { + if (world.isClientSide()) { return InteractionResult.SUCCESS; } else { player.openMenu(new MenuProvider() { diff --git a/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerRecipe.java b/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerRecipe.java index 36e6ea90c..794960539 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerRecipe.java +++ b/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerRecipe.java @@ -27,16 +27,16 @@ import aztech.modern_industrialization.MIRegistries; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import java.util.List; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.NonNullList; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.PlacementInfo; import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeBookCategory; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; @@ -45,13 +45,13 @@ public record ForgeHammerRecipe( Ingredient ingredient, int count, - ItemStack result, + ItemStackTemplate result, int hammerDamage) implements Recipe { private static final MapCodec CODEC = RecordCodecBuilder.mapCodec( instance -> instance.group( Ingredient.CODEC.fieldOf("ingredient").forGetter(ForgeHammerRecipe::ingredient), ExtraCodecs.POSITIVE_INT.optionalFieldOf("count", 1).forGetter(ForgeHammerRecipe::count), - ItemStack.CODEC.fieldOf("result").forGetter(ForgeHammerRecipe::result), + ItemStackTemplate.CODEC.fieldOf("result").forGetter(ForgeHammerRecipe::result), ExtraCodecs.NON_NEGATIVE_INT.optionalFieldOf("damage", 0).forGetter(ForgeHammerRecipe::hammerDamage)) .apply(instance, ForgeHammerRecipe::new)); @@ -60,50 +60,45 @@ public record ForgeHammerRecipe( ForgeHammerRecipe::ingredient, ByteBufCodecs.VAR_INT, ForgeHammerRecipe::count, - ItemStack.STREAM_CODEC, + ItemStackTemplate.STREAM_CODEC, ForgeHammerRecipe::result, ByteBufCodecs.VAR_INT, ForgeHammerRecipe::hammerDamage, ForgeHammerRecipe::new); - @Override - public boolean isSpecial() { - return true; - } - @Override public boolean matches(RecipeInput recipeInput, Level world) { throw new UnsupportedOperationException(); } @Override - public ItemStack assemble(RecipeInput recipeInput, HolderLookup.Provider registryAccess) { + public ItemStack assemble(RecipeInput recipeInput) { throw new UnsupportedOperationException(); } @Override - public boolean canCraftInDimensions(int width, int height) { - throw new UnsupportedOperationException(); + public boolean isSpecial() { + return true; } @Override - public NonNullList getIngredients() { - return NonNullList.copyOf(List.of(ingredient)); + public RecipeSerializer getSerializer() { + return MIRegistries.FORGE_HAMMER_RECIPE_SERIALIZER.get(); } @Override - public ItemStack getResultItem(HolderLookup.Provider registryAccess) { - return result; + public RecipeType getType() { + return MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get(); } @Override - public RecipeSerializer getSerializer() { - return MIRegistries.FORGE_HAMMER_RECIPE_SERIALIZER.get(); + public PlacementInfo placementInfo() { + return PlacementInfo.NOT_PLACEABLE; } @Override - public RecipeType getType() { - return MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get(); + public RecipeBookCategory recipeBookCategory() { + throw new UnsupportedOperationException(); } public static class Serializer implements RecipeSerializer { diff --git a/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerScreenHandler.java b/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerScreenHandler.java index 3f0f71388..1d2ade788 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerScreenHandler.java +++ b/src/main/java/aztech/modern_industrialization/blocks/forgehammer/ForgeHammerScreenHandler.java @@ -25,11 +25,11 @@ package aztech.modern_industrialization.blocks.forgehammer; import aztech.modern_industrialization.MIBlock; +import aztech.modern_industrialization.MICommonProxy; import aztech.modern_industrialization.MIRegistries; import aztech.modern_industrialization.items.ForgeTool; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import java.util.*; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; @@ -39,7 +39,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.ClickType; +import net.minecraft.world.inventory.ContainerInput; import net.minecraft.world.inventory.ContainerLevelAccess; import net.minecraft.world.inventory.DataSlot; import net.minecraft.world.inventory.ResultContainer; @@ -48,6 +48,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.transfer.item.ItemResource; public class ForgeHammerScreenHandler extends AbstractContainerMenu { private final DataSlot selectedRecipe; @@ -146,7 +147,7 @@ protected void onSwapCraft(int pNumItemsCrafted) { protected void checkTakeAchievements(ItemStack pStack) { // Do not trust the stack parameter!! if (this.removeCount > 0) { - pStack.onCraftedBy(player.level(), player, this.removeCount); + pStack.onCraftedBy(player, this.removeCount); this.removeCount = 0; } } @@ -208,9 +209,9 @@ public void updateStatus() { this.output.set(ItemStack.EMPTY); if (!input.getItem().isEmpty()) { - Set outputs = new HashSet<>(); + Set outputs = new HashSet<>(); - var recipes = new ArrayList<>(this.world.getRecipeManager().getAllRecipesFor(MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get())); + var recipes = new ArrayList<>(MICommonProxy.INSTANCE.getRecipeMap(this.world).byType(MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get())); // Process recipes with hammer damage first, duplicates will be filtered by output! recipes.sort(Comparator.comparing(h -> -h.value().hammerDamage())); @@ -218,7 +219,7 @@ public void updateStatus() { ForgeHammerRecipe recipe = holder.value(); if (recipe.ingredient().test(input.getItem()) && recipe.count() <= input.getItem().getCount()) { - var output = ItemVariant.of(recipe.result()); + var output = ItemResource.of(recipe.result().create()); if ((recipe.hammerDamage() != 0) && (!tool.getItem().isEmpty())) { outputs.add(output); availableRecipes.add(holder); @@ -246,7 +247,7 @@ void populateResult() { RecipeHolder current = this.availableRecipes.get(getSelectedRecipe()); if (current.value().hammerDamage() == 0 || (!tool.getItem().isEmpty() && tool.getItem().getDamageValue() < tool.getItem().getMaxDamage())) { - this.output.set(current.value().result().copy()); + this.output.set(current.value().result().create()); } else { this.output.set(ItemStack.EMPTY); } @@ -278,7 +279,7 @@ private void onCraft() { tool.set(ItemStack.EMPTY); context.execute((world, pos) -> { - world.playSound(null, pos, SoundEvents.ITEM_BREAK, SoundSource.BLOCKS, 1.0F, 1.0F); + world.playSound(null, pos, SoundEvents.ITEM_BREAK.value(), SoundSource.BLOCKS, 1.0F, 1.0F); }); } @@ -304,7 +305,7 @@ public ItemStack quickMoveStack(Player player, int index) { Item item = itemStack2.getItem(); itemStack = itemStack2.copy(); if (index == 38) { - item.onCraftedBy(itemStack2, player.level(), player); + item.onCraftedBy(itemStack2, player); if (!this.moveItemStackTo(itemStack2, 0, 36, true)) { return ItemStack.EMPTY; } @@ -344,9 +345,7 @@ public ItemStack quickMoveStack(Player player, int index) { @Override public boolean stillValid(Player player) { - return this.context.evaluate((level, pos) -> { - return level.getBlockState(pos).is(MIBlock.FORGE_HAMMER.asBlock()) && player.canInteractWithBlock(pos, 4.0); - }, true); + return stillValid(this.context, player, MIBlock.FORGE_HAMMER.asBlock()); } @Override @@ -358,9 +357,9 @@ public void removed(Player player) { }); } - public void moveRecipe(ResourceLocation recipeId, int fillAction, int amount) { - var recipeHolder = this.world.getRecipeManager().getAllRecipesFor(MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get()).stream() - .filter(r -> r.id().equals(recipeId)).findFirst().orElse(null); + public void moveRecipe(Identifier recipeId, int fillAction, int amount) { + var recipeHolder = MICommonProxy.INSTANCE.getRecipeMap(this.world).byType(MIRegistries.FORGE_HAMMER_RECIPE_TYPE.get()).stream() + .filter(r -> r.id().identifier().equals(recipeId)).findFirst().orElse(null); if (recipeHolder == null) { return; } @@ -460,8 +459,8 @@ public void moveRecipe(ResourceLocation recipeId, int fillAction, int amount) { // Process fill action ItemStack oldOutput = output.getItem().copy(); switch (fillAction) { - case 1 -> clicked(output.index, 0, ClickType.PICKUP, player); - case 2 -> clicked(output.index, 0, ClickType.QUICK_MOVE, player); + case 1 -> clicked(output.index, 0, ContainerInput.PICKUP, player); + case 2 -> clicked(output.index, 0, ContainerInput.QUICK_MOVE, player); } if (!ItemStack.matches(oldOutput, output.getItem())) { didSomething = true; diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlock.java b/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlock.java index 3c665482c..2aef1751f 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlock.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlock.java @@ -24,10 +24,11 @@ package aztech.modern_industrialization.blocks.storage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageUtil; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; +import java.util.Dictionary; import java.util.List; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Holder; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; @@ -37,9 +38,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.resource.Resource; import org.jspecify.annotations.Nullable; -public class AbstractStorageBlock> extends Block implements EntityBlock { +public class AbstractStorageBlock extends Block implements EntityBlock { public final EntityBlock factory; public final StorageBehaviour behavior; @@ -54,34 +57,35 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return factory.newBlockEntity(pos, state); } - protected ItemStack getStack(@Nullable BlockEntity entity) { - var storageBlockEntity = (AbstractStorageBlockEntity) entity; - ItemStack stack = new ItemStack(asItem()); - if (storageBlockEntity != null && (!storageBlockEntity.isEmpty() || storageBlockEntity.isLocked())) { - storageBlockEntity.saveToItem(stack, storageBlockEntity.getLevel().registryAccess()); - } - return stack; - } - - @Override - public List getDrops(BlockState state, LootParams.Builder builder) { - return List.of(getStack(builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY))); - } - - @Override - public ItemStack getCloneItemStack(LevelReader world, BlockPos pos, BlockState state) { - return getStack(world.getBlockEntity(pos)); - } + // TODO 1.21.11 +// protected ItemStack getStack(@Nullable BlockEntity entity) { +// var storageBlockEntity = (AbstractStorageBlockEntity) entity; +// ItemStack stack = new ItemStack(asItem()); +// if (storageBlockEntity != null && (!storageBlockEntity.isEmpty() || storageBlockEntity.isLocked())) { +// storageBlockEntity.saveToItem(stack, storageBlockEntity.getLevel().registryAccess()); +// } +// return stack; +// } +// +// @Override +// public List getDrops(BlockState state, LootParams.Builder builder) { +// return List.of(getStack(builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY))); +// } +// +// @Override +// public ItemStack getCloneItemStack(LevelReader world, BlockPos pos, BlockState state) { +// return getStack(world.getBlockEntity(pos)); +// } @Override - public boolean hasAnalogOutputSignal(BlockState state) { + protected boolean hasAnalogOutputSignal(BlockState state) { return !behavior.isCreative(); } @Override - public int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos) { + protected int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos, Direction direction) { if (level.getBlockEntity(pos) instanceof AbstractStorageBlockEntity storageBlockEntity) { - return StorageUtil.calculateComparatorOutput(storageBlockEntity); + return ResourceHandlerUtil.getRedstoneSignalFromResourceHandler(storageBlockEntity); } return 0; } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockEntity.java b/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockEntity.java index 719590a03..ce7a396fe 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockEntity.java @@ -27,14 +27,15 @@ import aztech.modern_industrialization.MIText; import aztech.modern_industrialization.blocks.FastBlockEntity; import aztech.modern_industrialization.blocks.WrenchableBlockEntity; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StoragePreconditions; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.ResourceAmount; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.SnapshotJournal; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; +import aztech.modern_industrialization.transfer.LongResourceStack; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.transaction.SnapshotJournal; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; +import net.minecraft.core.component.DataComponentGetter; import net.minecraft.core.component.DataComponentMap; import net.minecraft.core.component.DataComponentType; import net.minecraft.nbt.CompoundTag; @@ -42,24 +43,21 @@ import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.minecraft.world.phys.BlockHitResult; import org.jspecify.annotations.Nullable; -public abstract class AbstractStorageBlockEntity> extends FastBlockEntity - implements SingleSlotStorage, WrenchableBlockEntity { - @Override - public long getVersion() { - return version; - } +import java.util.Objects; +public abstract class AbstractStorageBlockEntity extends FastBlockEntity + implements ResourceHandler, WrenchableBlockEntity { protected T resource; protected long amount; - private long version; private boolean isLocked; public final StorageBehaviour behaviour; @@ -68,7 +66,7 @@ public long getVersion() { public AbstractStorageBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); - resource = getBlankResource(); + resource = getEmptyResource(); this.behaviour = ((AbstractStorageBlock) state.getBlock()).behavior; } @@ -78,9 +76,8 @@ protected boolean shouldSkipComparatorUpdate() { } public void onChanged() { - version++; setChanged(); - if (!level.isClientSide) + if (!level.isClientSide()) sync(); } @@ -99,7 +96,8 @@ public CompoundTag getUpdateTag(HolderLookup.Provider registries) { public boolean useWrench(Player player, InteractionHand hand, BlockHitResult hit) { if (player.isShiftKeyDown()) { var block = (AbstractStorageBlock) getBlockState().getBlock(); - level.addFreshEntity(new ItemEntity(level, hit.getLocation().x, hit.getLocation().y, hit.getLocation().z, block.getStack(this))); + // TODO 26.1 +// level.addFreshEntity(new ItemEntity(level, hit.getLocation().x, hit.getLocation().y, hit.getLocation().z, block.getStack(this))); level.setBlockAndUpdate(worldPosition, Blocks.AIR.defaultBlockState()); } else { if (this.behaviour.isLockable()) { @@ -112,24 +110,27 @@ public boolean useWrench(Player player, InteractionHand hand, BlockHitResult hit } @Override - public boolean supportsExtraction() { - return true; + public int size() { + return 1; } @Override - public boolean supportsInsertion() { - return !behaviour.isCreative(); + public boolean isValid(int index, T resource) { + Objects.checkIndex(index, size()); + TransferPreconditions.checkNonEmpty(resource); + return !this.isLocked() || this.resource.equals(resource); } - public long insert(T resource, long maxAmount, TransactionContext transaction, boolean ignoreLock) { - StoragePreconditions.notBlankNotNegative(resource, maxAmount); + public int insert(int index, T resource, int maxAmount, TransactionContext transaction, boolean ignoreLock) { + Objects.checkIndex(index, size()); + TransferPreconditions.checkNonEmptyNonNegative(resource, maxAmount); if (behaviour.isCreative()) { return 0; } - if ((this.resource.isBlank() && (ignoreLock || !this.isLocked())) || this.resource.equals(resource)) { - long inserted = Math.min(maxAmount, behaviour.getCapacityForResource(resource) - amount); + if ((this.resource.isEmpty() && (ignoreLock || !this.isLocked())) || this.resource.equals(resource)) { + int inserted = (int) Math.min(maxAmount, behaviour.getCapacityForResource(resource) - amount); if (inserted > 0) { participant.updateSnapshots(transaction); amount += inserted; @@ -141,24 +142,25 @@ public long insert(T resource, long maxAmount, TransactionContext transaction, b } @Override - public long insert(T resource, long maxAmount, TransactionContext transaction) { - return insert(resource, maxAmount, transaction, false); + public int insert(int index, T resource, int maxAmount, TransactionContext transaction) { + return insert(index, resource, maxAmount, transaction, false); } @Override - public long extract(T resource, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notBlankNotNegative(resource, maxAmount); + public int extract(int index, T resource, int maxAmount, TransactionContext transaction) { + Objects.checkIndex(index, size()); + TransferPreconditions.checkNonEmptyNonNegative(resource, maxAmount); if (behaviour.isCreative()) { return maxAmount; } else { if (resource.equals(this.resource)) { - long extracted = Math.min(maxAmount, amount); + int extracted = (int) Math.min(maxAmount, amount); if (extracted > 0) { participant.updateSnapshots(transaction); amount -= extracted; if (amount == 0 && !isLocked()) { - this.resource = getBlankResource(); + this.resource = getEmptyResource(); } } return extracted; @@ -168,18 +170,15 @@ public long extract(T resource, long maxAmount, TransactionContext transaction) } @Override - public boolean isResourceBlank() { - return getResource().isBlank(); - } - - @Override - public T getResource() { + public T getResource(int index) { + Objects.checkIndex(index, size()); return resource; } @Override - public long getAmount() { - if (isResourceBlank()) { + public long getAmountAsLong(int index) { + Objects.checkIndex(index, size()); + if (resource.isEmpty()) { return 0; } if (!behaviour.isCreative()) { @@ -193,29 +192,31 @@ public boolean isEmpty() { if (!behaviour.isCreative()) { return amount == 0; } else { - return resource.isBlank(); + return resource.isEmpty(); } } @Override - public long getCapacity() { + public long getCapacityAsLong(int index, T resource) { + Objects.checkIndex(index, size()); + // TODO 26.1: check handling of the empty resource return behaviour.getCapacityForResource(resource); } - private class ResourceParticipant extends SnapshotJournal> { + private class ResourceParticipant extends SnapshotJournal> { @Override - protected ResourceAmount createSnapshot() { - return new ResourceAmount<>(resource, amount); + protected LongResourceStack createSnapshot() { + return new LongResourceStack<>(resource, amount); } @Override - protected void revertToSnapshot(ResourceAmount snapshot) { + protected void revertToSnapshot(LongResourceStack snapshot) { resource = snapshot.resource(); amount = snapshot.amount(); } @Override - protected void onRootCommit(ResourceAmount originalState) { + protected void onRootCommit(LongResourceStack originalState) { onChanged(); } } @@ -231,14 +232,14 @@ public void toggleLocked() { if (behaviour.isLockable()) { isLocked = !isLocked; if (!isLocked && amount == 0) { - resource = getBlankResource(); + resource = getEmptyResource(); } setChanged(); } } @Override - protected void applyImplicitComponents(DataComponentInput input) { + protected void applyImplicitComponents(DataComponentGetter input) { super.applyImplicitComponents(input); var storage = input.get(componentType()); @@ -264,39 +265,39 @@ protected void collectImplicitComponents(DataComponentMap.Builder builder) { } @Override - public void removeComponentsFromTag(CompoundTag tag) { - super.removeComponentsFromTag(tag); + public void removeComponentsFromTag(ValueOutput output) { + super.removeComponentsFromTag(output); - tag.remove("locked"); - tag.remove("amt"); + output.discard("locked"); + output.discard("amt"); } @Override - public void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { - resource = loadResource(tag, registries); + public void loadAdditional(ValueInput input) { + resource = loadResource(input); if (behaviour.isLockable()) { - isLocked = tag.getBoolean("locked"); + isLocked = input.getBooleanOr("locked", false); } if (!behaviour.isCreative()) { - amount = tag.getLong("amt"); - if (resource.isBlank()) { + amount = input.getLongOr("amt", 0); + if (resource.isEmpty()) { amount = 0; } } } @Override - public void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + public void saveAdditional(ValueOutput output) { if (behaviour.isLockable()) { - tag.putBoolean("locked", isLocked); + output.putBoolean("locked", isLocked); } if (!behaviour.isCreative()) { - tag.putLong("amt", amount); + output.putLong("amt", amount); } - saveResource(resource, tag, registries); + saveResource(resource, output); } public void setResource(T resource) { @@ -305,9 +306,9 @@ public void setResource(T resource) { public abstract DataComponentType> componentType(); - public abstract T loadResource(CompoundTag tag, HolderLookup.Provider registries); + public abstract T loadResource(ValueInput input); - public abstract void saveResource(T resource, CompoundTag tag, HolderLookup.Provider registries); + public abstract void saveResource(T resource, ValueOutput output); - public abstract T getBlankResource(); + public abstract T getEmptyResource(); } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockItem.java b/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockItem.java index b73cd0676..82001a0cc 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockItem.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/AbstractStorageBlockItem.java @@ -27,7 +27,6 @@ import aztech.modern_industrialization.MICommonProxy; import aztech.modern_industrialization.MIText; import aztech.modern_industrialization.items.ContainerItem; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import java.util.List; import java.util.function.Consumer; import net.minecraft.network.chat.Component; @@ -35,8 +34,10 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.TooltipDisplay; +import net.neoforged.neoforge.transfer.resource.Resource; -public abstract class AbstractStorageBlockItem> extends BlockItem implements ContainerItem { +public abstract class AbstractStorageBlockItem extends BlockItem implements ContainerItem { public final StorageBehaviour behaviour; public AbstractStorageBlockItem(AbstractStorageBlock block, Properties properties) { @@ -45,9 +46,9 @@ public AbstractStorageBlockItem(AbstractStorageBlock block, Properties proper } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { if (!isUnlocked(stack)) { - tooltip.add(MIText.Locked.text()); + tooltip.accept(MIText.Locked.text()); } } @@ -55,10 +56,11 @@ public StorageBehaviour getBehaviour() { return behaviour; } - // A bit stupid but I don't want to have client-only code in the main sourceset - @Override - @SuppressWarnings("rawtype") - public void initializeClient(Consumer stupidClientProperties) { - MICommonProxy.INSTANCE.withStandardItemRenderer(stupidClientProperties); - } + // TODO 1.21.11 +// // A bit stupid but I don't want to have client-only code in the main sourceset +// @Override +// @SuppressWarnings("rawtype") +// public void initializeClient(Consumer stupidClientProperties) { +// MICommonProxy.INSTANCE.withStandardItemRenderer(stupidClientProperties); +// } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/ResourceStorage.java b/src/main/java/aztech/modern_industrialization/blocks/storage/ResourceStorage.java index 7a38e82d4..9aaa74655 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/ResourceStorage.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/ResourceStorage.java @@ -24,9 +24,6 @@ package aztech.modern_industrialization.blocks.storage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import aztech.modern_industrialization.util.MIExtraCodecs; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -35,16 +32,19 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.Resource; -public record ResourceStorage>(T resource, long amount, boolean locked) { +public record ResourceStorage(T resource, long amount, boolean locked) { public ResourceStorage { - if (resource.isBlank() && amount != 0) { - throw new IllegalArgumentException("Expected 0 amount for blank resoruce, got " + amount); + if (resource.isEmpty() && amount != 0) { + throw new IllegalArgumentException("Expected 0 amount for empty resoruce, got " + amount); } } - public static final ResourceStorage FLUID_EMPTY = new ResourceStorage<>(FluidVariant.blank(), 0, false); - public static final ResourceStorage ITEM_EMPTY = new ResourceStorage<>(ItemVariant.blank(), 0, false); + public static final ResourceStorage FLUID_EMPTY = new ResourceStorage<>(FluidResource.EMPTY, 0, false); + public static final ResourceStorage ITEM_EMPTY = new ResourceStorage<>(ItemResource.EMPTY, 0, false); public ResourceStorage withResource(T resource) { return new ResourceStorage<>(resource, amount, locked); @@ -58,14 +58,14 @@ public ResourceStorage withLocked(boolean locked) { return new ResourceStorage<>(resource, amount, locked); } - public static > Codec> codec(Codec variantCodec) { + public static Codec> codec(Codec variantCodec) { return RecordCodecBuilder.create(instance -> instance.group( variantCodec.fieldOf("resource").forGetter(ResourceStorage::resource), MIExtraCodecs.POSITIVE_LONG.optionalFieldOf("amount", 0L).forGetter(ResourceStorage::amount), Codec.BOOL.optionalFieldOf("locked", false).forGetter(ResourceStorage::locked)).apply(instance, ResourceStorage::new)); } - public static > StreamCodec> streamCodec( + public static StreamCodec> streamCodec( StreamCodec variantCodec) { return StreamCodec.composite( variantCodec, @@ -75,14 +75,14 @@ public static > StreamCodec { - if (resource.isBlank()) { + if (resource.isEmpty()) { amount = 0L; } return new ResourceStorage<>(resource, amount, locked); }); } - public static > UnaryOperator>> component(Codec variantCodec, + public static UnaryOperator>> component(Codec variantCodec, StreamCodec streamCodec) { return builder -> builder.persistent(codec(variantCodec)).networkSynchronized(streamCodec(streamCodec)); } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlock.java b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlock.java index 3db537df6..0208b47f2 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlock.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlock.java @@ -27,8 +27,8 @@ import aztech.modern_industrialization.MICommonProxy; import aztech.modern_industrialization.blocks.storage.AbstractStorageBlock; import aztech.modern_industrialization.blocks.storage.StorageBehaviour; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; import aztech.modern_industrialization.util.MobSpawning; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -46,9 +46,9 @@ import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; -public class BarrelBlock extends AbstractStorageBlock implements EntityBlock { - public BarrelBlock(EntityBlock factory, StorageBehaviour behaviour) { - super(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).destroyTime(4.0f).isValidSpawn(MobSpawning.NO_SPAWN) +public class BarrelBlock extends AbstractStorageBlock implements EntityBlock { + public BarrelBlock(Properties properties, EntityBlock factory, StorageBehaviour behaviour) { + super(properties.mapColor(MapColor.METAL).destroyTime(4.0f).isValidSpawn(MobSpawning.NO_SPAWN) .isRedstoneConductor(Blocks::never), factory, behaviour); } @@ -57,9 +57,9 @@ private static boolean useBlock(BlockHitResult hitResult, InteractionHand hand, && hitResult.getDirection().getAxis().isHorizontal()) { if (barrel.behaviour.isCreative()) { - ItemVariant currentInHand = ItemVariant.of(player.getMainHandItem()); - if (!currentInHand.isBlank() && barrel.isResourceBlank()) { - barrel.setResource(currentInHand); + var currentInHand = player.getItemInHand(hand); + if (!currentInHand.isEmpty() && barrel.getResource(0).isEmpty()) { + barrel.setResource(ItemResource.of(currentInHand)); return true; } } @@ -75,7 +75,7 @@ private static boolean useBlock(BlockHitResult hitResult, InteractionHand hand, var handItem = player.getItemInHand(hand); if (!handItem.isEmpty()) { try (var tx = Transaction.openRoot()) { - long inserted = barrel.insert(ItemVariant.of(handItem), handItem.getCount(), tx, true); + long inserted = barrel.insert(0, ItemResource.of(handItem), handItem.getCount(), tx, true); if (inserted > 0) { tx.commit(); handItem.shrink((int) inserted); @@ -84,8 +84,8 @@ private static boolean useBlock(BlockHitResult hitResult, InteractionHand hand, } } } else { - ItemVariant currentInHand = ItemVariant.of(player.getMainHandItem()); - if (!currentInHand.isBlank()) { + ItemResource currentInHand = ItemResource.of(player.getMainHandItem()); + if (!currentInHand.isEmpty()) { try (var tx = Transaction.openRoot()) { long inserted = 0; for (int i = 0; i < Inventory.INVENTORY_SIZE; ++i) { @@ -94,7 +94,7 @@ private static boolean useBlock(BlockHitResult hitResult, InteractionHand hand, continue; } - long thisIter = barrel.insert(currentInHand, stack.getCount(), tx, true); + long thisIter = barrel.insert(0, currentInHand, stack.getCount(), tx, true); inserted += thisIter; stack.shrink((int) thisIter); } @@ -118,12 +118,12 @@ private static boolean attackBlock(BlockPos pos, Direction direction, Interactio // if (stack.getItem() instanceof BarrelItem barrelItem) { // var storage = ContainerItem.GenericItemStorage.of(stack, barrelItem); // if (StorageUtil.move(barrel, storage, (itemVariant) -> true, Long.MAX_VALUE, null) > 0) { -// return InteractionResult.sidedSuccess(world.isClientSide); +// return InteractionResult.sidedSuccess(world.isClientSide()); // } // } try (Transaction transaction = Transaction.openRoot()) { - ItemVariant extractedResource = barrel.getResource(); + var extractedResource = barrel.getResource(0); long extracted = barrel.extract(extractedResource, player.isShiftKeyDown() ? 1 : extractedResource.toStack().getMaxStackSize(), @@ -146,7 +146,7 @@ public static void setupBarrelEvents() { if (useBlock(event.getHitVec(), event.getHand(), event.getEntity(), event.getLevel())) { event.setCanceled(true); - event.setCancellationResult(InteractionResult.sidedSuccess(event.getSide().isClient())); + event.setCancellationResult(InteractionResult.SUCCESS); } }); NeoForge.EVENT_BUS.addListener(PlayerInteractEvent.LeftClickBlock.class, event -> { @@ -167,7 +167,7 @@ public static BarrelStorage withStackCapacity(long stackCapacity) { return new BarrelStorage(stackCapacity); } - public static class BarrelStorage extends StorageBehaviour { + public static class BarrelStorage extends StorageBehaviour { public final long stackCapacity; public BarrelStorage(long stackCapacity) { @@ -180,8 +180,8 @@ public boolean isLockable() { } @Override - public long getCapacityForResource(ItemVariant resource) { - if (resource.isBlank()) { + public long getCapacityForResource(ItemResource resource) { + if (resource.isEmpty()) { return stackCapacity * 64; } else { return stackCapacity * resource.getMaxStackSize(); @@ -189,8 +189,8 @@ public long getCapacityForResource(ItemVariant resource) { } @Override - public boolean canInsert(ItemVariant resource) { - return resource.getItem().canFitInsideContainerItems(); + public boolean canInsert(ItemResource resource) { + return resource.toStack().canFitInsideContainerItems(); } } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlockEntity.java b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlockEntity.java index f0b6c87d1..6c513d3c2 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelBlockEntity.java @@ -27,15 +27,15 @@ import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.blocks.storage.AbstractStorageBlockEntity; import aztech.modern_industrialization.blocks.storage.ResourceStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import net.minecraft.core.BlockPos; -import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponentType; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; +import net.neoforged.neoforge.transfer.item.ItemResource; -public class BarrelBlockEntity extends AbstractStorageBlockEntity { +public class BarrelBlockEntity extends AbstractStorageBlockEntity { public BarrelBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { @@ -43,28 +43,28 @@ public BarrelBlockEntity(BlockEntityType type, } @Override - public DataComponentType> componentType() { + public DataComponentType> componentType() { return MIComponents.ITEM_STORAGE.get(); } @Override - public ItemVariant getBlankResource() { - return ItemVariant.blank(); + public ItemResource getEmptyResource() { + return ItemResource.EMPTY; } @Override - public void removeComponentsFromTag(CompoundTag tag) { - super.removeComponentsFromTag(tag); - tag.remove("item"); + public void removeComponentsFromTag(ValueOutput output) { + super.removeComponentsFromTag(output); + output.discard("item"); } @Override - public ItemVariant loadResource(CompoundTag tag, HolderLookup.Provider registries) { - return ItemVariant.fromNbt(tag.getCompound("item"), registries); + public ItemResource loadResource(ValueInput input) { + return input.read("item", ItemResource.OPTIONAL_CODEC).orElse(ItemResource.EMPTY); } @Override - public void saveResource(ItemVariant resource, CompoundTag tag, HolderLookup.Provider registries) { - tag.put("item", resource.toNbt(registries)); + public void saveResource(ItemResource resource, ValueOutput output) { + output.store("item", ItemResource.OPTIONAL_CODEC, resource); } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelItem.java b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelItem.java index a97bb6e94..32247bff9 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelItem.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelItem.java @@ -27,13 +27,16 @@ import aztech.modern_industrialization.MIText; import aztech.modern_industrialization.blocks.storage.AbstractStorageBlockItem; import aztech.modern_industrialization.items.ItemContainingItemHelper; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.TextHelper; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; + import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextColor; +import net.minecraft.util.ARGB; +import net.minecraft.util.ColorRGBA; import net.minecraft.util.Mth; import net.minecraft.world.entity.SlotAccess; import net.minecraft.world.entity.player.Player; @@ -43,51 +46,57 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.TooltipDisplay; +import net.neoforged.neoforge.transfer.item.ItemResource; -public class BarrelItem extends AbstractStorageBlockItem implements ItemContainingItemHelper { - private static final int ITEM_BAR_COLOR = Mth.color(0.4F, 0.4F, 1.0F); +public class BarrelItem extends AbstractStorageBlockItem implements ItemContainingItemHelper { + private static final int ITEM_BAR_COLOR = ARGB.colorFromFloat(1.0F, 0.44F, 0.53F, 1.0F); public BarrelItem(BarrelBlock block, Properties settings) { super(block, settings.stacksTo(1)); } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { if (behaviour instanceof BarrelBlock.BarrelStorage barrelStorage) { Style style = Style.EMPTY.withColor(TextColor.fromRgb(0xa9a9a9)).withItalic(false); if (isEmpty(stack) && isUnlocked(stack)) { - tooltip.add(MIText.Empty.text().setStyle(style)); - tooltip.add(MIText.BarrelStack.text(barrelStorage.stackCapacity).setStyle(TextHelper.YELLOW)); + tooltip.accept(MIText.Empty.text().setStyle(style)); + tooltip.accept(MIText.BarrelStack.text(barrelStorage.stackCapacity).setStyle(TextHelper.YELLOW)); } } - super.appendHoverText(stack, context, tooltip, flag); + super.appendHoverText(stack, context, tooltipDisplay, tooltip, flag); } public long getCurrentCapacity(ItemStack stack) { return behaviour.getCapacityForResource(getResource(stack)); } + @Override public Optional getTooltipImage(ItemStack stack) { if (!getBehaviour().isCreative()) { if (!isEmpty(stack) || !isUnlocked(stack)) { return Optional.of(new BarrelTooltipData(getResource(stack), getAmount(stack), getCurrentCapacity(stack), false)); } - } else if (!getResource(stack).isBlank()) { + } else if (!getResource(stack).isEmpty()) { return Optional.of(new BarrelTooltipData(getResource(stack), -1, -1, true)); } return Optional.empty(); } + @Override public boolean isBarVisible(ItemStack stack) { return !getBehaviour().isCreative() && getAmount(stack) > 0; } + @Override public int getBarWidth(ItemStack stack) { return (int) Math.min(1 + (12 * getAmount(stack)) / getCurrentCapacity(stack), 13); } + @Override public int getBarColor(ItemStack stack) { return ITEM_BAR_COLOR; } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelTooltipData.java b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelTooltipData.java index 6db500d24..49f83e35b 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelTooltipData.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/barrel/BarrelTooltipData.java @@ -24,7 +24,7 @@ package aztech.modern_industrialization.blocks.storage.barrel; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import net.minecraft.world.inventory.tooltip.TooltipComponent; +import net.neoforged.neoforge.transfer.item.ItemResource; -public record BarrelTooltipData(ItemVariant variant, long amount, long capacity, boolean creative) implements TooltipComponent {} +public record BarrelTooltipData(ItemResource variant, long amount, long capacity, boolean creative) implements TooltipComponent {} diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/AbstractTankBlockEntity.java b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/AbstractTankBlockEntity.java index eb5c23bb3..629107dba 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/AbstractTankBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/AbstractTankBlockEntity.java @@ -27,17 +27,19 @@ import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.blocks.storage.AbstractStorageBlockEntity; import aztech.modern_industrialization.blocks.storage.ResourceStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.util.NbtHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponentType; import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; +import net.neoforged.neoforge.transfer.fluid.FluidResource; -public abstract class AbstractTankBlockEntity extends AbstractStorageBlockEntity { +public abstract class AbstractTankBlockEntity extends AbstractStorageBlockEntity { public AbstractTankBlockEntity(BlockEntityType bet, BlockPos pos, BlockState state) { @@ -45,30 +47,30 @@ public AbstractTankBlockEntity(BlockEntityType bet, } @Override - public DataComponentType> componentType() { + public DataComponentType> componentType() { return MIComponents.FLUID_STORAGE.get(); } @Override - public void removeComponentsFromTag(CompoundTag tag) { - super.removeComponentsFromTag(tag); - tag.remove("fluid"); + public void removeComponentsFromTag(ValueOutput output) { + super.removeComponentsFromTag(output); + output.discard("fluid"); } @Override - public FluidVariant loadResource(CompoundTag tag, HolderLookup.Provider registries) { - return NbtHelper.getFluidCompatible(tag, "fluid", registries); + public FluidResource loadResource(ValueInput input) { + return input.read("fluid", FluidResource.OPTIONAL_CODEC).orElse(FluidResource.EMPTY); } @Override - public void saveResource(FluidVariant resource, CompoundTag tag, HolderLookup.Provider registries) { - NbtHelper.putFluid(tag, "fluid", getResource(), registries); + public void saveResource(FluidResource resource, ValueOutput output) { + output.store("fluid", FluidResource.OPTIONAL_CODEC, resource); } @Override - public FluidVariant getBlankResource() { - return FluidVariant.blank(); + public FluidResource getEmptyResource() { + return FluidResource.EMPTY; } - public abstract boolean onPlayerUse(Player player); + public abstract boolean onPlayerUse(Player player, InteractionHand hand); } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlock.java b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlock.java index cf271ff31..e544d7f15 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlock.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlock.java @@ -26,11 +26,10 @@ import aztech.modern_industrialization.blocks.storage.AbstractStorageBlock; import aztech.modern_industrialization.blocks.storage.StorageBehaviour; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.MobSpawning; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; @@ -41,10 +40,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.phys.BlockHitResult; +import net.neoforged.neoforge.transfer.fluid.FluidResource; -public class TankBlock extends AbstractStorageBlock implements EntityBlock { - public TankBlock(EntityBlock factory, StorageBehaviour behaviour) { - super(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).destroyTime(4.0f).noOcclusion().isValidSpawn(MobSpawning.NO_SPAWN) +public class TankBlock extends AbstractStorageBlock implements EntityBlock { + public TankBlock(BlockBehaviour.Properties properties, EntityBlock factory, StorageBehaviour behaviour) { + super(properties.mapColor(MapColor.METAL).destroyTime(4.0f).noOcclusion().isValidSpawn(MobSpawning.NO_SPAWN) .isRedstoneConductor(Blocks::never), factory, behaviour); } @@ -53,19 +53,20 @@ public boolean propagatesSkylightDown(BlockState state, BlockGetter world, Block return true; } - @SuppressWarnings("deprecation") - @Override - public int getLightBlock(BlockState state, BlockGetter world, BlockPos pos) { - return 0; - } + // TODO 26.1 +// @SuppressWarnings("deprecation") +// @Override +// public int getLightBlock(BlockState state, BlockGetter world, BlockPos pos) { +// return 0; +// } @SuppressWarnings("deprecation") @Override - public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, - BlockHitResult hit) { - if (((AbstractTankBlockEntity) world.getBlockEntity(pos)).onPlayerUse(player)) { - return ItemInteractionResult.sidedSuccess(world.isClientSide); + public InteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult hit) { + if (((AbstractTankBlockEntity) world.getBlockEntity(pos)).onPlayerUse(player, hand)) { + return InteractionResult.SUCCESS; } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlockEntity.java b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlockEntity.java index 1d89e06a5..1f306e554 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankBlockEntity.java @@ -25,13 +25,12 @@ package aztech.modern_industrialization.blocks.storage.tank; import aztech.modern_industrialization.pipes.fluid.FluidNetworkExtensionTank; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge.SlotFluidHandler; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.neoforged.neoforge.fluids.FluidUtil; +import net.neoforged.neoforge.transfer.fluid.FluidUtil; public class TankBlockEntity extends AbstractTankBlockEntity { public final FluidNetworkExtensionTank fluidHandler = new FluidNetworkExtensionTank(this); @@ -40,7 +39,8 @@ public TankBlockEntity(BlockEntityType bet, BlockPos pos, BlockState state) { super(bet, pos, state); } - public boolean onPlayerUse(Player player) { - return FluidUtil.interactWithFluidHandler(player, InteractionHand.MAIN_HAND, new SlotFluidHandler(this)); + @Override + public boolean onPlayerUse(Player player, InteractionHand hand) { + return FluidUtil.interactWithFluidHandler(player, hand, worldPosition, this); } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankItem.java b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankItem.java index 47f0ee9ec..79b910be8 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankItem.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/TankItem.java @@ -27,48 +27,51 @@ import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.blocks.storage.AbstractStorageBlockItem; import aztech.modern_industrialization.blocks.storage.ResourceStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.FluidHelper; import java.util.List; +import java.util.function.Consumer; + import net.minecraft.core.component.DataComponentType; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.TooltipDisplay; +import net.neoforged.neoforge.transfer.fluid.FluidResource; -public class TankItem extends AbstractStorageBlockItem { +public class TankItem extends AbstractStorageBlockItem { public TankItem(TankBlock block, Properties settings) { super(block, settings); } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { if (this.behaviour.isCreative()) { - tooltip.add(FluidHelper.getFluidName(getResource(stack), true)); + tooltip.accept(FluidHelper.getFluidName(getResource(stack), true)); } else { long capacity = behaviour.getCapacityForResource(getResource(stack)); if (isEmpty(stack)) { if (!isUnlocked(stack)) { - tooltip.addAll(FluidHelper.getTooltipForFluidStorage(getResource(stack), 0, capacity)); + FluidHelper.getTooltipForFluidStorage(getResource(stack), 0, capacity).forEach(tooltip); } else { - tooltip.addAll(FluidHelper.getTooltipForFluidStorage(FluidVariant.blank(), 0, capacity)); + FluidHelper.getTooltipForFluidStorage(FluidResource.EMPTY, 0, capacity).forEach(tooltip); } } else { - tooltip.addAll(FluidHelper.getTooltipForFluidStorage(getResource(stack), getAmount(stack), capacity)); + FluidHelper.getTooltipForFluidStorage(getResource(stack), getAmount(stack), capacity).forEach(tooltip); } } - super.appendHoverText(stack, context, tooltip, flag); + super.appendHoverText(stack, context, tooltipDisplay, tooltip, flag); } @Override - public DataComponentType> getComponentType() { + public DataComponentType> getComponentType() { return MIComponents.FLUID_STORAGE.get(); } @Override - public ResourceStorage getDefaultComponent() { + public ResourceStorage getDefaultComponent() { return ResourceStorage.FLUID_EMPTY; } } diff --git a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/creativetank/CreativeTankBlockEntity.java b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/creativetank/CreativeTankBlockEntity.java index 94600bd76..27b27e79a 100644 --- a/src/main/java/aztech/modern_industrialization/blocks/storage/tank/creativetank/CreativeTankBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/blocks/storage/tank/creativetank/CreativeTankBlockEntity.java @@ -26,14 +26,15 @@ import aztech.modern_industrialization.MIRegistries; import aztech.modern_industrialization.blocks.storage.tank.AbstractTankBlockEntity; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.fluids.FluidUtil; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.neoforged.neoforge.transfer.access.ItemAccess; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.fluid.FluidUtil; +import net.neoforged.neoforge.transfer.transaction.Transaction; public class CreativeTankBlockEntity extends AbstractTankBlockEntity { public CreativeTankBlockEntity(BlockPos pos, BlockState state) { @@ -41,30 +42,31 @@ public CreativeTankBlockEntity(BlockPos pos, BlockState state) { } @Override - public boolean onPlayerUse(Player player) { - if (isResourceBlank()) { - var fluid = FluidUtil.getFluidContained(player.getItemInHand(InteractionHand.MAIN_HAND)); - if (fluid.isPresent()) { - setFluid(FluidVariant.of(fluid.get())); + public boolean onPlayerUse(Player player, InteractionHand hand) { + if (resource.isEmpty()) { + var fluid = FluidUtil.getFirstStackContained(player.getItemInHand(hand)); + if (!fluid.isEmpty()) { + setFluid(FluidResource.of(fluid)); return true; } - return !isResourceBlank(); + return !resource.isEmpty(); } else { - // Fill all of the stacks, fuck it! - var fluidHandler = player.getItemInHand(InteractionHand.MAIN_HAND).getCapability(Capabilities.FluidHandler.ITEM); + var fluidHandler = ItemAccess.forPlayerInteraction(player, hand).getCapability(Capabilities.Fluid.ITEM); if (fluidHandler != null) { - int inserted = fluidHandler.fill(resource.toStack(Integer.MAX_VALUE), IFluidHandler.FluidAction.EXECUTE); - if (inserted > 0) { - player.setItemInHand(InteractionHand.MAIN_HAND, fluidHandler.getContainer()); - return true; + try (var tx = Transaction.openRoot()) { + int inserted = fluidHandler.insert(resource, Integer.MAX_VALUE, tx); + if (inserted > 0) { + tx.commit(); + return true; + } } } } return false; } - public void setFluid(FluidVariant variant) { - resource = variant; + public void setFluid(FluidResource resource) { + this.resource = resource; onChanged(); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/ae2/EnergyP2PTunnelPart.java b/src/main/java/aztech/modern_industrialization/compat/ae2/EnergyP2PTunnelPart.java index 18c00ed79..40968a213 100644 --- a/src/main/java/aztech/modern_industrialization/compat/ae2/EnergyP2PTunnelPart.java +++ b/src/main/java/aztech/modern_industrialization/compat/ae2/EnergyP2PTunnelPart.java @@ -30,23 +30,21 @@ import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPartItem; -import appeng.api.parts.IPartModel; -import appeng.items.parts.PartModels; import appeng.parts.PartAdjacentApi; import appeng.parts.p2p.P2PTunnelPart; import aztech.modern_industrialization.api.energy.*; import aztech.modern_industrialization.config.MIServerConfig; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StoragePreconditions; -import dev.technici4n.grandpower.api.DelegatingEnergyStorage; -import dev.technici4n.grandpower.api.EnergyStorageUtil; -import dev.technici4n.grandpower.api.ILongEnergyStorage; -import java.util.List; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -public class EnergyP2PTunnelPart extends P2PTunnelPart implements IGridTickable { - private static final P2PModels MODELS = new P2PModels("part/energy_p2p_tunnel"); +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.energy.DelegatingEnergyHandler; +import net.neoforged.neoforge.transfer.energy.EnergyHandler; +import net.neoforged.neoforge.transfer.energy.EnergyHandlerUtil; +import net.neoforged.neoforge.transfer.transaction.SnapshotJournal; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; +public class EnergyP2PTunnelPart extends P2PTunnelPart implements IGridTickable { private final PartAdjacentApi adjacentCapability; private final MIEnergyStorage inputStorage = new InputEnergyStorage(); private final EnergyBuffer outputBuffer = new EnergyBuffer(); @@ -69,16 +67,16 @@ public MIEnergyStorage getExposedApi() { } @Override - public void readFromNBT(CompoundTag data, HolderLookup.Provider registries) { - super.readFromNBT(data, registries); - outputBuffer.energy = data.getLong("energy"); + public void readFromNBT(ValueInput input) { + super.readFromNBT(input); + outputBuffer.energy = input.getLongOr("energy", 0); } @Override - public void writeToNBT(CompoundTag data, HolderLookup.Provider registries) { - super.writeToNBT(data, registries); + public void writeToNBT(ValueOutput output) { + super.writeToNBT(output); if (outputBuffer.energy > 0) { - data.putLong("energy", outputBuffer.energy); + output.putLong("energy", outputBuffer.energy); } } @@ -104,74 +102,68 @@ public TickRateModulation tickingRequest(IGridNode node, int ticksSinceLastCall) adjacentEnergy = EnergyApi.EMPTY; } - long moved = EnergyStorageUtil.move(outputBuffer, adjacentEnergy, Long.MAX_VALUE); + int moved = EnergyHandlerUtil.move(outputBuffer, adjacentEnergy, Integer.MAX_VALUE, null); return moved > 0 ? TickRateModulation.FASTER : TickRateModulation.SLOWER; } else { return TickRateModulation.IDLE; } } - @PartModels - public static List getModels() { - return MODELS.getModels(); - } - - @Override - public IPartModel getStaticModels() { - return MODELS.getModel(this.isPowered(), this.isActive()); - } + // TODO 26.1 +// @PartModels +// public static List getModels() { +// return MODELS.getModels(); +// } +// +// @Override +// public IPartModel getStaticModels() { +// return MODELS.getModel(this.isPowered(), this.isActive()); +// } private class InputEnergyStorage implements MIEnergyStorage.NoExtract { @Override - public boolean canReceive() { - return true; - } - - @Override - public long receive(long maxAmount, boolean simulate) { - StoragePreconditions.notNegative(maxAmount); - long total = 0; + public int insert(int maxAmount, TransactionContext transaction) { + TransferPreconditions.checkNonNegative(maxAmount); + int total = 0; final int outputTunnels = getOutputs().size(); - final long amount = maxAmount; + final int amount = maxAmount; if (outputTunnels == 0 || amount == 0) { return 0; } - final long amountPerOutput = amount / outputTunnels; - long overflow = amountPerOutput == 0 ? amount : amount % amountPerOutput; + final int amountPerOutput = amount / outputTunnels; + int overflow = amountPerOutput == 0 ? amount : amount % amountPerOutput; for (var target : getOutputs()) { - final long toSend = amountPerOutput + overflow; + final int toSend = amountPerOutput + overflow; - final long received = target.outputBuffer.receive(toSend, simulate); + final int received = target.outputBuffer.insert(toSend, transaction); overflow = toSend - received; total += received; } - if (!simulate) { - queueTunnelDrain(PowerUnit.FE, total * MIServerConfig.INSTANCE.forgeEnergyPerEu.getAsInt()); - } + deductEnergyCost(total * MIServerConfig.INSTANCE.forgeEnergyPerEu.getAsInt(), PowerUnit.FE, transaction); return total; } @Override - public long getAmount() { + public long getAmountAsLong() { long tot = 0; for (var output : getOutputs()) { - tot += output.outputBuffer.getAmount(); + tot += output.outputBuffer.getAmountAsLong(); } return tot; } @Override - public long getCapacity() { + public long getCapacityAsLong() { long tot = 0; for (var output : getOutputs()) { - tot += output.outputBuffer.getCapacity(); + tot += output.outputBuffer.getCapacityAsLong(); } return tot; } @@ -182,69 +174,70 @@ public boolean canConnect(CableTier cableTier) { } } - private class EnergyBuffer implements ILongEnergyStorage { + private class EnergyBuffer extends SnapshotJournal implements EnergyHandler { private long energy; @Override - public long receive(long maxReceive, boolean simulate) { - long inserted = Math.min(getCapacity() - energy, maxReceive); + protected Long createSnapshot() { + return energy; + } + + @Override + protected void revertToSnapshot(Long snapshot) { + energy = snapshot; + } + + @Override + protected void onRootCommit(Long originalState) { + getHost().markForSave(); + } + + @Override + public int insert(int amount, TransactionContext transaction) { + int inserted = (int) Math.min(getCapacityAsLong() - energy, amount); if (inserted > 0) { - if (!simulate) { - energy += inserted; - getHost().markForSave(); - } + updateSnapshots(transaction); + energy += inserted; return inserted; } return 0; } @Override - public long extract(long maxExtract, boolean simulate) { + public int extract(int amount, TransactionContext transaction) { // Note that extraction is allowed even if we are inactive since the p2p transfer already happened. - long extracted = Math.min(energy, maxExtract); + int extracted = (int) Math.min(energy, amount); if (extracted > 0) { - if (!simulate) { - energy -= extracted; - getHost().markForSave(); - } + updateSnapshots(transaction); + energy -= extracted; return extracted; } return 0; } @Override - public long getAmount() { + public long getAmountAsLong() { return energy; } @Override - public long getCapacity() { + public long getCapacityAsLong() { return isActive() ? CableTier.SUPERCONDUCTOR.getMaxTransfer() : 0; } - - @Override - public boolean canExtract() { - return true; - } - - @Override - public boolean canReceive() { - return true; - } } - private class OutputEnergyStorage extends DelegatingEnergyStorage implements MIEnergyStorage { + private class OutputEnergyStorage extends DelegatingEnergyHandler implements MIEnergyStorage { public OutputEnergyStorage() { super(outputBuffer); } @Override - public boolean canReceive() { + public boolean supportsInsertion() { return false; } @Override - public long receive(long maxReceive, boolean simulate) { + public int insert(int amount, TransactionContext transaction) { return 0; } diff --git a/src/main/java/aztech/modern_industrialization/compat/ae2/MIAEAddon.java b/src/main/java/aztech/modern_industrialization/compat/ae2/MIAEAddon.java index af06137ec..b7ac902c5 100644 --- a/src/main/java/aztech/modern_industrialization/compat/ae2/MIAEAddon.java +++ b/src/main/java/aztech/modern_industrialization/compat/ae2/MIAEAddon.java @@ -25,11 +25,9 @@ package aztech.modern_industrialization.compat.ae2; import appeng.api.features.P2PTunnelAttunement; -import appeng.api.parts.PartModels; import appeng.api.parts.RegisterPartCapabilitiesEvent; import appeng.api.util.AEColor; import appeng.items.parts.PartItem; -import appeng.items.parts.PartModelsHelper; import aztech.modern_industrialization.*; import aztech.modern_industrialization.api.energy.CableTier; import aztech.modern_industrialization.api.energy.EnergyApi; @@ -60,14 +58,14 @@ public class MIAEAddon { public static final ItemDefinition> ENERGY_P2P_TUNNEL = MIItem.item( "EU P2P Tunnel", "energy_p2p_tunnel", - p -> new PartItem<>(new Item.Properties(), EnergyP2PTunnelPart.class, EnergyP2PTunnelPart::new), - (item, gen) -> {}, + p -> new PartItem<>(p, EnergyP2PTunnelPart.class, EnergyP2PTunnelPart::new), + (item, gen) -> { + gen.declareCustomModelItem(item); + }, SortOrder.CABLES.and(CableTier.SUPERCONDUCTOR).and("extra")); public static final List PIPES = new ArrayList<>(); public static void init(IEventBus modBus) { - PartModels.registerModels(PartModelsHelper.createModels(EnergyP2PTunnelPart.class)); - modBus.addListener(MIAEAddon::commonSetup); modBus.addListener(MIAEAddon::registerPartCapabilities); } @@ -107,6 +105,7 @@ private static void registerMEPipeType(PipeColor color) { var type = PipeNetworkType.register( MI.id(pipeId), (id, data) -> new MENetwork(id, data, aeColor), + MENetworkData.CODEC, MENetworkNode::new, color.color, false); diff --git a/src/main/java/aztech/modern_industrialization/compat/ae2/P2PModels.java b/src/main/java/aztech/modern_industrialization/compat/ae2/P2PModels.java index 78789c7ac..cfc532b32 100644 --- a/src/main/java/aztech/modern_industrialization/compat/ae2/P2PModels.java +++ b/src/main/java/aztech/modern_industrialization/compat/ae2/P2PModels.java @@ -24,47 +24,46 @@ package aztech.modern_industrialization.compat.ae2; -import appeng.api.parts.IPartModel; import appeng.core.AppEng; -import appeng.parts.PartModel; import aztech.modern_industrialization.MI; import java.util.ArrayList; import java.util.List; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class P2PModels { - public static final ResourceLocation MODEL_STATUS_OFF = AppEng.makeId("part/p2p/p2p_tunnel_status_off"); - public static final ResourceLocation MODEL_STATUS_ON = AppEng.makeId("part/p2p/p2p_tunnel_status_on"); - public static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = AppEng.makeId("part/p2p/p2p_tunnel_status_has_channel"); - public static final ResourceLocation MODEL_FREQUENCY = AppEng.makeId("part/p2p/p2p_tunnel_frequency"); + public static final Identifier MODEL_STATUS_OFF = AppEng.makeId("part/p2p/p2p_tunnel_status_off"); + public static final Identifier MODEL_STATUS_ON = AppEng.makeId("part/p2p/p2p_tunnel_status_on"); + public static final Identifier MODEL_STATUS_HAS_CHANNEL = AppEng.makeId("part/p2p/p2p_tunnel_status_has_channel"); + public static final Identifier MODEL_FREQUENCY = AppEng.makeId("part/p2p/p2p_tunnel_frequency"); - private final IPartModel modelsOff; - private final IPartModel modelsOn; - private final IPartModel modelsHasChannel; - - public P2PModels(String frontModelPath) { - ResourceLocation frontModel = MI.id(frontModelPath); - - this.modelsOff = new PartModel(MODEL_STATUS_OFF, MODEL_FREQUENCY, frontModel); - this.modelsOn = new PartModel(MODEL_STATUS_ON, MODEL_FREQUENCY, frontModel); - this.modelsHasChannel = new PartModel(MODEL_STATUS_HAS_CHANNEL, MODEL_FREQUENCY, frontModel); - } - - public IPartModel getModel(boolean hasPower, boolean hasChannel) { - if (hasPower && hasChannel) { - return this.modelsHasChannel; - } else if (hasPower) { - return this.modelsOn; - } else { - return this.modelsOff; - } - } - - public List getModels() { - List result = new ArrayList<>(); - result.add(this.modelsOff); - result.add(this.modelsOn); - result.add(this.modelsHasChannel); - return result; - } + // TODO 26.1 +// private final IPartModel modelsOff; +// private final IPartModel modelsOn; +// private final IPartModel modelsHasChannel; +// +// public P2PModels(String frontModelPath) { +// Identifier frontModel = MI.id(frontModelPath); +// +// this.modelsOff = new PartModel(MODEL_STATUS_OFF, MODEL_FREQUENCY, frontModel); +// this.modelsOn = new PartModel(MODEL_STATUS_ON, MODEL_FREQUENCY, frontModel); +// this.modelsHasChannel = new PartModel(MODEL_STATUS_HAS_CHANNEL, MODEL_FREQUENCY, frontModel); +// } +// +// public IPartModel getModel(boolean hasPower, boolean hasChannel) { +// if (hasPower && hasChannel) { +// return this.modelsHasChannel; +// } else if (hasPower) { +// return this.modelsOn; +// } else { +// return this.modelsOff; +// } +// } +// +// public List getModels() { +// List result = new ArrayList<>(); +// result.add(this.modelsOff); +// result.add(this.modelsOn); +// result.add(this.modelsHasChannel); +// return result; +// } } diff --git a/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetwork.java b/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetwork.java index fe186ee29..25e597a18 100644 --- a/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetwork.java +++ b/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetwork.java @@ -41,8 +41,8 @@ public class MENetwork extends PipeNetwork { final AEColor color; - public MENetwork(int id, @Nullable PipeNetworkData data, AEColor color) { - super(id, data == null ? new MENetworkData() : data); + public MENetwork(int id, MENetworkData data, AEColor color) { + super(id, data); this.color = color; } diff --git a/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkData.java b/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkData.java index ad5f447d2..8ffa77f91 100644 --- a/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkData.java +++ b/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkData.java @@ -26,10 +26,18 @@ import appeng.api.networking.*; import aztech.modern_industrialization.pipes.api.PipeNetworkData; +import aztech.modern_industrialization.util.MIExtraCodecs; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; +import net.neoforged.neoforge.common.util.ValueIOSerializable; + +public class MENetworkData implements PipeNetworkData, ValueIOSerializable { + public static final MapCodec CODEC = MIExtraCodecs.valueSerializable(MENetworkData::new); -public class MENetworkData extends PipeNetworkData { private final IManagedGridNode mainNode; public MENetworkData() { @@ -49,14 +57,13 @@ public PipeNetworkData clone() { } @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { - this.getMainNode().loadFromNBT(tag); + public void deserialize(ValueInput input) { + this.getMainNode().deserialize(input); } @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - this.getMainNode().saveToNBT(tag); - return tag; + public void serialize(ValueOutput output) { + this.getMainNode().serialize(output); } // someone abuses equals diff --git a/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkNode.java b/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkNode.java index 2d1aa6963..fba2c7d13 100644 --- a/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkNode.java +++ b/src/main/java/aztech/modern_industrialization/compat/ae2/pipe/MENetworkNode.java @@ -35,11 +35,11 @@ import java.util.*; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import org.jspecify.annotations.Nullable; public class MENetworkNode extends PipeNetworkNode { @@ -125,21 +125,20 @@ public void addConnection(PipeBlockEntity pipe, Player player, Level world, Bloc } @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - tag.putByte("connections", NbtHelper.encodeDirections(connections)); + public void save(ValueOutput output) { + output.putByte("connections", NbtHelper.encodeDirections(connections)); if (mainNode != null) { - mainNode.saveToNBT(tag); + mainNode.serialize(output); } - return tag; } @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { + public void read(ValueInput input) { connections.clear(); - connections.addAll(Arrays.asList(NbtHelper.decodeDirections(tag.getByte("connections")))); + Collections.addAll(connections, NbtHelper.decodeDirections(input.getByteOr("connections", (byte) 0))); updateNode(); if (mainNode != null) { - mainNode.loadFromNBT(tag); + mainNode.deserialize(input); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/jade/server/MIJadeCommonPlugin.java b/src/main/java/aztech/modern_industrialization/compat/jade/server/MIJadeCommonPlugin.java index 09e7c2c85..b7db151c0 100644 --- a/src/main/java/aztech/modern_industrialization/compat/jade/server/MIJadeCommonPlugin.java +++ b/src/main/java/aztech/modern_industrialization/compat/jade/server/MIJadeCommonPlugin.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.blocks.storage.tank.TankBlockEntity; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import snownee.jade.api.IWailaCommonRegistration; import snownee.jade.api.IWailaPlugin; import snownee.jade.api.WailaPlugin; @@ -49,7 +49,7 @@ public void register(IWailaCommonRegistration registration) { registration.registerFluidStorage(new TankComponentProvider(), TankBlockEntity.class); } - public static JadeFluidObject fluidStack(FluidVariant variant, long amount) { + public static JadeFluidObject fluidStack(FluidResource variant, long amount) { return JadeFluidObject.of(variant.getFluid(), amount, variant.getComponentsPatch()); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/jade/server/MachineComponentProvider.java b/src/main/java/aztech/modern_industrialization/compat/jade/server/MachineComponentProvider.java index 6f21f98ba..6871380cc 100644 --- a/src/main/java/aztech/modern_industrialization/compat/jade/server/MachineComponentProvider.java +++ b/src/main/java/aztech/modern_industrialization/compat/jade/server/MachineComponentProvider.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.ItemStack; import snownee.jade.api.Accessor; import snownee.jade.api.view.ClientViewGroup; @@ -51,13 +51,13 @@ public abstract sealed class MachineComponentProvider implements IServerExtensionProvider, IClientExtensionProvider { @Override - public ResourceLocation getUid() { + public Identifier getUid() { return MI.id("machine"); } - public static final class Energy extends MachineComponentProvider { + public static final class Energy extends MachineComponentProvider { @Override - public List> getGroups(Accessor accessor) { + public List> getGroups(Accessor accessor) { if (accessor.getTarget() instanceof EnergyListComponentHolder holder) { var components = holder.getEnergyComponents(); @@ -71,26 +71,26 @@ public List> getGroups(Accessor accessor) { } // TODO: set unit to EU once supported by the Jade API - return List.of(new ViewGroup<>(List.of(EnergyView.of(stored, capacity)))); + return List.of(new ViewGroup<>(List.of(new EnergyView.Data(stored, capacity)))); } } else if (accessor.getTarget() instanceof EnergyComponentHolder holder) { var component = holder.getEnergyComponent(); - return List.of(new ViewGroup<>(List.of(EnergyView.of(component.getEu(), component.getCapacity())))); + return List.of(new ViewGroup<>(List.of(new EnergyView.Data(component.getEu(), component.getCapacity())))); } return List.of(); } @Override - public List> getClientGroups(Accessor accessor, List> list) { + public List> getClientGroups(Accessor accessor, List> list) { // TODO: fix spacing between EU and the rest (another day) return ClientViewGroup.map(list, tag -> EnergyView.read(tag, " EU"), null); } } - public static final class Fluids extends MachineComponentProvider { + public static final class Fluids extends MachineComponentProvider { @Override - public List> getGroups(Accessor accessor) { + public List> getGroups(Accessor accessor) { var machine = (MachineBlockEntity) accessor.getTarget(); if (machine instanceof MultiblockInventoryComponentHolder holder) { var component = holder.getMultiblockInventoryComponent(); @@ -98,7 +98,7 @@ public List> getGroups(Accessor accessor) { var outputs = component.getFluidOutputs(); if (!inputs.isEmpty() || !outputs.isEmpty()) { - var fluidData = new ViewGroup(new ArrayList<>()); + var fluidData = new ViewGroup(new ArrayList<>()); addFluids(fluidData, inputs); addFluids(fluidData, outputs); return List.of(fluidData); @@ -110,28 +110,28 @@ public List> getGroups(Accessor accessor) { if (component != null) { var fluid = component.getVariant(); - var fluidData = new ViewGroup(new ArrayList<>()); - fluidData.views.add(FluidView.writeDefault(MIJadeCommonPlugin.fluidStack(fluid, component.getAmount()), component.getCapacity())); + var fluidData = new ViewGroup(new ArrayList<>()); + fluidData.views.add(new FluidView.Data(MIJadeCommonPlugin.fluidStack(fluid, component.getAmount()), component.getCapacity())); return List.of(fluidData); } else { return List.of(); } } else { var stacks = machine.getInventory().getFluidStacks(); - var fluidData = new ViewGroup(new ArrayList<>()); + var fluidData = new ViewGroup(new ArrayList<>()); addFluids(fluidData, stacks); return List.of(fluidData); } } - private void addFluids(ViewGroup data, List stacks) { + private void addFluids(ViewGroup data, List stacks) { for (var stack : stacks) { - data.views.add(FluidView.writeDefault(MIJadeCommonPlugin.fluidStack(stack.getVariant(), stack.getAmount()), stack.getCapacity())); + data.views.add(new FluidView.Data(MIJadeCommonPlugin.fluidStack(stack.getVariant(), stack.getAmount()), stack.getCapacity())); } } @Override - public List> getClientGroups(Accessor accessor, List> list) { + public List> getClientGroups(Accessor accessor, List> list) { return ClientViewGroup.map(list, FluidView::readDefault, null); } } @@ -176,16 +176,16 @@ public List> getClientGroups(Accessor accessor, Lis } // TODO: probably needs to be rewritten to be standalone for a better display - public static final class Progress extends MachineComponentProvider { + public static final class Progress extends MachineComponentProvider { @Override - public List> getGroups(Accessor accessor) { + public List> getGroups(Accessor accessor) { if (accessor.getTarget() instanceof CrafterComponentHolder holder) { var component = holder.getCrafterComponent(); var progress = component.getProgress(); if (progress > 0.0f) { var inventory = holder.getCrafterComponent().getInventory(); - var progressData = new ViewGroup(new ArrayList<>()); + var progressData = new ViewGroup(new ArrayList<>()); // TODO potentially add inventory information if the Jade API ever supports it // for (var stack : inventory.getItemInputs()) { @@ -196,7 +196,7 @@ public List> getGroups(Accessor accessor) { // progressData.output(stack.toStack()); // } - progressData.views.add(ProgressView.create(progress)); + progressData.views.add(new ProgressView.Data(progress)); return List.of(progressData); } } @@ -204,7 +204,7 @@ public List> getGroups(Accessor accessor) { } @Override - public List> getClientGroups(Accessor accessor, List> list) { + public List> getClientGroups(Accessor accessor, List> list) { return ClientViewGroup.map(list, ProgressView::read, null); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/jade/server/OverclockComponentProvider.java b/src/main/java/aztech/modern_industrialization/compat/jade/server/OverclockComponentProvider.java index d4c4f3e5e..fa5ed2c83 100644 --- a/src/main/java/aztech/modern_industrialization/compat/jade/server/OverclockComponentProvider.java +++ b/src/main/java/aztech/modern_industrialization/compat/jade/server/OverclockComponentProvider.java @@ -27,13 +27,13 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.api.machine.holder.CrafterComponentHolder; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IServerDataProvider; public class OverclockComponentProvider implements IServerDataProvider { @Override - public ResourceLocation getUid() { + public Identifier getUid() { return MI.id("overclock"); } diff --git a/src/main/java/aztech/modern_industrialization/compat/jade/server/PipeDataProvider.java b/src/main/java/aztech/modern_industrialization/compat/jade/server/PipeDataProvider.java index 2c96c556f..767c1b3d2 100644 --- a/src/main/java/aztech/modern_industrialization/compat/jade/server/PipeDataProvider.java +++ b/src/main/java/aztech/modern_industrialization/compat/jade/server/PipeDataProvider.java @@ -31,13 +31,14 @@ import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; import aztech.modern_industrialization.pipes.item.ItemNetworkNode; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import snownee.jade.api.BlockAccessor; import snownee.jade.api.IServerDataProvider; public class PipeDataProvider implements IServerDataProvider { @Override - public ResourceLocation getUid() { + public Identifier getUid() { return MI.id("pipe"); } @@ -50,7 +51,7 @@ public void appendServerData(CompoundTag data, BlockAccessor accessor) { if (node instanceof FluidNetworkNode fluidNode) { var info = fluidNode.collectNetworkInfo(); - pipeData.put("fluid", info.fluid().toNbt(be.getLevel().registryAccess())); + pipeData.store("fluid", FluidResource.OPTIONAL_CODEC, info.fluid()); pipeData.putLong("amount", info.stored()); pipeData.putLong("capacity", info.capacity()); pipeData.putLong("transfer", info.transfer()); diff --git a/src/main/java/aztech/modern_industrialization/compat/jade/server/TankComponentProvider.java b/src/main/java/aztech/modern_industrialization/compat/jade/server/TankComponentProvider.java index dfc41cda7..45d3d56c9 100644 --- a/src/main/java/aztech/modern_industrialization/compat/jade/server/TankComponentProvider.java +++ b/src/main/java/aztech/modern_industrialization/compat/jade/server/TankComponentProvider.java @@ -27,18 +27,8 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.blocks.storage.tank.TankBlockEntity; import java.util.List; -import net.minecraft.ChatFormatting; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtOps; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.material.Fluids; -import net.neoforged.neoforge.fluids.FluidStack; -import org.jspecify.annotations.Nullable; +import net.minecraft.resources.Identifier; import snownee.jade.api.Accessor; -import snownee.jade.api.fluid.JadeFluidObject; -import snownee.jade.api.ui.IDisplayHelper; -import snownee.jade.api.ui.IElementHelper; import snownee.jade.api.view.ClientViewGroup; import snownee.jade.api.view.FluidView; import snownee.jade.api.view.IClientExtensionProvider; @@ -49,48 +39,22 @@ * Provider for the stored fluid of a tank. * Mainly exists because of the quantum tank which stores more fluid than can be queried through IFluidHandler. */ -public class TankComponentProvider implements IServerExtensionProvider, IClientExtensionProvider { +public class TankComponentProvider implements IServerExtensionProvider, IClientExtensionProvider { @Override - public List> getGroups(Accessor accessor) { + public List> getGroups(Accessor accessor) { var tank = (TankBlockEntity) accessor.getTarget(); + var resource = tank.getResource(0); return List.of(new ViewGroup<>(List.of( - FluidView.writeDefault(MIJadeCommonPlugin.fluidStack(tank.getResource(), tank.getAmount()), tank.getCapacity())))); + new FluidView.Data(MIJadeCommonPlugin.fluidStack(resource, tank.getAmountAsLong(0)), tank.getCapacityAsLong(0, resource))))); } @Override - public List> getClientGroups(Accessor accessor, List> list) { - return ClientViewGroup.map(list, TankComponentProvider::readFluidViewLong, null); - } - - /** - * Copy/paste of {@link FluidView#readDefault(CompoundTag)} with fluid name getting changed such that it stops showing Air for large amounts. - */ - @Nullable - public static FluidView readFluidViewLong(CompoundTag tag) { - long capacity = tag.getLong("capacity"); - if (capacity <= 0L) { - return null; - } - JadeFluidObject fluidObject = JadeFluidObject.CODEC.parse(NbtOps.INSTANCE, tag.get("fluid")).result().orElse(null); - if (fluidObject == null) { - return null; - } - long amount = fluidObject.getAmount(); - FluidView fluidView = new FluidView(IElementHelper.get().fluid(fluidObject)); - fluidView.fluidName = new FluidStack(fluidObject.getType().builtInRegistryHolder(), 1, fluidObject.getComponents()).getHoverName(); - fluidView.current = IDisplayHelper.get().humanReadableNumber((double) amount, "B", true); - fluidView.max = IDisplayHelper.get().humanReadableNumber((double) capacity, "B", true); - fluidView.ratio = (float) ((double) amount / (double) capacity); - if (fluidObject.getType().isSame(Fluids.EMPTY)) { - fluidView.overrideText = Component.translatable("jade.fluid", FluidView.EMPTY_FLUID, - Component.literal(fluidView.max).withStyle(ChatFormatting.GRAY)); - } - - return fluidView; + public List> getClientGroups(Accessor accessor, List> list) { + return ClientViewGroup.map(list, FluidView::readDefault, null); } @Override - public ResourceLocation getUid() { + public Identifier getUid() { return MI.id("tank"); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/rei/machines/MachineCategoryParams.java b/src/main/java/aztech/modern_industrialization/compat/rei/machines/MachineCategoryParams.java index b9ab870fd..196e757d1 100644 --- a/src/main/java/aztech/modern_industrialization/compat/rei/machines/MachineCategoryParams.java +++ b/src/main/java/aztech/modern_industrialization/compat/rei/machines/MachineCategoryParams.java @@ -31,11 +31,11 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MachineCategoryParams { public final String englishName; - public final ResourceLocation category; + public final Identifier category; public final SlotPositions itemInputs; public final SlotPositions itemOutputs; public final SlotPositions fluidInputs; @@ -45,9 +45,9 @@ public class MachineCategoryParams { public final Predicate recipePredicate; public final boolean isMultiblock; public final SteamMode steamMode; - public final List workstations = new ArrayList<>(); + public final List workstations = new ArrayList<>(); - public MachineCategoryParams(String englishName, ResourceLocation category, SlotPositions itemInputs, SlotPositions itemOutputs, + public MachineCategoryParams(String englishName, Identifier category, SlotPositions itemInputs, SlotPositions itemOutputs, SlotPositions fluidInputs, SlotPositions fluidOutputs, ProgressBar.Params progressBarParams, MachineRecipeType recipeType, Predicate recipePredicate, boolean isMultiblock, SteamMode steamMode) { this.englishName = englishName; diff --git a/src/main/java/aztech/modern_industrialization/compat/rei/machines/ReiMachineRecipes.java b/src/main/java/aztech/modern_industrialization/compat/rei/machines/ReiMachineRecipes.java index cd103b10f..3a2b77fea 100644 --- a/src/main/java/aztech/modern_industrialization/compat/rei/machines/ReiMachineRecipes.java +++ b/src/main/java/aztech/modern_industrialization/compat/rei/machines/ReiMachineRecipes.java @@ -28,7 +28,7 @@ import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate; import aztech.modern_industrialization.util.Rectangle; import java.util.*; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.jspecify.annotations.Nullable; /** @@ -36,27 +36,27 @@ * called even if REI is not loaded, and should not reference the REI API. */ public class ReiMachineRecipes { - public static final Map categories = new TreeMap<>(); + public static final Map categories = new TreeMap<>(); /** * Maps a machine block id to the list of recipe categories. */ - public static final Map> machineToClickAreaCategory = new HashMap<>(); + public static final Map> machineToClickAreaCategory = new HashMap<>(); /** * Maps a machine block id to the parameters of the click area for the recipe. */ - public static final Map machineToClickArea = new HashMap<>(); + public static final Map machineToClickArea = new HashMap<>(); /** * List of registered multiblock shape "recipes". */ public static final List multiblockShapes = new ArrayList<>(); - public static void registerCategory(ResourceLocation machine, MachineCategoryParams params) { + public static void registerCategory(Identifier machine, MachineCategoryParams params) { if (categories.put(machine, params) != null) { throw new IllegalStateException("Machine was already registered: " + machine); } } - public static void registerWorkstation(ResourceLocation machine, ResourceLocation item) { + public static void registerWorkstation(Identifier machine, Identifier item) { MachineCategoryParams params = categories.get(machine); if (params == null) { throw new NullPointerException("Machine params may not be null for machine " + machine); @@ -64,21 +64,21 @@ public static void registerWorkstation(ResourceLocation machine, ResourceLocatio params.workstations.add(item); } - public static void registerRecipeCategoryForMachine(ResourceLocation machine, ResourceLocation category) { + public static void registerRecipeCategoryForMachine(Identifier machine, Identifier category) { registerRecipeCategoryForMachine(machine, category, MachineScreenPredicate.ANY); } - public static void registerRecipeCategoryForMachine(ResourceLocation machine, ResourceLocation category, + public static void registerRecipeCategoryForMachine(Identifier machine, Identifier category, MachineScreenPredicate screenPredicate) { machineToClickAreaCategory.computeIfAbsent(machine, k -> new ArrayList<>()) .add(new ClickAreaCategory(category, screenPredicate)); } - public static void registerMachineClickArea(ResourceLocation machine, Rectangle clickArea) { + public static void registerMachineClickArea(Identifier machine, Rectangle clickArea) { machineToClickArea.put(machine, clickArea); } - public static void registerMultiblockShape(ResourceLocation machine, ShapeTemplate shapeTemplate) { + public static void registerMultiblockShape(Identifier machine, ShapeTemplate shapeTemplate) { registerMultiblockShape(machine, shapeTemplate, null); } @@ -86,7 +86,7 @@ public static void registerMultiblockShape(String machine, ShapeTemplate shapeTe registerMultiblockShape(MI.id(machine), shapeTemplate); } - public static void registerMultiblockShape(ResourceLocation machine, ShapeTemplate shapeTemplate, @Nullable String alternative) { + public static void registerMultiblockShape(Identifier machine, ShapeTemplate shapeTemplate, @Nullable String alternative) { multiblockShapes.add(new MultiblockShape(machine, shapeTemplate, alternative)); } @@ -95,10 +95,10 @@ public static void registerMultiblockShape(String machine, ShapeTemplate shapeTe } public static class ClickAreaCategory { - public final ResourceLocation category; + public final Identifier category; public final MachineScreenPredicate predicate; - ClickAreaCategory(ResourceLocation category, MachineScreenPredicate predicate) { + ClickAreaCategory(Identifier category, MachineScreenPredicate predicate) { this.category = category; this.predicate = predicate; } @@ -109,5 +109,5 @@ public enum MachineScreenPredicate { MULTIBLOCK, } - public record MultiblockShape(ResourceLocation machine, ShapeTemplate shapeTemplate, @Nullable String alternative) {} + public record MultiblockShape(Identifier machine, ShapeTemplate shapeTemplate, @Nullable String alternative) {} } diff --git a/src/main/java/aztech/modern_industrialization/compat/viewer/ReiDraggable.java b/src/main/java/aztech/modern_industrialization/compat/viewer/ReiDraggable.java index 67123ecd3..d867246fc 100644 --- a/src/main/java/aztech/modern_industrialization/compat/viewer/ReiDraggable.java +++ b/src/main/java/aztech/modern_industrialization/compat/viewer/ReiDraggable.java @@ -24,9 +24,9 @@ package aztech.modern_industrialization.compat.viewer; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.Simulation; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; /** * Can be implemented by slots or {@code AbstractWidget} @@ -35,7 +35,7 @@ * if dragging is accepted. */ public interface ReiDraggable { - boolean dragFluid(FluidVariant fluidKey, Simulation simulation); + boolean dragFluid(FluidResource fluidResource, Simulation simulation); - boolean dragItem(ItemVariant itemKey, Simulation simulation); + boolean dragItem(ItemResource itemResource, Simulation simulation); } diff --git a/src/main/java/aztech/modern_industrialization/config/MIClientConfig.java b/src/main/java/aztech/modern_industrialization/config/MIClientConfig.java index 12ef269b3..f21af69a3 100644 --- a/src/main/java/aztech/modern_industrialization/config/MIClientConfig.java +++ b/src/main/java/aztech/modern_industrialization/config/MIClientConfig.java @@ -25,6 +25,7 @@ package aztech.modern_industrialization.config; import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLLoader; import net.neoforged.neoforge.common.ModConfigSpec; public final class MIClientConfig { @@ -88,7 +89,7 @@ private MIClientConfig(MIConfigBuilder builder) { this.itemTagTooltips = builder.start("itemTagTooltips", "Item tag tooltips", "Add item tags to item tooltips.") - .define("itemTagTooltips", !FMLEnvironment.production); + .define("itemTagTooltips", !FMLLoader.getCurrent().isProduction()); this.defaultOreGenTooltips = builder.start("defaultOreGenTooltips", "Ore generation tooltips", "Enable the default ore generation tooltips.", diff --git a/src/main/java/aztech/modern_industrialization/config/MIStartupConfig.java b/src/main/java/aztech/modern_industrialization/config/MIStartupConfig.java index c9a7a6372..47bf91f7a 100644 --- a/src/main/java/aztech/modern_industrialization/config/MIStartupConfig.java +++ b/src/main/java/aztech/modern_industrialization/config/MIStartupConfig.java @@ -26,6 +26,7 @@ import net.neoforged.fml.ModList; import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLLoader; import net.neoforged.neoforge.common.ModConfigSpec; public final class MIStartupConfig { @@ -53,7 +54,6 @@ public boolean loadAe2Compat() { // These should ideally be moved to the server config one day. public final ModConfigSpec.BooleanValue debugCommands; public final ModConfigSpec.IntValue maxDistillationTowerHeight; - public final ModConfigSpec.BooleanValue defaultIndustrialistTrades; private MIStartupConfig(MIConfigBuilder builder) { builder.pushSection("compat", "Mod Compatibility"); @@ -96,16 +96,11 @@ private MIStartupConfig(MIConfigBuilder builder) { this.debugCommands = builder.start("debugCommands", "Debug commands", "Enable UNSUPPORTED and DANGEROUS debug commands.") - .define("debugCommands", !FMLEnvironment.production); + .define("debugCommands", !FMLLoader.getCurrent().isProduction()); this.maxDistillationTowerHeight = builder.start("maxDistillationTowerHeight", "Max distillation tower height", "Maximum height of the distillation tower multiblock.") .gameRestart() .defineInRange("maxDistillationTowerHeight", 9, 1, 32); - this.defaultIndustrialistTrades = builder.start("defaultIndustrialistTrades", - "Default Industrialist trades", - "Enable the default trades from the Industrialist villager provided by MI.", - "Disable this to provide your own set of trades.") - .define("defaultIndustrialistTrades", true); } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/AggregateDataProvider.java b/src/main/java/aztech/modern_industrialization/datagen/AggregateDataProvider.java index ba283a183..039355d54 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/AggregateDataProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/AggregateDataProvider.java @@ -28,8 +28,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; + +import net.minecraft.core.HolderLookup; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; @@ -39,11 +42,13 @@ public class AggregateDataProvider implements DataProvider { private static final Logger LOGGER = LogUtils.getLogger(); private final PackOutput packOutput; + private final CompletableFuture registries; private final String name; private final List providers = new ArrayList<>(); - public AggregateDataProvider(PackOutput packOutput, String name) { + public AggregateDataProvider(PackOutput packOutput, CompletableFuture registries, String name) { this.packOutput = packOutput; + this.registries = registries; this.name = name; } @@ -56,6 +61,10 @@ public T addProvider(Function providerCo return addProvider(providerConstructor.apply(packOutput)); } + public T addProvider(BiFunction, T> providerConstructor) { + return addProvider(providerConstructor.apply(packOutput, registries)); + } + @Override public CompletableFuture run(CachedOutput output) { LOGGER.info("Will run the following providers in parallel:" + diff --git a/src/main/java/aztech/modern_industrialization/datagen/MIDatagenServer.java b/src/main/java/aztech/modern_industrialization/datagen/MIDatagenServer.java index e0bb3ce64..7c0e6d9d2 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/MIDatagenServer.java +++ b/src/main/java/aztech/modern_industrialization/datagen/MIDatagenServer.java @@ -25,22 +25,24 @@ package aztech.modern_industrialization.datagen; import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.datagen.recipe.MIRecipeProvider; +import aztech.modern_industrialization.datagen.tag.MIVillagerTradesTagProvider; +import aztech.modern_industrialization.trading.MITradeSets; import aztech.modern_industrialization.datagen.advancement.MIAdvancementsProvider; import aztech.modern_industrialization.datagen.datamap.MIDataMapProvider; import aztech.modern_industrialization.datagen.dynreg.DynamicRegistryDatagen; import aztech.modern_industrialization.datagen.loot.BlockLootTableProvider; import aztech.modern_industrialization.datagen.loot.MIGiftLoot; -import aztech.modern_industrialization.datagen.recipe.AlloyRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.AssemblerRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.CompatRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.DyeRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.HatchRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.HeatExchangerRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.MaterialRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.PetrochemRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.PlankRecipesProvider; -import aztech.modern_industrialization.datagen.recipe.UpgradeProvider; -import aztech.modern_industrialization.datagen.recipe.VanillaCompatRecipesProvider; +import aztech.modern_industrialization.datagen.recipe.AlloyRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.CompatRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.DyeRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.HatchRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.HeatExchangerRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.MaterialRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.PetrochemRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.PlankRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.UpgradeRecipeProvider; +import aztech.modern_industrialization.datagen.recipe.VanillaCompatRecipeProvider; import aztech.modern_industrialization.datagen.structure.EmptyTestStructureGenerator; import aztech.modern_industrialization.datagen.tag.MIBlockTagProvider; import aztech.modern_industrialization.datagen.tag.MIFluidTagProvider; @@ -50,59 +52,68 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CompletableFuture; + +import aztech.modern_industrialization.trading.MITrades; import net.minecraft.core.HolderLookup; +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.core.registries.Registries; import net.minecraft.data.DataGenerator; +import net.minecraft.data.advancements.AdvancementProvider; import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.data.registries.RegistryPatchGenerator; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; -import net.neoforged.neoforge.common.data.AdvancementProvider; import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; public class MIDatagenServer { public static void configure( DataGenerator gen, - ExistingFileHelper fileHelper, - CompletableFuture lookupProvider, - boolean run, + CompletableFuture registries, boolean runtimeDatagen) { - var aggregate = gen.addProvider(run, new AggregateDataProvider(gen.getPackOutput(), "Server Data")); + // TODO 26.1 - run all of them in parallel? + var aggregate = gen.addProvider(true, new AggregateDataProvider(gen.getPackOutput(), registries, "Server Data")); - aggregate.addProvider(PetrochemRecipesProvider::new); - aggregate.addProvider(PlankRecipesProvider::new); - aggregate.addProvider(HeatExchangerRecipesProvider::new); - aggregate.addProvider(HatchRecipesProvider::new); - aggregate.addProvider(AlloyRecipesProvider::new); - aggregate.addProvider(MaterialRecipesProvider::new); - aggregate.addProvider(DyeRecipesProvider::new); - aggregate.addProvider(AssemblerRecipesProvider::new); + aggregate.addProvider(MIRecipeProvider.Runner::new); + aggregate.addProvider(PetrochemRecipeProvider.Runner::new); + aggregate.addProvider(PlankRecipeProvider.Runner::new); + aggregate.addProvider(HeatExchangerRecipeProvider.Runner::new); + aggregate.addProvider(HatchRecipeProvider.Runner::new); + aggregate.addProvider(AlloyRecipeProvider.Runner::new); + aggregate.addProvider(MaterialRecipeProvider.Runner::new); + aggregate.addProvider(DyeRecipeProvider.Runner::new); if (!runtimeDatagen) { - aggregate.addProvider(CompatRecipesProvider::new); + aggregate.addProvider(CompatRecipeProvider.Runner::new); } - aggregate.addProvider(UpgradeProvider::new); - aggregate.addProvider(VanillaCompatRecipesProvider::new); + aggregate.addProvider(UpgradeRecipeProvider.Runner::new); + aggregate.addProvider(VanillaCompatRecipeProvider.Runner::new); aggregate.addProvider(EmptyTestStructureGenerator::new); - gen.addProvider(run, new LootTableProvider(gen.getPackOutput(), Set.of(), List.of( + gen.addProvider(true, new LootTableProvider(gen.getPackOutput(), Set.of(), List.of( new LootTableProvider.SubProviderEntry(BlockLootTableProvider::new, LootContextParamSets.BLOCK), new LootTableProvider.SubProviderEntry(MIGiftLoot::new, LootContextParamSets.GIFT)), - lookupProvider)); + registries)); - gen.addProvider(run, - new DatapackBuiltinEntriesProvider(gen.getPackOutput(), lookupProvider, DynamicRegistryDatagen.getBuilder(), Set.of(MI.ID))); + var registrySetBuilder = DynamicRegistryDatagen.getBuilder(); + registrySetBuilder.add(Registries.TRADE_SET, MITradeSets::bootstrap); + registrySetBuilder.add(Registries.VILLAGER_TRADE, MITrades::bootstrap); + var registriesWithMiPatch = RegistryPatchGenerator.createLookup(registries, registrySetBuilder); + gen.addProvider(true, + new DatapackBuiltinEntriesProvider(gen.getPackOutput(), registriesWithMiPatch, Set.of(MI.ID))); + var registriesWithMi = registriesWithMiPatch.thenApply(RegistrySetBuilder.PatchedRegistries::full); - gen.addProvider(run, new MIBlockTagProvider(gen.getPackOutput(), lookupProvider, fileHelper)); - gen.addProvider(run, new MIFluidTagProvider(gen.getPackOutput(), lookupProvider, fileHelper)); - gen.addProvider(run, new MIItemTagProvider(gen.getPackOutput(), lookupProvider, fileHelper, runtimeDatagen)); - gen.addProvider(run, new MIPoiTypeTagProvider(gen.getPackOutput(), lookupProvider, fileHelper)); + gen.addProvider(true, new MIBlockTagProvider(gen.getPackOutput(), registries)); + gen.addProvider(true, new MIFluidTagProvider(gen.getPackOutput(), registries)); + gen.addProvider(true, new MIItemTagProvider(gen.getPackOutput(), registries, runtimeDatagen)); + gen.addProvider(true, new MIPoiTypeTagProvider(gen.getPackOutput(), registries)); + gen.addProvider(true, new MIVillagerTradesTagProvider(gen.getPackOutput(), registriesWithMi)); - gen.addProvider(run, new MIDataMapProvider(gen.getPackOutput(), lookupProvider)); + gen.addProvider(true, new MIDataMapProvider(gen.getPackOutput(), registries)); var translationProvider = new TranslationProvider(gen.getPackOutput()); - gen.addProvider(run, new AdvancementProvider(gen.getPackOutput(), lookupProvider, fileHelper, List.of( + gen.addProvider(true, new AdvancementProvider(gen.getPackOutput(), registries, List.of( new MIAdvancementsProvider(translationProvider)))); // Must either remain separate or be made to use futures to wait for dependencies! - gen.addProvider(run, translationProvider); + gen.addProvider(true, translationProvider); } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/advancement/MIAdvancementsProvider.java b/src/main/java/aztech/modern_industrialization/datagen/advancement/MIAdvancementsProvider.java index 7984c7bfa..393008f19 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/advancement/MIAdvancementsProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/advancement/MIAdvancementsProvider.java @@ -36,18 +36,17 @@ import net.minecraft.advancements.AdvancementHolder; import net.minecraft.advancements.AdvancementType; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.InventoryChangeTrigger; -import net.minecraft.advancements.critereon.PlayerTrigger; +import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.advancements.criterion.PlayerTrigger; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.advancements.AdvancementSubProvider; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.ItemLike; -import net.neoforged.neoforge.common.data.AdvancementProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jspecify.annotations.Nullable; -public record MIAdvancementsProvider(TranslationProvider translations) implements AdvancementProvider.AdvancementGenerator { +public record MIAdvancementsProvider(TranslationProvider translations) implements AdvancementSubProvider { private static Criterion createSimpleCriterion(Supplier trigger) { return trigger.get().createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty())); } @@ -77,16 +76,16 @@ public Builder sendsTelemetryEvent() { } @Override - public Builder display(ItemLike pIcon, Component pTitle, Component pDescription, @Nullable ResourceLocation pBackground, - AdvancementType pType, boolean pShowToast, boolean pAnnounceChat, boolean pHidden) { - return (Builder) super.display(pIcon, pTitle, pDescription, pBackground, pType, pShowToast, pAnnounceChat, pHidden); + public Builder display(ItemLike icon, Component title, Component description, @Nullable Identifier background, + AdvancementType frame, boolean showToast, boolean announceChat, boolean hidden) { + return (Builder) super.display(icon, title, description, background, frame, showToast, announceChat, hidden); } public Builder display( ItemLike icon, String titleEnglishName, String englishDescription, - @Nullable ResourceLocation pBackground, + @Nullable Identifier pBackground, AdvancementType pType, boolean pShowToast, boolean pAnnounceChat, @@ -112,8 +111,8 @@ public Builder addCriterion(String pKey, Criterion pCriterion) { return (Builder) super.addCriterion(pKey, pCriterion); } - public AdvancementHolder save(Consumer consumer, ExistingFileHelper existingFileHelper) { - return save(consumer, MI.id(path), existingFileHelper); + public AdvancementHolder save(Consumer consumer) { + return save(consumer, MI.id(path)); } } @@ -122,9 +121,9 @@ private Builder newBuilder(String path) { } @Override - public void generate(HolderLookup.Provider registries, Consumer consumer, ExistingFileHelper existingFileHelper) { + public void generate(HolderLookup.Provider registries, Consumer consumer) { var guidebook = newBuilder("guidebook") - .display(MIItem.GUIDE_BOOK, + .display(MIItem.GUIDEBOOK, MIText.ModernIndustrialization.text(), translateDescription("guidebook", "Welcome to Modern Industrialization! Make sure to check out the guidebook."), MI.id("textures/block/fire_clay_bricks.png"), @@ -133,19 +132,19 @@ public void generate(HolderLookup.Provider registries, Consumer consumer, String item, AdvancementHolder parent, - String titleEnglishName, String englishDescription, ExistingFileHelper existingFileHelper) { - return createBasic(consumer, item, parent, AdvancementType.TASK, titleEnglishName, englishDescription, existingFileHelper); + String titleEnglishName, String englishDescription) { + return createBasic(consumer, item, parent, AdvancementType.TASK, titleEnglishName, englishDescription); } private AdvancementHolder createBasic(Consumer consumer, String itemId, AdvancementHolder parent, - AdvancementType frame, String titleEnglishName, String englishDescription, ExistingFileHelper existingFileHelper) { - var item = BuiltInRegistries.ITEM.get(MI.id(itemId)); + AdvancementType frame, String titleEnglishName, String englishDescription) { + var item = BuiltInRegistries.ITEM.getValue(MI.id(itemId)); var advancementTask = newBuilder(itemId); @@ -247,6 +246,6 @@ private AdvancementHolder createBasic(Consumer consumer, Stri false); advancementTask.addCriterion("checkInv", InventoryChangeTrigger.TriggerInstance.hasItems(item)); - return advancementTask.save(consumer, existingFileHelper); + return advancementTask.save(consumer); } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java index d318a1bd9..e4e045a6a 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/datamap/MIDataMapProvider.java @@ -44,7 +44,7 @@ import java.util.concurrent.CompletableFuture; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.ItemTags; import net.neoforged.neoforge.common.data.DataMapProvider; import net.neoforged.neoforge.registries.datamaps.builtin.FurnaceFuel; @@ -75,7 +75,7 @@ private void gatherFurnaceFuels() { addFuel("coke_block", 6400 * 9); addFuel("coal_crushed_dust", 1600); builder(NeoForgeDataMaps.FURNACE_FUELS) - .add(ItemTags.create(ResourceLocation.parse("c:dusts/coal")), new FurnaceFuel(1600), false); + .add(ItemTags.create(Identifier.parse("c:dusts/coal")), new FurnaceFuel(1600), false); addFuel("coal_tiny_dust", 160); addFuel("lignite_coal", 1600); addFuel("lignite_coal_block", 16000); @@ -84,7 +84,7 @@ private void gatherFurnaceFuels() { addFuel("lignite_coal_tiny_dust", 160); addFuel("carbon_dust", 6400); addFuel("carbon_tiny_dust", 640); - addFuel(MIItem.GUIDE_BOOK.path(), 300); + addFuel(MIItem.GUIDEBOOK.path(), 300); } private void addFuel(String path, int value) { diff --git a/src/main/java/aztech/modern_industrialization/datagen/loot/BlockLootTableProvider.java b/src/main/java/aztech/modern_industrialization/datagen/loot/BlockLootTableProvider.java index a7c34674c..a4e676cc9 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/loot/BlockLootTableProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/loot/BlockLootTableProvider.java @@ -30,7 +30,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.loot.BlockLootSubProvider; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.block.Block; @@ -59,7 +59,7 @@ public void generate() { if (blockDefinition.blockLoot instanceof MIBlockLoot.DropSelf) { dropSelf(block); } else if (blockDefinition.blockLoot instanceof MIBlockLoot.Ore ore) { - add(block, createOreDrop(block, BuiltInRegistries.ITEM.get(ResourceLocation.parse(ore.loot())))); + add(block, createOreDrop(block, BuiltInRegistries.ITEM.getValue(Identifier.parse(ore.loot())))); } } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/model/BaseModelProvider.java b/src/main/java/aztech/modern_industrialization/datagen/model/BaseModelProvider.java deleted file mode 100644 index f5d9ee5a4..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/model/BaseModelProvider.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.model; - -import aztech.modern_industrialization.MI; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Block; -import net.neoforged.neoforge.client.model.generators.BlockStateProvider; -import net.neoforged.neoforge.client.model.generators.ModelProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; - -// TODO: PR to neoforge -public abstract class BaseModelProvider extends BlockStateProvider { - public BaseModelProvider(PackOutput output, ExistingFileHelper exFileHelper) { - super(output, MI.ID, exFileHelper); - } - - protected ResourceLocation key(Block block) { - return BuiltInRegistries.BLOCK.getKey(block); - } - - public String name(Block block) { - return key(block).getPath(); - } - - public ResourceLocation blockTexture(String path) { - return modLoc(ModelProvider.BLOCK_FOLDER + "/" + path); - } - - public void existingModel(Block block) { - existingModel(block, block); - } - - public void existingModel(Block block, Block targetBlock) { - simpleBlock(block, models().getExistingFile(blockTexture(targetBlock))); - } - - public void existingModelWithItem(Block block) { - simpleBlockWithItem(block, models().getExistingFile(blockTexture(block))); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/model/DelegatingModelBuilder.java b/src/main/java/aztech/modern_industrialization/datagen/model/DelegatingModelBuilder.java deleted file mode 100644 index a9370c592..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/model/DelegatingModelBuilder.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.model; - -import aztech.modern_industrialization.MI; -import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.client.model.generators.CustomLoaderBuilder; -import net.neoforged.neoforge.client.model.generators.ModelBuilder; -import net.neoforged.neoforge.client.model.generators.ModelFile; -import net.neoforged.neoforge.common.data.ExistingFileHelper; - -public class DelegatingModelBuilder> extends CustomLoaderBuilder { - public static final ResourceLocation LOADER_ID = MI.id("delegate"); - private ResourceLocation delegate; - - public DelegatingModelBuilder(T parent, ExistingFileHelper existingFileHelper) { - super(LOADER_ID, parent, existingFileHelper, false); - } - - public DelegatingModelBuilder delegate(ModelFile file) { - this.delegate = file.getLocation(); - return this; - } - - @Override - public JsonObject toJson(JsonObject json) { - json.addProperty("delegate", this.delegate.toString()); - return super.toJson(json); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/model/MachineModelProperties.java b/src/main/java/aztech/modern_industrialization/datagen/model/MachineModelProperties.java index 690f6a4a8..b5dd1b40f 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/model/MachineModelProperties.java +++ b/src/main/java/aztech/modern_industrialization/datagen/model/MachineModelProperties.java @@ -28,13 +28,13 @@ import com.google.gson.JsonObject; import java.util.HashMap; import java.util.Map; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public record MachineModelProperties( MachineCasing casing, - Map defaultOverlays, + Map defaultOverlays, boolean noOverlayOnOutputSide) { - public MachineModelProperties(MachineCasing casing, Map defaultOverlays, boolean noOverlayOnOutputSide) { + public MachineModelProperties(MachineCasing casing, Map defaultOverlays, boolean noOverlayOnOutputSide) { this.casing = casing; this.defaultOverlays = Map.copyOf(defaultOverlays); this.noOverlayOnOutputSide = noOverlayOnOutputSide; @@ -56,7 +56,7 @@ public void addToMachineJson(JsonObject obj) { public static class Builder { private final MachineCasing casing; - private final Map defaultOverlays; + private final Map defaultOverlays; private boolean noOverlayOnOutputSide = false; public Builder(MachineCasing casing) { @@ -64,7 +64,7 @@ public Builder(MachineCasing casing) { this.defaultOverlays = new HashMap<>(); } - public Builder addOverlay(String name, ResourceLocation texture) { + public Builder addOverlay(String name, Identifier texture) { defaultOverlays.put(name, texture); return this; } diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/AlloyRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/AlloyRecipeProvider.java new file mode 100644 index 000000000..db83f1a8b --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/AlloyRecipeProvider.java @@ -0,0 +1,126 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; + +public class AlloyRecipeProvider extends BaseRecipeProvider { + protected AlloyRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + protected void buildRecipes() { + new AlloyBuilder("bronze").addIngredient("tin", 1).addIngredient("copper", 3).Build(output); + new AlloyBuilder("battery_alloy").addIngredient("lead", 1).addIngredient("antimony", 1).Build(output); + new AlloyBuilder("cupronickel").addIngredient("copper", 1).addIngredient("nickel", 1).Build(output); + new AlloyBuilder("invar").addIngredient("iron", 2).addIngredient("nickel", 1).Build(output); + new AlloyBuilder("electrum").addIngredient("gold", 1).addIngredient("silver", 1).Build(output); + new AlloyBuilder("stainless_steel").addIngredient("iron", 6).addIngredient("chromium", 1).addIngredient("nickel", 1) + .addIngredient("manganese", 1).Build(output); + new AlloyBuilder("kanthal").addIngredient("stainless_steel", 1).addIngredient("chromium", 1).addIngredient("aluminum", 1).Build(output); + new AlloyBuilder("soldering_alloy").addIngredient("tin", 1).addIngredient("lead", 1).Build(output); + + new AlloyBuilder("le_uranium").addIngredient("uranium_238", 8).addIngredient("uranium_235", 1).Build(output); + new AlloyBuilder("he_uranium").addIngredient("uranium_238", 6).addIngredient("uranium_235", 3).Build(output); + + new AlloyBuilder("le_mox").addIngredient("uranium_238", 8).addIngredient("plutonium", 1).Build(output); + new AlloyBuilder("he_mox").addIngredient("uranium_238", 6).addIngredient("plutonium", 3).Build(output); + + new AlloyBuilder("superconductor").addIngredient("iridium", 1).addIngredient("annealed_copper", 3).addIngredient("yttrium", 3) + .addIngredient("neodymium", 2).Build(output); + } + + public class AlloyBuilder { + public final String output; + private int totalAmount; + private final List ingredients = new ArrayList<>(); + private final List ingredientAmounts = new ArrayList<>(); + + public AlloyBuilder(String output) { + this.output = output; + } + + public AlloyBuilder addIngredient(String ingredient, int amount) { + if (totalAmount + amount <= 9) { + if (!ingredients.contains(ingredient)) { + totalAmount += amount; + ingredients.add(ingredient); + ingredientAmounts.add(amount); + + } else { + throw new IllegalArgumentException("Trying to add the same ingredient in alloy twice : " + ingredient); + } + + } else { + throw new IllegalArgumentException("Alloy with more than 9 dusts"); + } + return this; + } + + public void Build(RecipeOutput recipeOutput) { + MachineRecipeBuilder dusts = machine(MIMachineRecipeTypes.MIXER, 2, 100); + dusts.itemOut("modern_industrialization:" + output + "_dust", totalAmount); + + MachineRecipeBuilder tinyDusts = machine(MIMachineRecipeTypes.MIXER, 2, 100); + tinyDusts.itemOut("modern_industrialization:" + output + "_tiny_dust", totalAmount); + + for (int i = 0; i < ingredients.size(); i++) { + int n = ingredientAmounts.get(i); + dusts.itemIn(conventionTag("dusts/" + ingredients.get(i)), n); + tinyDusts.itemIn(conventionTag("tiny_dusts/" + ingredients.get(i)), n); + } + + dusts.offerTo(recipeOutput, "alloy/mixer/" + output + "/dust"); + tinyDusts.offerTo(recipeOutput, "alloy/mixer/" + output + "/tiny_dust"); + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new AlloyRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Alloy Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/AlloyRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/AlloyRecipesProvider.java deleted file mode 100644 index ee229137e..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/AlloyRecipesProvider.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import com.google.gson.Gson; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; - -public class AlloyRecipesProvider extends MIRecipesProvider { - public AlloyRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - new AlloyBuilder("bronze").addIngredient("tin", 1).addIngredient("copper", 3).Build(consumer); - new AlloyBuilder("battery_alloy").addIngredient("lead", 1).addIngredient("antimony", 1).Build(consumer); - new AlloyBuilder("cupronickel").addIngredient("copper", 1).addIngredient("nickel", 1).Build(consumer); - new AlloyBuilder("invar").addIngredient("iron", 2).addIngredient("nickel", 1).Build(consumer); - new AlloyBuilder("electrum").addIngredient("gold", 1).addIngredient("silver", 1).Build(consumer); - new AlloyBuilder("stainless_steel").addIngredient("iron", 6).addIngredient("chromium", 1).addIngredient("nickel", 1) - .addIngredient("manganese", 1).Build(consumer); - new AlloyBuilder("kanthal").addIngredient("stainless_steel", 1).addIngredient("chromium", 1).addIngredient("aluminum", 1).Build(consumer); - new AlloyBuilder("soldering_alloy").addIngredient("tin", 1).addIngredient("lead", 1).Build(consumer); - - new AlloyBuilder("le_uranium").addIngredient("uranium_238", 8).addIngredient("uranium_235", 1).Build(consumer); - new AlloyBuilder("he_uranium").addIngredient("uranium_238", 6).addIngredient("uranium_235", 3).Build(consumer); - - new AlloyBuilder("le_mox").addIngredient("uranium_238", 8).addIngredient("plutonium", 1).Build(consumer); - new AlloyBuilder("he_mox").addIngredient("uranium_238", 6).addIngredient("plutonium", 3).Build(consumer); - - new AlloyBuilder("superconductor").addIngredient("iridium", 1).addIngredient("annealed_copper", 3).addIngredient("yttrium", 3) - .addIngredient("neodymium", 2).Build(consumer); - } - - public static class AlloyBuilder { - public final String output; - private int totalAmount; - private final List ingredients = new ArrayList<>(); - private final List ingredientAmounts = new ArrayList<>(); - private static final Gson GSON = new Gson(); - - public AlloyBuilder(String output) { - this.output = output; - } - - public AlloyBuilder addIngredient(String ingredient, int amount) { - if (totalAmount + amount <= 9) { - if (!ingredients.contains(ingredient)) { - totalAmount += amount; - ingredients.add(ingredient); - ingredientAmounts.add(amount); - - } else { - throw new IllegalArgumentException("Trying to add the same ingredient in alloy twice : " + ingredient); - } - - } else { - throw new IllegalArgumentException("Alloy with more than 9 dusts"); - } - return this; - } - - public void Build(RecipeOutput consumer) { - MachineRecipeBuilder dusts = new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100); - dusts.addItemOutput("modern_industrialization:" + output + "_dust", totalAmount); - - MachineRecipeBuilder tinyDusts = new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100); - tinyDusts.addItemOutput("modern_industrialization:" + output + "_tiny_dust", totalAmount); - - for (int i = 0; i < ingredients.size(); i++) { - int n = ingredientAmounts.get(i); - dusts.addItemInput("#c:dusts/" + ingredients.get(i), n); - tinyDusts.addItemInput("#c:tiny_dusts/" + ingredients.get(i), n); - } - - dusts.offerTo(consumer, "alloy/mixer/" + output + "/dust"); - tinyDusts.offerTo(consumer, "alloy/mixer/" + output + "/tiny_dust"); - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/AssemblerExportRecipeOutput.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/AssemblerExportRecipeOutput.java new file mode 100644 index 000000000..d8a262c7b --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/AssemblerExportRecipeOutput.java @@ -0,0 +1,43 @@ +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.machines.recipe.MIRecipeJson; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementHolder; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.ShapedRecipe; +import net.neoforged.neoforge.common.conditions.ICondition; +import org.jspecify.annotations.Nullable; + +public class AssemblerExportRecipeOutput implements RecipeOutput { + private final RecipeOutput wrapped; + + public AssemblerExportRecipeOutput(RecipeOutput wrapped) { + this.wrapped = wrapped; + } + + @Override + public Advancement.Builder advancement() { + return wrapped.advancement(); + } + + @Override + public void includeRootAdvancement() { + wrapped.includeRootAdvancement(); + } + + @Override + public void accept(ResourceKey> key, Recipe recipe, @Nullable AdvancementHolder advancement, ICondition... conditions) { + if (!(recipe instanceof ShapedRecipe shapedRecipe)) { + throw new IllegalArgumentException("Can only export shaped recipes to the assembler, received: " + recipe); + } + wrapped.accept(key, recipe, advancement, conditions); + + var assemblerKey = ResourceKey.create(Registries.RECIPE, key.identifier().withPrefix("assembler_generated/")); + new MachineRecipeBuilder(MIRecipeJson.assemblerFromShaped(shapedRecipe)) + .save(wrapped, assemblerKey); + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/AssemblerRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/AssemblerRecipesProvider.java deleted file mode 100644 index 599c5f3c9..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/AssemblerRecipesProvider.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.machines.recipe.MIRecipeJson; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import com.google.gson.Gson; -import com.google.gson.JsonParser; -import com.mojang.serialization.JsonOps; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Optional; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.PackLocationInfo; -import net.minecraft.server.packs.PackType; -import net.minecraft.server.packs.PathPackResources; -import net.minecraft.server.packs.repository.PackSource; -import net.minecraft.server.packs.resources.MultiPackResourceManager; -import net.minecraft.world.item.crafting.ShapedRecipe; -import org.apache.commons.io.IOUtils; - -public class AssemblerRecipesProvider extends MIRecipesProvider { - private static final Gson GSON = new Gson(); - - private final PackOutput packOutput; - - public AssemblerRecipesProvider(PackOutput packOutput) { - super(packOutput); - this.packOutput = packOutput; - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - var nonGeneratedResources = packOutput.getOutputFolder().resolve("../../main/resources"); - try (var manager = new MultiPackResourceManager(PackType.SERVER_DATA, List.of(new PathPackResources( - new PackLocationInfo("ngr", Component.literal("ngr"), PackSource.DEFAULT, Optional.empty()), - nonGeneratedResources)))) { - var possibleTargets = manager.listResources("recipe", path -> path.getPath().endsWith(".json")); - for (var entry : possibleTargets.entrySet()) { - var pathId = entry.getKey(); - if (shouldConvertToAssembler(pathId)) { - try (var stream = entry.getValue().open()) { - convertToAssembler(consumer, pathId, IOUtils.toByteArray(stream)); - } catch (Exception exception) { - throw new RuntimeException("Failed to convert asbl recipe %s. Error: %s".formatted(pathId, exception), exception); - } - } - } - } - } - - public static boolean shouldConvertToAssembler(ResourceLocation pathId) { - if (pathId.getNamespace().equals("modern_industrialization")) { - String path = pathId.toString(); - String postfix = path.substring(path.length() - 10, path.length() - 5); - if (postfix.equals("_asbl")) { - return true; - } else if (postfix.contains("_") && postfix.contains("a") && postfix.contains("s") && postfix.contains("b") && postfix.contains("l")) { - throw new RuntimeException("Detected potential typo in _asbl.json. Crashing just to be safe. Recipe path: " + path); - } - } - return false; - } - - public static void convertToAssembler(RecipeOutput consumer, ResourceLocation recipeId, byte[] recipe) { - String recipeString = new String(recipe, StandardCharsets.UTF_8); - var recipeJson = JsonParser.parseString(recipeString); - var parsedRecipe = ShapedRecipe.Serializer.CODEC.codec().parse(JsonOps.INSTANCE, recipeJson); - - var shapedRecipe = parsedRecipe.getOrThrow(m -> new RuntimeException("Failed to parse shaped recipe " + recipeId + ": " + m)); - - String outputSuffix = recipeId.getPath().substring("recipe/".length(), recipeId.getPath().length() - "_asbl.json".length()); - new MachineRecipeBuilder(MIRecipeJson.assemblerFromShaped(shapedRecipe)) - .offerTo(consumer, "assembler_generated/" + outputSuffix); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/BaseRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/BaseRecipeProvider.java new file mode 100644 index 000000000..3e3557482 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/BaseRecipeProvider.java @@ -0,0 +1,68 @@ +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import aztech.modern_industrialization.machines.recipe.MachineRecipeType; +import aztech.modern_industrialization.materials.Material; +import aztech.modern_industrialization.materials.part.PartKeyProvider; +import net.minecraft.advancements.Criterion; +import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.resources.Identifier; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.material.Fluid; + +public abstract class BaseRecipeProvider extends RecipeProvider { + protected final HolderGetter fluids; + + protected BaseRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + this.fluids = registries.lookupOrThrow(Registries.FLUID); + } + + protected Ingredient tag(String id) { + return tag(ItemTags.create(Identifier.parse(id))); + } + + protected Ingredient conventionTag(String path) { + return tag("c:" + path); + } + + protected Ingredient partIngredient(Material material, PartKeyProvider part) { + return material.getPart(part).asIngredient(items); + } + + protected Criterion hasPartTag(Material material, PartKeyProvider part) { + var tag = material.getPart(part).asIngredient(items).getValues().unwrapKey().orElseThrow(() -> new IllegalArgumentException("No tag for part: " + part.key())); + return has(tag); + } + + protected ForgeHammerRecipeBuilder forgeHammer(ItemLike input, ItemLike result, int hammerDamage) { + return new ForgeHammerRecipeBuilder(Ingredient.of(input), 1, new ItemStackTemplate(result.asItem()), hammerDamage); + } + + protected ForgeHammerRecipeBuilder forgeHammer(ItemLike input, ItemStackTemplate result, int hammerDamage) { + return new ForgeHammerRecipeBuilder(Ingredient.of(input), 1, result, hammerDamage); + } + + protected ForgeHammerRecipeBuilder forgeHammer(TagKey input, ItemStackTemplate result, int hammerDamage) { + return new ForgeHammerRecipeBuilder(tag(input), 1, result, hammerDamage); + } + + protected MachineRecipeBuilder machine(MachineRecipeType type) { + return machine(type, 2, 100); + } + + protected MachineRecipeBuilder machine(MachineRecipeType type, int eu, int duration) { + return new MachineRecipeBuilder(fluids, items, type, eu, duration); + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/CompatRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/CompatRecipeProvider.java new file mode 100644 index 000000000..d61d4526a --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/CompatRecipeProvider.java @@ -0,0 +1,202 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MIFluids; +import aztech.modern_industrialization.MITags; +import aztech.modern_industrialization.compat.ae2.AECompatCondition; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import aztech.modern_industrialization.machines.recipe.MachineRecipeType; +import aztech.modern_industrialization.materials.MIMaterials; +import aztech.modern_industrialization.materials.part.MIParts; +import aztech.modern_industrialization.recipe.json.MIRecipeBuilder; +import aztech.modern_industrialization.recipe.json.ShapedRecipeJson; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.material.Fluids; +import net.neoforged.neoforge.common.Tags; +import net.neoforged.neoforge.common.conditions.ICondition; +import net.neoforged.neoforge.common.conditions.ModLoadedCondition; + +public class CompatRecipeProvider extends BaseRecipeProvider { + private String currentCompatModid; + private ICondition[] conditions = null; + + protected CompatRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + protected void buildRecipes() { + startCompat("ae2"); + // TODO 26.1 restore AE2 compat recipes +// generateAe2Compat(); + } + + private void startCompat(String modid) { + currentCompatModid = modid; + conditions = new ICondition[] { new ModLoadedCondition(modid) }; + } + + private void generateAe2Compat() { + addMiRecipe(MIMachineRecipeTypes.ELECTROLYZER, item("ae2:certus_quartz_crystal"), "ae2:charged_certus_quartz_crystal", 1, 8, 60); + + addMiRecipe(MIMachineRecipeTypes.MACERATOR, conventionTag("gems/certus_quartz"), "ae2:certus_quartz_dust", 1, 2, 100); + addMiRecipe(MIMachineRecipeTypes.MACERATOR, item("minecraft:ender_pearl"), "ae2:ender_dust", 1, 2, 100); + addMiRecipe(MIMachineRecipeTypes.MACERATOR, item("ae2:fluix_crystal"), "ae2:fluix_dust", 1, 2, 100); + addMiRecipe(MIMachineRecipeTypes.MACERATOR, item("ae2:sky_stone_block"), "ae2:sky_dust", 1, 2, 100); + + addCompatRecipe("mixer/fluix", machine(MIMachineRecipeTypes.MIXER, 8, 100) + .itemIn("minecraft:quartz", 1) + .itemIn("ae2:charged_certus_quartz_crystal", 1) + .itemIn("minecraft:redstone", 1) + .fluidIn(Fluids.WATER, 1000, 0) + .itemOut("ae2:fluix_crystal", 2)); + + for (var entry : Map.of( + "calculation", item("ae2:certus_quartz_crystal"), + "engineering", tag(Tags.Items.GEMS_DIAMOND), + "logic", tag(Tags.Items.INGOTS_GOLD)).entrySet()) { + var type = entry.getKey(); + var ingredient = entry.getValue(); + + addCompatRecipe("printed_" + type + "_processor", machine(MIMachineRecipeTypes.PACKER, 8, 200) + .itemIn(ingredient, 1) + .itemIn("ae2:" + type + "_processor_press", 1, 0) + .itemOut("ae2:printed_" + type + "_processor", 1)); + addCompatRecipe(type + "_processor", machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn("ae2:printed_" + type + "_processor", 1) + .itemIn("ae2:printed_silicon", 1) + .fluidIn(MIFluids.MOLTEN_REDSTONE, 90) + .itemOut("ae2:" + type + "_processor", 1)); + } + + addCompatRecipe("printed_silicon", machine(MIMachineRecipeTypes.PACKER, 8, 200) + .itemIn(conventionTag("silicon"), 1) + .itemIn("ae2:silicon_press", 1, 0) + .itemOut("ae2:printed_silicon", 1)); + + addCompatRecipe("printed_silicon_from_ingot", machine(MIMachineRecipeTypes.PACKER, 8, 200) + .itemIn(MIMaterials.SILICON.getPart(MIParts.INGOT), 1) + .itemIn("ae2:silicon_press", 1, 0) + .itemOut("ae2:printed_silicon", 1)); + + // ME Wire stuff follows - only enable if AE2 is loaded AND if AE2 compat is enabled + conditions = new ICondition[] { AECompatCondition.INSTANCE }; + + for (DyeColor color : DyeColor.values()) { + // 16 me wires with dye in the center + var meWiresDirect = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_me_wire", 16, "qCq", "GdG", "qCq") + .addInput('C', "modern_industrialization:bronze_curved_plate") + .addInput('G', tag("ae2:glass_cable")) + .addInput('d', tag(color.getTag())) + .addInput('q', "ae2:quartz_fiber"); + addCompatRecipe("dyes/" + color.getName() + "/craft/me_wire_direct", meWiresDirect); + addCompatRecipe("dyes/" + color.getName() + "/assembler/me_wire_direct", meWiresDirect.exportToAssembler()); + // 8 me wires + var eightMeWires = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_me_wire", 8, "ppp", "pdp", "ppp") + .addInput('d', tag(color.getTag())) + .addInput('p', tag(MITags.ME_WIRES)); + addCompatRecipe("dyes/" + color.getName() + "/craft/me_wire_8", eightMeWires); + addCompatRecipe("dyes/" + color.getName() + "/mixer/me_wire_8", + eightMeWires.exportToMachine(MIMachineRecipeTypes.MIXER, 2, 100, 1)); + // 1 me wire + addCompatRecipe("dyes/" + color.getName() + "/craft/me_wire_1", + new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_me_wire", 1, "pd") + .addInput('d', tag(color.getTag())) + .addInput('p', tag(MITags.ME_WIRES))); + } + + // decolor 8 me wires + addCompatRecipe("dyes/decolor/craft/me_wire_8", new ShapedRecipeJson("modern_industrialization:me_wire", 8, "ppp", "pbp", "ppp") + .addInput('b', "minecraft:water_bucket") + .addInput('p', tag(MITags.ME_WIRES))); + // decolor 1 me wire + addCompatRecipe("dyes/decolor/craft/me_wire_1", new ShapedRecipeJson("modern_industrialization:me_wire", 1, "pb") + .addInput('b', "minecraft:water_bucket") + .addInput('p', tag(MITags.ME_WIRES))); + // decolor 1 me wire with mixer + addCompatRecipe("dyes/decolor/mixer/me_wire", machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(tag(MITags.ME_WIRES), 1) + .fluidIn(Fluids.WATER, 125) + .itemOut("modern_industrialization:me_wire", 1)); + // 16 me wires direct + var meWiresDirect = new ShapedRecipeJson("modern_industrialization:me_wire", 16, "qCq", "G G", "qCq") + .addInput('C', "modern_industrialization:bronze_curved_plate") + .addInput('G', tag("ae2:glass_cable")) + .addInput('q', "ae2:quartz_fiber"); + addCompatRecipe("craft/me_wire_direct", meWiresDirect); + addCompatRecipe("assembler/me_wire_direct", meWiresDirect.exportToAssembler()); + } + + private Ingredient item(String id) { + return Ingredient.of(BuiltInRegistries.ITEM.getOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(id))).value()); + } + + private void addMiRecipe(MachineRecipeType machine, Ingredient input, String output, int outputAmount, int eu, int duration) { + var inputName = input.getValues().unwrap().map( + TagKey::location, + items -> items.getFirst().unwrapKey().orElseThrow().identifier()) + .toString().replace(':', '_').replace('/', '_'); + String id = "%s/%s_to_%s".formatted(machine.getPath(), inputName, output.replace(':', '_')); + addCompatRecipe(id, machine(machine, eu, duration) + .itemIn(input, 1) + .itemOut(output, outputAmount)); + } + + private void addCompatRecipe(String id, MIRecipeBuilder recipeJson) { + id = "compat/%s/%s".formatted(currentCompatModid, id); + recipeJson.offerTo(output.withConditions(conditions), id); + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new CompatRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Compat Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/CompatRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/CompatRecipesProvider.java deleted file mode 100644 index 6b949816e..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/CompatRecipesProvider.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MIFluids; -import aztech.modern_industrialization.compat.ae2.AECompatCondition; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import aztech.modern_industrialization.machines.recipe.MachineRecipeType; -import aztech.modern_industrialization.materials.MIMaterials; -import aztech.modern_industrialization.materials.part.MIParts; -import aztech.modern_industrialization.recipe.json.MIRecipeBuilder; -import aztech.modern_industrialization.recipe.json.ShapedRecipeJson; -import java.util.Map; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.level.material.Fluids; -import net.neoforged.neoforge.common.conditions.ICondition; -import net.neoforged.neoforge.common.conditions.ModLoadedCondition; - -public class CompatRecipesProvider extends MIRecipesProvider { - private RecipeOutput consumer; - private String currentCompatModid; - private ICondition[] conditions = null; - - public CompatRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - this.consumer = consumer; - - startCompat("ae2"); - generateAe2Compat(); - } - - private void startCompat(String modid) { - currentCompatModid = modid; - conditions = new ICondition[] { new ModLoadedCondition(modid) }; - } - - private void generateAe2Compat() { - addMiRecipe(MIMachineRecipeTypes.ELECTROLYZER, "ae2:certus_quartz_crystal", "ae2:charged_certus_quartz_crystal", 1, 8, 60); - - addMiRecipe(MIMachineRecipeTypes.MACERATOR, "#c:gems/certus_quartz", "ae2:certus_quartz_dust", 1, 2, 100); - addMiRecipe(MIMachineRecipeTypes.MACERATOR, "minecraft:ender_pearl", "ae2:ender_dust", 1, 2, 100); - addMiRecipe(MIMachineRecipeTypes.MACERATOR, "ae2:fluix_crystal", "ae2:fluix_dust", 1, 2, 100); - addMiRecipe(MIMachineRecipeTypes.MACERATOR, "ae2:sky_stone_block", "ae2:sky_dust", 1, 2, 100); - - addCompatRecipe("mixer/fluix", new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 8, 100) - .addItemInput("minecraft:quartz", 1) - .addItemInput("ae2:charged_certus_quartz_crystal", 1) - .addItemInput("minecraft:redstone", 1) - .addFluidInput(Fluids.WATER, 1000, 0) - .addItemOutput("ae2:fluix_crystal", 2)); - - for (var entry : Map.of( - "calculation", "ae2:certus_quartz_crystal", - "engineering", "#c:gems/diamond", - "logic", "#c:ingots/gold").entrySet()) { - var type = entry.getKey(); - var ingredient = entry.getValue(); - - addCompatRecipe("printed_" + type + "_processor", new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 8, 200) - .addItemInput(ingredient, 1) - .addItemInput("ae2:" + type + "_processor_press", 1, 0) - .addItemOutput("ae2:printed_" + type + "_processor", 1)); - addCompatRecipe(type + "_processor", new MachineRecipeBuilder(MIMachineRecipeTypes.ASSEMBLER, 8, 200) - .addItemInput("ae2:printed_" + type + "_processor", 1) - .addItemInput("ae2:printed_silicon", 1) - .addFluidInput(MIFluids.MOLTEN_REDSTONE, 90) - .addItemOutput("ae2:" + type + "_processor", 1)); - } - - addCompatRecipe("printed_silicon", new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 8, 200) - .addItemInput("#c:silicon", 1) - .addItemInput("ae2:silicon_press", 1, 0) - .addItemOutput("ae2:printed_silicon", 1)); - - addCompatRecipe("printed_silicon_from_ingot", new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 8, 200) - .addItemInput(MIMaterials.SILICON.getPart(MIParts.INGOT), 1) - .addItemInput("ae2:silicon_press", 1, 0) - .addItemOutput("ae2:printed_silicon", 1)); - - // ME Wire stuff follows - only enable if AE2 is loaded AND if AE2 compat is enabled - conditions = new ICondition[] { AECompatCondition.INSTANCE }; - - for (DyeColor color : DyeColor.values()) { - // 16 me wires with dye in the center - var meWiresDirect = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_me_wire", 16, "qCq", "GdG", "qCq") - .addInput('C', "modern_industrialization:bronze_curved_plate") - .addInput('G', "#ae2:glass_cable") - .addInput('d', "#c:dyes/" + color.getName()) - .addInput('q', "ae2:quartz_fiber"); - addCompatRecipe("dyes/" + color.getName() + "/craft/me_wire_direct", meWiresDirect); - addCompatRecipe("dyes/" + color.getName() + "/assembler/me_wire_direct", meWiresDirect.exportToAssembler()); - // 8 me wires - var eightMeWires = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_me_wire", 8, "ppp", "pdp", - "ppp").addInput('d', "#c:dyes/" + color.getName()).addInput('p', "#modern_industrialization:me_wires"); - addCompatRecipe("dyes/" + color.getName() + "/craft/me_wire_8", eightMeWires); - addCompatRecipe("dyes/" + color.getName() + "/mixer/me_wire_8", - eightMeWires.exportToMachine(MIMachineRecipeTypes.MIXER, 2, 100, 1)); - // 1 me wire - addCompatRecipe("dyes/" + color.getName() + "/craft/me_wire_1", - new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_me_wire", 1, "pd") - .addInput('d', "#c:dyes/" + color.getName()).addInput('p', "#modern_industrialization:me_wires")); - } - - // decolor 8 me wires - addCompatRecipe("dyes/decolor/craft/me_wire_8", new ShapedRecipeJson("modern_industrialization:me_wire", 8, "ppp", "pbp", - "ppp").addInput('b', "minecraft:water_bucket").addInput('p', "#modern_industrialization:me_wires")); - // decolor 1 me wire - addCompatRecipe("dyes/decolor/craft/me_wire_1", new ShapedRecipeJson("modern_industrialization:me_wire", 1, "pb") - .addInput('b', "minecraft:water_bucket").addInput('p', "#modern_industrialization:me_wires")); - // decolor 1 me wire with mixer - addCompatRecipe("dyes/decolor/mixer/me_wire", new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100) - .addItemInput("#modern_industrialization:me_wires", 1) - .addFluidInput(Fluids.WATER, 125) - .addItemOutput("modern_industrialization:me_wire", 1)); - // 16 me wires direct - var meWiresDirect = new ShapedRecipeJson("modern_industrialization:me_wire", 16, "qCq", "G G", "qCq") - .addInput('C', "modern_industrialization:bronze_curved_plate") - .addInput('G', "#ae2:glass_cable") - .addInput('q', "ae2:quartz_fiber"); - addCompatRecipe("craft/me_wire_direct", meWiresDirect); - addCompatRecipe("assembler/me_wire_direct", meWiresDirect.exportToAssembler()); - } - - private void addMiRecipe(MachineRecipeType machine, String input, String output, int outputAmount) { - addMiRecipe(machine, input, output, outputAmount, 2, 200); - } - - private void addMiRecipe(MachineRecipeType machine, String input, String output, int outputAmount, int eu, int duration) { - String id = "%s/%s_to_%s".formatted(machine.getPath(), input.replace('#', '_').replace(':', '_').replace('/', '_'), output.replace(':', '_')); - addCompatRecipe(id, new MachineRecipeBuilder(machine, eu, duration).addItemInput(input, 1).addItemOutput(output, outputAmount)); - } - - private void addCompatRecipe(String id, MIRecipeBuilder recipeJson) { - id = "compat/%s/%s".formatted(currentCompatModid, id); - recipeJson.offerTo(consumer.withConditions(conditions), id); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/DyeRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/DyeRecipeProvider.java new file mode 100644 index 000000000..ba155b4f5 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/DyeRecipeProvider.java @@ -0,0 +1,190 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MIFluids; +import aztech.modern_industrialization.MITags; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import aztech.modern_industrialization.materials.MIMaterials; +import aztech.modern_industrialization.materials.part.MIParts; +import aztech.modern_industrialization.recipe.json.ShapedRecipeJson; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.DyeColor; +import net.neoforged.neoforge.common.Tags; + +import java.util.concurrent.CompletableFuture; + +public class DyeRecipeProvider extends BaseRecipeProvider { + protected DyeRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + public void buildRecipes() { + for (DyeColor color : DyeColor.values()) { + String pathPrefix = "dyes/" + color.getName() + "/"; + var dyeTag = tag(color.getTag()); + // 16 item pipes with dye in the center + var itemPipesDirect = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_item_pipe", 16, "CCC", "GdG", "CCC") + .addInput('C', "modern_industrialization:bronze_curved_plate") + .addInput('G', partIngredient(MIMaterials.STEEL, MIParts.GEAR)) + .addInput('d', dyeTag); + itemPipesDirect.offerTo(output, pathPrefix + "craft/item_pipe_direct"); + itemPipesDirect.exportToAssembler().offerTo(output, pathPrefix + "assembler/item_pipe_direct"); + // 8 item pipes + var eightItemPipes = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_item_pipe", 8, "ppp", "pdp", "ppp") + .addInput('d', dyeTag) + .addInput('p', tag(MITags.ITEM_PIPES)); + eightItemPipes.offerTo(output, pathPrefix + "craft/item_pipe_8"); + eightItemPipes.exportToMachine(MIMachineRecipeTypes.MIXER, 2, 100, 1).offerTo(output, pathPrefix + "mixer/item_pipe_8"); + // 1 item pipe + new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_item_pipe", 1, "pd") + .addInput('d', dyeTag) + .addInput('p', tag(MITags.ITEM_PIPES)) + .offerTo(output, pathPrefix + "craft/item_pipe_1"); + // 16 fluid pipes with stained glass + var fluidPipesStainedGlass = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_fluid_pipe", 16, "CCC", "rPr", "CCC") + .addInput('C', "modern_industrialization:bronze_curved_plate") + .addInput('r', "modern_industrialization:copper_rotor") + .addInput('P', color.getName() + "_stained_glass_pane"); + fluidPipesStainedGlass.offerTo(output, pathPrefix + "craft/fluid_pipe_stained_glass"); + fluidPipesStainedGlass.exportToAssembler().offerTo(output, pathPrefix + "assembler/fluid_pipe_stained_glass"); + // 8 fluid pipes + var eightFluidPipes = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_fluid_pipe", 8, "ppp", "pdp", "ppp") + .addInput('d', dyeTag) + .addInput('p', tag(MITags.FLUID_PIPES)); + eightFluidPipes.offerTo(output, pathPrefix + "craft/fluid_pipe_8"); + eightFluidPipes.exportToMachine(MIMachineRecipeTypes.MIXER, 2, 100, 1).offerTo(output, pathPrefix + "mixer/fluid_pipe_8"); + // 1 fluid pipe + new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_fluid_pipe", 1, "pd") + .addInput('d', dyeTag) + .addInput('p', tag(MITags.FLUID_PIPES)) + .offerTo(output, pathPrefix + "craft/fluid_pipe_1"); + // generate dyes with synthetic oil + machine(MIMachineRecipeTypes.MIXER, 2, 200) + .fluidIn(MIFluids.SYNTHETIC_OIL, 100) + .itemIn(dyeTag, 1, 0) + .itemOut("minecraft:" + color.getName() + "_dye", 1) + .offerTo(output, pathPrefix + "mixer/synthetic_oil"); + // generate dyes with benzene + machine(MIMachineRecipeTypes.MIXER, 2, 200) + .fluidIn(MIFluids.BENZENE, 25) + .itemIn(dyeTag, 1, 0) + .itemOut("minecraft:" + color.getName() + "_dye", 1) + .offerTo(output, pathPrefix + "mixer/benzene"); + + // wool + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(ItemTags.WOOL), 8) + .itemOut("minecraft:" + color.getName() + "_wool", 8) + .offerTo(output, pathPrefix + "mixer/wool"); + + // glass + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(Tags.Items.GLASS_BLOCKS), 8) + .itemOut("minecraft:" + color.getName() + "_stained_glass", 8) + .offerTo(output, pathPrefix + "mixer/glass"); + + // glassPane + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(Tags.Items.GLASS_PANES), 8) + .itemOut("minecraft:" + color.getName() + "_stained_glass_pane", 8) + .offerTo(output, pathPrefix + "mixer/glass_pane"); + + // shulker Box + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(Tags.Items.SHULKER_BOXES), 1) + .itemOut("minecraft:" + color.getName() + "_shulker_box", 1) + .offerTo(output, pathPrefix + "mixer/shulker_box"); + + // bed + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(ItemTags.BEDS), 1) + .itemOut("minecraft:" + color.getName() + "_bed", 1) + .offerTo(output, pathPrefix + "mixer/bed"); + + // candle + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(ItemTags.CANDLES), 1) + .itemOut("minecraft:" + color.getName() + "_candle", 1) + .offerTo(output, pathPrefix + "mixer/candle"); + + // carpet + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(ItemTags.WOOL_CARPETS), 8) + .itemOut("minecraft:" + color.getName() + "_carpet", 8) + .offerTo(output, pathPrefix + "mixer/carpet"); + + // terracotta + machine(MIMachineRecipeTypes.MIXER, 2, 100) + .itemIn(dyeTag, 1) + .itemIn(tag(ItemTags.TERRACOTTA), 8) + .itemOut("minecraft:" + color.getName() + "_terracotta", 8) + .offerTo(output, pathPrefix + "mixer/terracotta"); + + // glass pane cutting + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemIn("minecraft:" + color.getName() + "_stained_glass", 6) + .itemOut("minecraft:" + color.getName() + "_stained_glass_pane", 16) + .offerTo(output, pathPrefix + "cutting_machine/glass_pane"); + + // carpet cutting + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemIn("minecraft:" + color.getName() + "_wool", 1) + .itemOut("minecraft:" + color.getName() + "_carpet", 4) + .offerTo(output, pathPrefix + "cutting_machine/carpet"); + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new DyeRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Dye Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/DyeRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/DyeRecipesProvider.java deleted file mode 100644 index ebf728055..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/DyeRecipesProvider.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MIFluids; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import aztech.modern_industrialization.recipe.json.ShapedRecipeJson; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.DyeColor; - -public class DyeRecipesProvider extends MIRecipesProvider { - public DyeRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - for (DyeColor color : DyeColor.values()) { - String pathPrefix = "dyes/" + color.getName() + "/"; - var dyeTag = "#" + color.getTag().location(); - // 16 item pipes with dye in the center - var itemPipesDirect = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_item_pipe", 16, "CCC", "GdG", - "CCC").addInput('C', "modern_industrialization:bronze_curved_plate").addInput('G', "#c:gears/steel").addInput('d', - dyeTag); - itemPipesDirect.offerTo(consumer, pathPrefix + "craft/item_pipe_direct"); - itemPipesDirect.exportToAssembler().offerTo(consumer, pathPrefix + "assembler/item_pipe_direct"); - // 8 item pipes - var eightItemPipes = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_item_pipe", 8, "ppp", "pdp", - "ppp").addInput('d', dyeTag).addInput('p', "#modern_industrialization:item_pipes"); - eightItemPipes.offerTo(consumer, pathPrefix + "craft/item_pipe_8"); - eightItemPipes.exportToMachine(MIMachineRecipeTypes.MIXER, 2, 100, 1).offerTo(consumer, pathPrefix + "mixer/item_pipe_8"); - // 1 item pipe - new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_item_pipe", 1, "pd") - .addInput('d', dyeTag).addInput('p', "#modern_industrialization:item_pipes") - .offerTo(consumer, pathPrefix + "craft/item_pipe_1"); - // 16 fluid pipes with stained glass - var fluidPipesStainedGlass = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_fluid_pipe", 16, "CCC", - "rPr", "CCC").addInput('C', "modern_industrialization:bronze_curved_plate").addInput('r', "modern_industrialization:copper_rotor") - .addInput('P', color.getName() + "_stained_glass_pane"); - fluidPipesStainedGlass.offerTo(consumer, pathPrefix + "craft/fluid_pipe_stained_glass"); - fluidPipesStainedGlass.exportToAssembler().offerTo(consumer, pathPrefix + "assembler/fluid_pipe_stained_glass"); - // 8 fluid pipes - var eightFluidPipes = new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_fluid_pipe", 8, "ppp", "pdp", - "ppp").addInput('d', dyeTag).addInput('p', "#modern_industrialization:fluid_pipes"); - eightFluidPipes.offerTo(consumer, pathPrefix + "craft/fluid_pipe_8"); - eightFluidPipes.exportToMachine(MIMachineRecipeTypes.MIXER, 2, 100, 1).offerTo(consumer, pathPrefix + "mixer/fluid_pipe_8"); - // 1 fluid pipe - new ShapedRecipeJson("modern_industrialization:" + color.getName() + "_fluid_pipe", 1, "pd") - .addInput('d', dyeTag).addInput('p', "#modern_industrialization:fluid_pipes") - .offerTo(consumer, pathPrefix + "craft/fluid_pipe_1"); - // generate dyes with synthetic oil - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 200).addFluidInput(MIFluids.SYNTHETIC_OIL, 100) - .addItemInput(dyeTag, 1, 0).addItemOutput("minecraft:" + color.getName() + "_dye", 1) - .offerTo(consumer, pathPrefix + "mixer/synthetic_oil"); - // generate dyes with benzene - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 200).addFluidInput(MIFluids.BENZENE, 25) - .addItemInput(dyeTag, 1, 0).addItemOutput("minecraft:" + color.getName() + "_dye", 1) - .offerTo(consumer, pathPrefix + "mixer/benzene"); - - // wool - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#minecraft:wool", 8).addItemOutput("minecraft:" + color.getName() + "_wool", 8) - .offerTo(consumer, pathPrefix + "mixer/wool"); - - // glass - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#c:glass_blocks", 8) - .addItemOutput("minecraft:" + color.getName() + "_stained_glass", 8) - .offerTo(consumer, pathPrefix + "mixer/glass"); - - // glassPane - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#c:glass_panes", 8).addItemOutput("minecraft:" + color.getName() + "_stained_glass_pane", 8) - .offerTo(consumer, pathPrefix + "mixer/glass_pane"); - - // shulker Box - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#c:shulker_boxes", 1).addItemOutput("minecraft:" + color.getName() + "_shulker_box", 1) - .offerTo(consumer, pathPrefix + "mixer/shulker_box"); - - // bed - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#minecraft:beds", 1) - .addItemOutput("minecraft:" + color.getName() + "_bed", 1) - .offerTo(consumer, pathPrefix + "mixer/bed"); - - // candle - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#minecraft:candles", 1).addItemOutput("minecraft:" + color.getName() + "_candle", 1) - .offerTo(consumer, pathPrefix + "mixer/candle"); - - // carpet - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput("#minecraft:wool_carpets", 8).addItemOutput("minecraft:" + color.getName() + "_carpet", 8) - .offerTo(consumer, pathPrefix + "mixer/carpet"); - - // terracotta - new MachineRecipeBuilder(MIMachineRecipeTypes.MIXER, 2, 100).addItemInput(dyeTag, 1) - .addItemInput(ItemTags.TERRACOTTA, 8).addItemOutput("minecraft:" + color.getName() + "_terracotta", 8) - .offerTo(consumer, pathPrefix + "mixer/terracotta"); - - // glass pane cutting - new MachineRecipeBuilder(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100).addFluidInput(MIFluids.LUBRICANT, 1) - .addItemInput("minecraft:" + color.getName() + "_stained_glass", 6) - .addItemOutput("minecraft:" + color.getName() + "_stained_glass_pane", 16) - .offerTo(consumer, pathPrefix + "cutting_machine/glass_pane"); - - // carpet cutting - new MachineRecipeBuilder(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100).addFluidInput(MIFluids.LUBRICANT, 1) - .addItemInput("minecraft:" + color.getName() + "_wool", 1) - .addItemOutput("minecraft:" + color.getName() + "_carpet", 4) - .offerTo(consumer, pathPrefix + "cutting_machine/carpet"); - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/ForgeHammerRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/ForgeHammerRecipeBuilder.java new file mode 100644 index 000000000..513e200d9 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/ForgeHammerRecipeBuilder.java @@ -0,0 +1,45 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.blocks.forgehammer.ForgeHammerRecipe; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.Recipe; + +public class ForgeHammerRecipeBuilder { + private final ForgeHammerRecipe recipe; + + public ForgeHammerRecipeBuilder(Ingredient ingredient, int count, ItemStackTemplate result, int hammerDamage) { + this.recipe = new ForgeHammerRecipe(ingredient, count, result, hammerDamage); + } + + public void save(RecipeOutput output, ResourceKey> id) { + output.accept(id, this.recipe, null); + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/HatchRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/HatchRecipeProvider.java new file mode 100644 index 000000000..cf1e08aa0 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/HatchRecipeProvider.java @@ -0,0 +1,118 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import aztech.modern_industrialization.recipe.json.ShapedRecipeJson; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; + +import java.util.concurrent.CompletableFuture; + +public class HatchRecipeProvider extends BaseRecipeProvider { + private static final String pathPrefix = "hatches/"; + + protected HatchRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + public void buildRecipes() { + String[] casings = { "bronze", "steel", "basic", "advanced", "turbo", "highly_advanced", "quantum" }; + String[] tanks = { "bronze", "steel", "", "aluminum", "stainless_steel", "titanium", "" }; + String[] cables = { "", "", "tin", "electrum", "aluminum", "annealed_copper", "superconductor" }; + String[] voltage = { "", "", "lv", "mv", "hv", "ev", "superconductor" }; + + for (int i = 0; i < casings.length; i++) { + + String casing = String.format("modern_industrialization:%s_machine_hull", casings[i]); + if (i < 2) { + casing = String.format("modern_industrialization:%s_machine_casing", casings[i]); + } + + String tank = String.format("modern_industrialization:%s_tank", tanks[i]); + String fluidInput = String.format("modern_industrialization:%s_fluid_input_hatch", casings[i]); + String fluidOutput = String.format("modern_industrialization:%s_fluid_output_hatch", casings[i]); + String itemInput = String.format("modern_industrialization:%s_item_input_hatch", casings[i]); + String itemOutput = String.format("modern_industrialization:%s_item_output_hatch", casings[i]); + String energyInput = String.format("modern_industrialization:%s_energy_input_hatch", voltage[i]); + String energyOutput = String.format("modern_industrialization:%s_energy_output_hatch", voltage[i]); + String cable = String.format("modern_industrialization:%s_cable", cables[i]); + String hopper = "minecraft:hopper"; + + String[][] ABs = { { fluidInput, fluidOutput }, { itemInput, itemOutput }, { energyInput, energyOutput } }; + String[][] prefixes = { { "fluid_input", "fluid_output" }, { "item_input", "item_output" }, { "energy_input", "energy_output" } }; + String[] others = { tank, hopper, cable }; + + for (int j = 0; j < ABs.length; j++) { + + if (((j != 2) && !casings[i].equals("basic") && !casings[i].equals("quantum")) || (j == 2 && !cables[i].equals(""))) { + + String[] AB = ABs[j]; + String other = others[j]; + + for (int k = 0; k < 2; k++) { + ShapedRecipeJson craft = new ShapedRecipeJson(AB[k], 1, "U", "V").addInput('U', k == 0 ? other : casing).addInput('V', + k == 1 ? other : casing); + + MachineRecipeBuilder craftAsbl = craft.exportToMachine(MIMachineRecipeTypes.ASSEMBLER, 8, 200, 1); + + MachineRecipeBuilder unpacker = machine(MIMachineRecipeTypes.UNPACKER, 2, 200).itemOut(casing, 1) + .itemOut(other, 1).itemIn(AB[k], 1); + + ShapedRecipeJson craftFromOther = new ShapedRecipeJson(AB[k], 1, "U").addInput('U', AB[(k + 1) % 2]); + + craft.offerTo(output, pathPrefix + casings[i] + "/" + prefixes[j][k] + "_hatch"); + craftFromOther.offerTo(output, pathPrefix + casings[i] + "/" + prefixes[j][k] + "_from_" + (k == 0 ? "output" : "input")); + craftAsbl.offerTo(output, pathPrefix + casings[i] + "/assembler/" + prefixes[j][k] + "_hatch"); + unpacker.offerTo(output, pathPrefix + casings[i] + "/unpacker/" + prefixes[j][k] + "_hatch"); + + } + + } + } + + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new HatchRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Hatch Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/HatchRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/HatchRecipesProvider.java deleted file mode 100644 index c6c7d7ab7..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/HatchRecipesProvider.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import aztech.modern_industrialization.recipe.json.ShapedRecipeJson; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; - -public class HatchRecipesProvider extends MIRecipesProvider { - private static final String pathPrefix = "hatches/"; - - public HatchRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - String[] casings = { "bronze", "steel", "basic", "advanced", "turbo", "highly_advanced", "quantum" }; - String[] tanks = { "bronze", "steel", "", "aluminum", "stainless_steel", "titanium", "" }; - String[] cables = { "", "", "tin", "electrum", "aluminum", "annealed_copper", "superconductor" }; - String[] voltage = { "", "", "lv", "mv", "hv", "ev", "superconductor" }; - - for (int i = 0; i < casings.length; i++) { - - String casing = String.format("modern_industrialization:%s_machine_hull", casings[i]); - if (i < 2) { - casing = String.format("modern_industrialization:%s_machine_casing", casings[i]); - } - - String tank = String.format("modern_industrialization:%s_tank", tanks[i]); - String fluidInput = String.format("modern_industrialization:%s_fluid_input_hatch", casings[i]); - String fluidOutput = String.format("modern_industrialization:%s_fluid_output_hatch", casings[i]); - String itemInput = String.format("modern_industrialization:%s_item_input_hatch", casings[i]); - String itemOutput = String.format("modern_industrialization:%s_item_output_hatch", casings[i]); - String energyInput = String.format("modern_industrialization:%s_energy_input_hatch", voltage[i]); - String energyOutput = String.format("modern_industrialization:%s_energy_output_hatch", voltage[i]); - String cable = String.format("modern_industrialization:%s_cable", cables[i]); - String hopper = "minecraft:hopper"; - - String[][] ABs = { { fluidInput, fluidOutput }, { itemInput, itemOutput }, { energyInput, energyOutput } }; - String[][] prefixes = { { "fluid_input", "fluid_output" }, { "item_input", "item_output" }, { "energy_input", "energy_output" } }; - String[] others = { tank, hopper, cable }; - - for (int j = 0; j < ABs.length; j++) { - - if (((j != 2) && !casings[i].equals("basic") && !casings[i].equals("quantum")) || (j == 2 && !cables[i].equals(""))) { - - String[] AB = ABs[j]; - String other = others[j]; - - for (int k = 0; k < 2; k++) { - ShapedRecipeJson craft = new ShapedRecipeJson(AB[k], 1, "U", "V").addInput('U', k == 0 ? other : casing).addInput('V', - k == 1 ? other : casing); - - MachineRecipeBuilder craftAsbl = craft.exportToMachine(MIMachineRecipeTypes.ASSEMBLER, 8, 200, 1); - - MachineRecipeBuilder unpacker = new MachineRecipeBuilder(MIMachineRecipeTypes.UNPACKER, 2, 200).addItemOutput(casing, 1) - .addItemOutput(other, 1).addItemInput(AB[k], 1); - - ShapedRecipeJson craftFromOther = new ShapedRecipeJson(AB[k], 1, "U").addInput('U', AB[(k + 1) % 2]); - - craft.offerTo(consumer, pathPrefix + casings[i] + "/" + prefixes[j][k] + "_hatch"); - craftFromOther.offerTo(consumer, pathPrefix + casings[i] + "/" + prefixes[j][k] + "_from_" + (k == 0 ? "output" : "input")); - craftAsbl.offerTo(consumer, pathPrefix + casings[i] + "/assembler/" + prefixes[j][k] + "_hatch"); - unpacker.offerTo(consumer, pathPrefix + casings[i] + "/unpacker/" + prefixes[j][k] + "_hatch"); - - } - - } - } - - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/HeatExchangerRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/HeatExchangerRecipeProvider.java new file mode 100644 index 000000000..04be92733 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/HeatExchangerRecipeProvider.java @@ -0,0 +1,101 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MIFluids; +import aztech.modern_industrialization.definition.FluidDefinition; +import aztech.modern_industrialization.definition.FluidLike; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.level.material.Fluids; + +import java.util.concurrent.CompletableFuture; + +public class HeatExchangerRecipeProvider extends BaseRecipeProvider { + protected HeatExchangerRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + private static String fluidToString(FluidLike f, boolean id) { + if (f.asFluid() == Fluids.WATER) { + return (id ? "minecraft:" : "") + "water"; + } else if (f.asFluid() == Fluids.LAVA) { + return (id ? "minecraft:" : "") + "lava"; + } else { + return ((FluidDefinition) f).getResourceAsString(id); + } + } + + @Override + public void buildRecipes() { + FluidLike[] hots = { MIFluids.STEAM, MIFluids.HEAVY_WATER_STEAM, MIFluids.HIGH_PRESSURE_HEAVY_WATER_STEAM, MIFluids.HIGH_PRESSURE_STEAM }; + FluidLike[] cold = { FluidLike.of(Fluids.WATER), MIFluids.HEAVY_WATER, MIFluids.HIGH_PRESSURE_HEAVY_WATER, MIFluids.HIGH_PRESSURE_WATER }; + int[] amount = { 1, 1, 8, 8 }; + + int amountBaseHot = 16000; + int amountBaseCold = 1000; + + for (int i = 0; i < hots.length; i++) { + for (int j = 0; j < cold.length; j++) { + if (i != j) { + + var recipe = machine(MIMachineRecipeTypes.HEAT_EXCHANGER, 2, 300); + + String path = "heat_exchanger/" + fluidToString(hots[i], false) + "_with_" + + fluidToString(cold[j], false); + + recipe.fluidIn(fluidToString(hots[i], true), amountBaseHot / amount[i]); + recipe.fluidIn(fluidToString(cold[j], true), amountBaseCold / amount[j]); + + recipe.fluidOut(fluidToString(cold[i], true), amountBaseCold / amount[i]); + recipe.fluidOut(fluidToString(hots[j], true), amountBaseHot / amount[j]); + + recipe.offerTo(output, path); + } + + } + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new HeatExchangerRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Heat Exchanger Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/HeatExchangerRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/HeatExchangerRecipesProvider.java deleted file mode 100644 index 08416e935..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/HeatExchangerRecipesProvider.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MIFluids; -import aztech.modern_industrialization.definition.FluidDefinition; -import aztech.modern_industrialization.definition.FluidLike; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.world.level.material.Fluids; - -public class HeatExchangerRecipesProvider extends MIRecipesProvider { - public HeatExchangerRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - private static String fluidToString(FluidLike f, boolean id) { - if (f.asFluid() == Fluids.WATER) { - return (id ? "minecraft:" : "") + "water"; - } else if (f.asFluid() == Fluids.LAVA) { - return (id ? "minecraft:" : "") + "lava"; - } else { - return ((FluidDefinition) f).getResourceAsString(id); - } - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - FluidLike[] hots = { MIFluids.STEAM, MIFluids.HEAVY_WATER_STEAM, MIFluids.HIGH_PRESSURE_HEAVY_WATER_STEAM, MIFluids.HIGH_PRESSURE_STEAM }; - FluidLike[] cold = { FluidLike.of(Fluids.WATER), MIFluids.HEAVY_WATER, MIFluids.HIGH_PRESSURE_HEAVY_WATER, MIFluids.HIGH_PRESSURE_WATER }; - int[] amount = { 1, 1, 8, 8 }; - - int amountBaseHot = 16000; - int amountBaseCold = 1000; - - for (int i = 0; i < hots.length; i++) { - for (int j = 0; j < cold.length; j++) { - if (i != j) { - - var recipe = new MachineRecipeBuilder(MIMachineRecipeTypes.HEAT_EXCHANGER, 2, 300); - - String path = "heat_exchanger/" + fluidToString(hots[i], false) + "_with_" - + fluidToString(cold[j], false); - - recipe.addFluidInput(fluidToString(hots[i], true), amountBaseHot / amount[i]); - recipe.addFluidInput(fluidToString(cold[j], true), amountBaseCold / amount[j]); - - recipe.addFluidOutput(fluidToString(cold[i], true), amountBaseCold / amount[i]); - recipe.addFluidOutput(fluidToString(hots[j], true), amountBaseHot / amount[j]); - - recipe.offerTo(consumer, path); - } - - } - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/MIRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/MIRecipeProvider.java new file mode 100644 index 000000000..5870b178a --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/MIRecipeProvider.java @@ -0,0 +1,3638 @@ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.MIBlock; +import aztech.modern_industrialization.MIFluids; +import aztech.modern_industrialization.MIItem; +import aztech.modern_industrialization.MITags; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.init.MultiblockHatches; +import aztech.modern_industrialization.machines.init.MultiblockMachines; +import aztech.modern_industrialization.materials.MIMaterials; +import aztech.modern_industrialization.materials.part.MIParts; +import java.util.concurrent.CompletableFuture; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; +import net.minecraft.data.recipes.SmithingTransformRecipeBuilder; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.CookingBookCategory; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.level.material.Fluids; +import net.neoforged.neoforge.common.Tags; +import net.neoforged.neoforge.common.conditions.ModLoadedCondition; +import net.neoforged.neoforge.common.conditions.NotCondition; + +public class MIRecipeProvider extends BaseRecipeProvider { + private final RecipeOutput assemblerExportOutput; + + protected MIRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + this.assemblerExportOutput = new AssemblerExportRecipeOutput(output); + } + + @Override + protected void buildRecipes() { + armorRecipes(); + electricAgeRecipes(); + fusionReactorRecipes(); + materialsRecipes(); + miscRecipes(); + oilRecipes(); + quarryRecipes(); + steamAgeRecipes(); + toolsRecipes(); + vanillaRecipes(); + } + + private void armorRecipes() { + shaped(RecipeCategory.MISC, MIItem.DIESEL_JETPACK) + .pattern("PtP") + .pattern("McM") + .pattern("R R") + .define('P', MIItem.LARGE_PUMP) + .define('M', MIItem.LARGE_MOTOR) + .define('R', MIMaterials.ALUMINUM.getPart(MIParts.ROTOR)) + .define('t', MIMaterials.ALUMINUM.getPart(MIParts.TANK)) + .define('c', MIItem.ELECTRONIC_CIRCUIT) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT)) + .save(output, key("armor/diesel_jetpack")); + shaped(RecipeCategory.MISC, MIItem.GRAVICHESTPLATE) + .pattern("PUP") + .pattern("PCP") + .pattern("cPc") + .define('P', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.PLATE)) + .define('U', MIItem.HIGHLY_ADVANCED_UPGRADE) + .define('C', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.COIL)) + .define('c', MIItem.COOLING_CELL) + .unlockedBy("TODO", has(TODO)) + .save(output, key("armor/gravichestplate")); + shaped(RecipeCategory.MISC, MIItem.RUBBER_BOOTS) + .pattern("S S") + .pattern("S S") + .define('S', MIItem.RUBBER_SHEET) + .unlockedBy("has_ingredient", has(MIItem.RUBBER_SHEET)) + .save(output, key("armor/rubber_boots")); + shaped(RecipeCategory.MISC, MIItem.RUBBER_HELMET) + .pattern("SSS") + .pattern("S S") + .define('S', MIItem.RUBBER_SHEET) + .unlockedBy("has_ingredient", has(MIItem.RUBBER_SHEET)) + .save(output, key("armor/rubber_helmet")); + } + + private void electricAgeRecipes() { + shaped(RecipeCategory.MISC, MIMaterials.CADMIUM.getPart(MIParts.BATTERY)) + .pattern("cac") + .pattern("BrB") + .pattern("BrB") + .define('a', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .define('c', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .define('B', MIMaterials.BATTERY_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('r', partIngredient(MIMaterials.CADMIUM, MIParts.DUST)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/battery/cadmium_battery")); + shaped(RecipeCategory.MISC, MIMaterials.REDSTONE.getPart(MIParts.BATTERY)) + .pattern("cac") + .pattern("BrB") + .pattern("BrB") + .define('a', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('B', MIMaterials.BATTERY_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('r', Items.REDSTONE) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/battery/lv_battery")); + shaped(RecipeCategory.MISC, MIMaterials.PLUTONIUM.getPart(MIParts.BATTERY)) + .pattern("cac") + .pattern("BrB") + .pattern("BrB") + .define('a', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .define('c', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE)) + .define('B', MIMaterials.BATTERY_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('r', partIngredient(MIMaterials.PLUTONIUM, MIParts.DUST)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/battery/plutonium_battery")); + shaped(RecipeCategory.MISC, miItem("portable_storage_unit")) + .pattern("aCa") + .pattern("crc") + .pattern("aCa") + .define('a', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .define('c', MIMaterials.BATTERY_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('C', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('r', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/battery/portable_storage_unit")); + shaped(RecipeCategory.MISC, MIMaterials.SILICON.getPart(MIParts.BATTERY)) + .pattern("cac") + .pattern("BrB") + .pattern("BrB") + .define('a', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .define('c', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('B', MIMaterials.BATTERY_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('r', partIngredient(MIMaterials.SILICON, MIParts.DUST)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/battery/silicon_battery")); + shaped(RecipeCategory.MISC, MIMaterials.SODIUM.getPart(MIParts.BATTERY)) + .pattern("cac") + .pattern("BrB") + .pattern("BrB") + .define('a', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .define('c', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .define('B', MIMaterials.BATTERY_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('r', partIngredient(MIMaterials.SODIUM, MIParts.DUST)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/battery/sodium_battery")); + shaped(RecipeCategory.MISC, MIBlock.FUSION_CHAMBER) + .pattern("ChC") + .pattern("LHL") + .pattern("ChC") + .define('C', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.COIL)) + .define('h', MIItem.LARGE_HEAT_EXCHANGER) + .define('L', MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.LARGE_PLATE)) + .define('H', MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/blocks/fusion_chamber")); + shaped(RecipeCategory.MISC, MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING)) + .pattern("AAA") + .pattern("AHA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.ALUMINUM, MIParts.PLATE)) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/casing/advanced_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.BLASTPROOF_ALLOY.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("A A") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.BLASTPROOF_ALLOY, MIParts.PLATE)) + .unlockedBy("has_ingredient", hasPartTag(MIMaterials.BLASTPROOF_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/blastproof_casing")); + shaped(RecipeCategory.MISC, MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("AHA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.BRONZE, MIParts.PLATE)) + .define('H', MIBlock.FIRE_CLAY_BRICKS) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BRONZE, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/bronze_plated_bricks")); + shaped(RecipeCategory.MISC, MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("AGA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.PLATE)) + .define('G', partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STAINLESS_STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/clean_stainless_steel_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("AGA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.ALUMINUM, MIParts.PLATE)) + .define('G', partIngredient(MIMaterials.ALUMINUM, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.ALUMINUM, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/frostproof_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.INVAR.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("PPP") + .pattern("PGP") + .pattern("PPP") + .define('P', partIngredient(MIMaterials.INVAR, MIParts.PLATE)) + .define('G', partIngredient(MIMaterials.INVAR, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.INVAR, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/heatproof_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING)) + .pattern("ACA") + .pattern("CHC") + .pattern("ACA") + .define('A', partIngredient(MIMaterials.TITANIUM, MIParts.PLATE)) + .define('C', partIngredient(MIMaterials.CHROMIUM, MIParts.PLATE)) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/casing/highly_advanced_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING_PIPE), 2) + .pattern("pPp") + .pattern("p#p") + .pattern("pPp") + .define('#', MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .define('p', MIMaterials.IRIDIUM.getPart(MIParts.CURVED_PLATE)) + .define('P', MIItem.LARGE_ADVANCED_PUMP) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/casing/iridium_machine_casing_pipe")); + shaped(RecipeCategory.MISC, MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("ACA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.NUCLEAR_ALLOY, MIParts.PLATE)) + .define('C', MIBlock.TURBO_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/casing/nuclear_casing")); + shaped(RecipeCategory.MISC, MultiblockHatches.NUCLEAR_FLUID) + .pattern("AAA") + .pattern("ACA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.NUCLEAR_ALLOY, MIParts.PLATE)) + .define('C', MultiblockHatches.HIGHLY_ADVANCED_FLUID.input()) + .unlockedBy("has_plate", hasPartTag(MIMaterials.NUCLEAR_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/nuclear_fluid_hatch")); + shaped(RecipeCategory.MISC, MultiblockHatches.NUCLEAR_ITEM) + .pattern("AAA") + .pattern("ACA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.NUCLEAR_ALLOY, MIParts.PLATE)) + .define('C', MultiblockHatches.HIGHLY_ADVANCED_ITEM.input()) + .unlockedBy("has_plate", hasPartTag(MIMaterials.NUCLEAR_ALLOY, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/nuclear_item_hatch")); + shaped(RecipeCategory.MISC, MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.MACHINE_CASING_PIPE)) + .pattern("cPc") + .pattern("cCc") + .pattern("cPc") + .define('c', MIMaterials.BLASTPROOF_ALLOY.getPart(MIParts.CURVED_PLATE)) + .define('P', MIItem.ADVANCED_PUMP) + .define('C', MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/casing/nuclear_pipe_casing")); + shaped(RecipeCategory.MISC, MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("ACA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.IRIDIUM, MIParts.PLATE)) + .define('C', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.COIL)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.IRIDIUM, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/plasma_handling_iridium_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING)) + .pattern("AAA") + .pattern("AHA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.IRIDIUM, MIParts.PLATE)) + .define('H', MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.HIGHLY_ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/casing/quantum_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .pattern("AAA") + .pattern("AGA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.TITANIUM, MIParts.PLATE)) + .define('G', partIngredient(MIMaterials.TITANIUM, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.TITANIUM, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/casing/solid_titanium_machine_casing")); + shaped(RecipeCategory.MISC, MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_PIPE), 2) + .pattern("p p") + .pattern("p#p") + .pattern("p p") + .define('#', MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .define('p', MIMaterials.STAINLESS_STEEL.getPart(MIParts.CURVED_PLATE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/casing/stainless_steel_casing_pipe")); + shaped(RecipeCategory.MISC, MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING_PIPE), 2) + .pattern("p p") + .pattern("p#p") + .pattern("p p") + .define('#', MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .define('p', MIMaterials.TITANIUM.getPart(MIParts.CURVED_PLATE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/casing/titanium_casing_pipe")); + shaped(RecipeCategory.MISC, MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING)) + .pattern("AAA") + .pattern("AHA") + .pattern("AAA") + .define('A', partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.PLATE)) + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/casing/turbo_machine_casing")); + shaped(RecipeCategory.MISC, MIBlock.ADVANCED_MACHINE_HULL) + .pattern(" c ") + .pattern("BCB") + .pattern("ppp") + .define('B', MIMaterials.SILICON.getPart(MIParts.BATTERY)) + .define('c', MIItem.ELECTRONIC_CIRCUIT) + .define('C', MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING)) + .define('p', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .unlockedBy("has_machine_casing", has(MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/hull/advanced_machine_hull")); + shaped(RecipeCategory.MISC, MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .pattern(" c ") + .pattern("BCB") + .pattern("ppp") + .define('B', MIMaterials.CADMIUM.getPart(MIParts.BATTERY)) + .define('c', MIItem.PROCESSING_UNIT) + .define('C', MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING)) + .define('p', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .unlockedBy("has_machine_casing", has(MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/hull/highly_advanced_machine_hull")); + shaped(RecipeCategory.MISC, MIBlock.BASIC_MACHINE_HULL) + .pattern(" A ") + .pattern("BCB") + .pattern("ccc") + .define('A', MIItem.ANALOG_CIRCUIT) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('B', MIMaterials.REDSTONE.getPart(MIParts.BATTERY)) + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/hull/lv_machine_hull")); + shaped(RecipeCategory.MISC, MIBlock.QUANTUM_MACHINE_HULL) + .pattern(" c ") + .pattern("BCB") + .pattern("ppp") + .define('B', MIMaterials.PLUTONIUM.getPart(MIParts.BATTERY)) + .define('c', MIItem.QUANTUM_CIRCUIT) + .define('C', MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING)) + .define('p', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE)) + .unlockedBy("has_machine_casing", has(MIMaterials.IRIDIUM.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/hull/quantum_machine_hull")); + shaped(RecipeCategory.MISC, MIBlock.TURBO_MACHINE_HULL) + .pattern(" c ") + .pattern("BCB") + .pattern("ppp") + .define('B', MIMaterials.SODIUM.getPart(MIParts.BATTERY)) + .define('c', MIItem.DIGITAL_CIRCUIT) + .define('C', MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING)) + .define('p', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .unlockedBy("has_machine_casing", has(MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/hull/turbo_machine_hull")); + shaped(RecipeCategory.MISC, MultiblockMachines.ADVANCED_LARGE_STEAM_BOILER) + .pattern("PcP") + .pattern("LBL") + .pattern("PcP") + .define('P', MIItem.PUMP) + .define('c', MIItem.ELECTRONIC_CIRCUIT) + .define('B', MultiblockMachines.LARGE_STEAM_BOILER) + .define('L', MIItem.LARGE_PUMP) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/machine/advanced_large_steam_boiler")); + shaped(RecipeCategory.MISC, miItem("assembler")) + .pattern("AcA") + .pattern("CHC") + .pattern("AcA") + .define('A', MIItem.ROBOT_ARM) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('C', MIItem.CONVEYOR) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/assembler")); + shaped(RecipeCategory.MISC, miItem("centrifuge")) + .pattern("mPm") + .pattern("pHp") + .pattern("mCm") + .define('m', MIItem.LARGE_MOTOR) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('P', MIItem.LARGE_PUMP) + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/centrifuge")); + shaped(RecipeCategory.MISC, miItem("chemical_reactor")) + .pattern("gmg") + .pattern("fHf") + .pattern("CpC") + .define('f', MIMaterials.ALUMINUM.getPart(MIParts.ROTOR)) + .define('m', MIItem.LARGE_PUMP) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('g', Tags.Items.GLASS_BLOCKS) + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .define('p', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/chemical_reactor")); + shaped(RecipeCategory.MISC, miItem("electric_compressor")) + .pattern("pCp") + .pattern("cHc") + .pattern("pCp") + .define('p', MIItem.PISTON) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/compressor")); + shaped(RecipeCategory.MISC, miItem("configurable_chest"), 4) + .pattern("chc") + .pattern("mCm") + .pattern("chc") + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('m', MIItem.MOTOR) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('h', Items.HOPPER) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/machine/configurable_chest")); + shaped(RecipeCategory.MISC, miItem("configurable_tank"), 4) + .pattern("ctc") + .pattern("pCp") + .pattern("ctc") + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('p', MIItem.PUMP) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('t', MIMaterials.ALUMINUM.getPart(MIParts.TANK)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/machine/configurable_tank")); + shaped(RecipeCategory.MISC, miItem("electric_cutting_machine")) + .pattern("gdg") + .pattern("mHm") + .pattern("CcC") + .define('d', MIItem.INVAR_ROTARY_BLADE) + .define('g', Tags.Items.GLASS_BLOCKS) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('c', MIItem.CONVEYOR) + .define('m', MIItem.MOTOR) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/cutting_machine")); + shaped(RecipeCategory.MISC, MultiblockMachines.DISTILLATION_TOWER) + .pattern("pdp") + .pattern("CHC") + .pattern("pdp") + .define('p', MIItem.ADVANCED_PUMP) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('C', MIItem.DIGITAL_CIRCUIT) + .define('d', miItem("distillery")) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/distillation_tower")); + shaped(RecipeCategory.MISC, miItem("distillery")) + .pattern("gfg") + .pattern("mHm") + .pattern("CpC") + .define('f', MITags.FLUID_PIPES) + .define('m', MIItem.LARGE_PUMP) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('g', Tags.Items.GLASS_BLOCKS) + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .define('p', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/distillery")); + shaped(RecipeCategory.MISC, MultiblockMachines.ELECTRIC_BLAST_FURNACE) + .pattern("CCC") + .pattern("CHC") + .pattern("CFC") + .define('C', MIMaterials.CUPRONICKEL.getPart(MIParts.WIRE_MAGNETIC)) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('F', Items.BLAST_FURNACE) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/electric_blast_furnace")); + shaped(RecipeCategory.MISC, MultiblockMachines.ELECTRIC_QUARRY, 1) + .pattern("LAL") + .pattern("GCG") + .pattern("LPL") + .define('L', MIItem.LARGE_MOTOR) + .define('A', MIItem.ROBOT_ARM) + .define('G', MIItem.ELECTRONIC_CIRCUIT) + .define('P', MultiblockMachines.STEAM_QUARRY) + .define('C', MIBlock.ADVANCED_MACHINE_HULL) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/electric_quarry")); + shaped(RecipeCategory.MISC, miItem("electrolyzer")) + .pattern("cCc") + .pattern("rHr") + .pattern("cPc") + .define('c', MIMaterials.CUPRONICKEL.getPart(MIParts.WIRE_MAGNETIC)) + .define('r', partIngredient(MIMaterials.ALUMINUM, MIParts.ROD)) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .define('P', MIItem.LARGE_PUMP) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/electrolyzer")); + shaped(RecipeCategory.MISC, miItem("electric_furnace")) + .pattern("wCw") + .pattern("wHw") + .pattern("cCc") + .define('w', MIMaterials.CUPRONICKEL.getPart(MIParts.WIRE_MAGNETIC)) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/furnace")); + shaped(RecipeCategory.MISC, MultiblockMachines.FUSION_REACTOR) + .pattern("CCC") + .pattern("QHQ") + .pattern("CCC") + .define('C', MIBlock.FUSION_CHAMBER) + .define('H', MIBlock.QUANTUM_MACHINE_HULL) + .define('Q', MIItem.QUANTUM_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.QUANTUM_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/fusion_reactor")); + shaped(RecipeCategory.MISC, MultiblockMachines.HEAT_EXCHANGER) + .pattern("FpH") + .pattern("PhP") + .pattern("FpH") + .define('p', MIItem.SMALL_HEAT_EXCHANGER) + .define('h', MIBlock.TURBO_MACHINE_HULL) + .define('P', MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_PIPE)) + .define('F', MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .define('H', MIMaterials.INVAR.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/heat_exchanger")); + shaped(RecipeCategory.MISC, MultiblockMachines.HIGH_PRESSURE_ADVANCED_LARGE_STEAM_BOILER) + .pattern("LcL") + .pattern("fBf") + .pattern("LcL") + .define('L', MIItem.LARGE_PUMP) + .define('c', MIItem.PROCESSING_UNIT) + .define('B', MultiblockMachines.HIGH_PRESSURE_LARGE_STEAM_BOILER) + .define('f', MIItem.LARGE_ADVANCED_PUMP) + .unlockedBy("has_processing_unit", has(MIItem.PROCESSING_UNIT)) + .save(assemblerExportOutput, key("electric_age/machine/high_pressure_advanced_large_steam_boiler")); + shaped(RecipeCategory.MISC, MultiblockMachines.HIGH_PRESSURE_LARGE_STEAM_BOILER) + .pattern("fcf") + .pattern("PBP") + .pattern("fcf") + .define('P', MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .define('c', MIItem.DIGITAL_CIRCUIT) + .define('B', MultiblockMachines.ADVANCED_LARGE_STEAM_BOILER) + .define('f', MIItem.ADVANCED_PUMP) + .unlockedBy("has_digital_circuit", has(MIItem.DIGITAL_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/machine/high_pressure_large_steam_boiler")); + shaped(RecipeCategory.MISC, miItem("hv_diesel_generator")) + .pattern("PCP") + .pattern("GHG") + .pattern("ccc") + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('P', MIItem.ADVANCED_PUMP) + .define('G', partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.GEAR)) + .define('c', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .define('C', MIItem.DIGITAL_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/hv_diesel_generator")); + shaped(RecipeCategory.MISC, miItem("hv_steam_turbine")) + .pattern("pCp") + .pattern("rHr") + .pattern("mcm") + .define('C', MIItem.DIGITAL_CIRCUIT) + .define('m', MIItem.ADVANCED_MOTOR) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('p', MITags.FLUID_PIPES) + .define('r', MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROTOR)) + .define('c', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/hv_steam_turbine")); + shaped(RecipeCategory.MISC, MultiblockMachines.IMPLOSION_COMPRESSOR) + .pattern("BmB") + .pattern("THT") + .pattern("BmB") + .define('m', MIItem.ADVANCED_MOTOR) + .define('T', MIMaterials.TITANIUM.getPart(MIParts.LARGE_PLATE)) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('B', MIMaterials.BLASTPROOF_ALLOY.getPart(MIParts.LARGE_PLATE)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/implosion_compressor")); + shaped(RecipeCategory.MISC, MultiblockMachines.LARGE_DIESEL_GENERATOR) + .pattern("pcp") + .pattern("GHG") + .pattern("mem") + .define('p', MIItem.LARGE_ADVANCED_PUMP) + .define('H', MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .define('c', MIItem.PROCESSING_UNIT) + .define('G', MIMaterials.TITANIUM.getPart(MIParts.GEAR)) + .define('m', MIItem.LARGE_ADVANCED_MOTOR) + .define('e', miItem("hv_diesel_generator")) + .unlockedBy("has_hull", has(MIBlock.HIGHLY_ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/large_diesel_generator")); + shaped(RecipeCategory.MISC, MultiblockMachines.LARGE_STEAM_BOILER) + .pattern("PcP") + .pattern("fBf") + .pattern("PcP") + .define('P', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING_SPECIAL)) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('B', miItem("bronze_boiler")) + .define('f', MIMaterials.BRONZE.getPart(MIParts.CURVED_PLATE)) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/machine/large_steam_boiler")); + shaped(RecipeCategory.MISC, MultiblockMachines.LARGE_STEAM_TURBINE) + .pattern("tpt") + .pattern("RHR") + .pattern("tpt") + .define('t', miItem("hv_steam_turbine")) + .define('p', MIItem.ADVANCED_PUMP) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('R', MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROTOR)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/large_steam_turbine")); + shaped(RecipeCategory.MISC, MultiblockMachines.LARGE_TANK) + .pattern("tpt") + .pattern("RSR") + .pattern("tpt") + .define('t', MIMaterials.STEEL.getPart(MIParts.TANK)) + .define('p', MIItem.PUMP) + .define('S', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('R', MIMaterials.TIN.getPart(MIParts.ROTOR)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/machine/large_tank")); + shaped(RecipeCategory.MISC, MultiblockHatches.LARGE_TANK) + .pattern("t") + .pattern("p") + .pattern("S") + .define('t', MIMaterials.STEEL.getPart(MIParts.TANK)) + .define('p', MIItem.PUMP) + .define('S', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("electric_age/machine/large_tank_hatch")); + shaped(RecipeCategory.MISC, miItem("lv_diesel_generator")) + .pattern("PCP") + .pattern("GHG") + .pattern("ccc") + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('P', MIItem.PUMP) + .define('G', partIngredient(MIMaterials.TIN, MIParts.GEAR)) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/lv_diesel_generator")); + shaped(RecipeCategory.MISC, miItem("lv_steam_turbine")) + .pattern("pCp") + .pattern("rHr") + .pattern("mcm") + .define('C', MIItem.ANALOG_CIRCUIT) + .define('m', MIItem.MOTOR) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MITags.FLUID_PIPES) + .define('r', MIMaterials.TIN.getPart(MIParts.ROTOR)) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/lv_steam_turbine")); + shaped(RecipeCategory.MISC, miItem("electric_macerator")) + .pattern("pdp") + .pattern("mHm") + .pattern("CcC") + .define('d', MIItem.INVAR_ROTARY_BLADE) + .define('m', MIItem.MOTOR) + .define('p', MIItem.PISTON) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/macerator")); + shaped(RecipeCategory.MISC, miItem("electric_mixer")) + .pattern("gmg") + .pattern("rHr") + .pattern("CpC") + .define('g', Tags.Items.GLASS_BLOCKS) + .define('m', MIItem.MOTOR) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MITags.FLUID_PIPES) + .define('r', MIMaterials.TIN.getPart(MIParts.ROTOR)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/mixer")); + shaped(RecipeCategory.MISC, miItem("mv_diesel_generator")) + .pattern("PCP") + .pattern("GHG") + .pattern("ccc") + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('P', MIItem.LARGE_PUMP) + .define('G', partIngredient(MIMaterials.ALUMINUM, MIParts.GEAR)) + .define('c', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/mv_diesel_generator")); + shaped(RecipeCategory.MISC, miItem("mv_steam_turbine")) + .pattern("pcp") + .pattern("rHr") + .pattern("mem") + .define('p', MITags.FLUID_PIPES) + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('c', MIItem.ELECTRONIC_CIRCUIT) + .define('r', MIMaterials.ALUMINUM.getPart(MIParts.ROTOR)) + .define('m', MIItem.LARGE_MOTOR) + .define('e', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/mv_steam_turbine")); + shaped(RecipeCategory.MISC, MultiblockMachines.NUCLEAR_REACTOR) + .pattern("AcA") + .pattern("RCR") + .pattern("AcA") + .define('A', MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.LARGE_PLATE)) + .define('C', MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .define('c', MIItem.PROCESSING_UNIT) + .define('R', MIMaterials.CADMIUM.getPart(MIParts.CONTROL_ROD)) + .unlockedBy("has_hull", has(MIBlock.HIGHLY_ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/nuclear_reactor")); + shaped(RecipeCategory.MISC, miItem("electric_packer")) + .pattern("AcA") + .pattern("CHC") + .pattern("pcp") + .define('A', MIItem.ROBOT_ARM) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('C', MIItem.CONVEYOR) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MIMaterials.TIN.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/packer")); + shaped(RecipeCategory.MISC, MultiblockMachines.PLASMA_TURBINE) + .pattern("tpt") + .pattern("RHR") + .pattern("tpt") + .define('t', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.COIL)) + .define('p', MIItem.QUANTUM_CIRCUIT) + .define('H', MIBlock.QUANTUM_MACHINE_HULL) + .define('R', MIMaterials.TITANIUM.getPart(MIParts.ROTOR)) + .unlockedBy("has_hull", has(MIBlock.QUANTUM_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/plasma_turbine")); + shaped(RecipeCategory.MISC, miItem("polarizer")) + .pattern("wLw") + .pattern("pHp") + .pattern("wLw") + .define('w', MIMaterials.TIN.getPart(MIParts.WIRE)) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('L', MIItem.INDUCTOR) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/polarizer")); + shaped(RecipeCategory.MISC, MultiblockMachines.PRESSURIZER) + .pattern("pcp") + .pattern("PHP") + .pattern("pCp") + .define('p', MIItem.ADVANCED_PUMP) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('c', MIItem.DIGITAL_CIRCUIT) + .define('P', MIMaterials.TITANIUM.getPart(MIParts.MACHINE_CASING_PIPE)) + .define('C', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/pressurizer")); + shaped(RecipeCategory.MISC, miItem("electric_unpacker")) + .pattern("mcm") + .pattern("CHC") + .pattern("pcp") + .define('m', MIItem.MOTOR) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('C', MIItem.CONVEYOR) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MIMaterials.TIN.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/unpacker")); + shaped(RecipeCategory.MISC, MultiblockMachines.VACUUM_FREEZER) + .pattern("PPP") + .pattern("CHC") + .pattern("pCp") + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('P', MIItem.LARGE_PUMP) + .define('p', MIMaterials.ALUMINUM.getPart(MIParts.LARGE_PLATE)) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/vacuum_freezer")); + shaped(RecipeCategory.MISC, miItem("electric_water_pump")) + .pattern("frf") + .pattern("PHP") + .pattern("pcp") + .define('f', MITags.FLUID_PIPES) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('p', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('P', MIItem.PUMP) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('r', MIMaterials.TIN.getPart(MIParts.ROTOR)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/water_pump")); + shaped(RecipeCategory.MISC, miItem("electric_wiremill")) + .pattern("mcm") + .pattern("CHC") + .pattern("mcm") + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('m', MIItem.MOTOR) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/machine/wiremill")); + shaped(RecipeCategory.MISC, miItem("ev_storage_unit")) + .pattern("bbb") + .pattern("LHL") + .pattern("bbb") + .define('b', MIMaterials.CADMIUM.getPart(MIParts.BATTERY)) + .define('H', MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .define('L', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .unlockedBy("has_hull", has(MIBlock.HIGHLY_ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/storage_unit/ev_storage_unit")); + shaped(RecipeCategory.MISC, miItem("hv_storage_unit")) + .pattern("bbb") + .pattern("LHL") + .pattern("bbb") + .define('b', MIMaterials.SODIUM.getPart(MIParts.BATTERY)) + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('L', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/storage_unit/hv_storage_unit")); + shaped(RecipeCategory.MISC, miItem("lv_storage_unit")) + .pattern("bbb") + .pattern("LHL") + .pattern("bbb") + .define('b', MIMaterials.REDSTONE.getPart(MIParts.BATTERY)) + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('L', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/storage_unit/lv_storage_unit")); + shaped(RecipeCategory.MISC, miItem("mv_storage_unit")) + .pattern("bbb") + .pattern("LHL") + .pattern("bbb") + .define('b', MIMaterials.SILICON.getPart(MIParts.BATTERY)) + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('L', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/storage_unit/mv_storage_unit")); + shaped(RecipeCategory.MISC, miItem("superconductor_storage_unit")) + .pattern("bbb") + .pattern("LHL") + .pattern("bbb") + .define('b', MIMaterials.PLUTONIUM.getPart(MIParts.BATTERY)) + .define('H', MIBlock.QUANTUM_MACHINE_HULL) + .define('L', partIngredient(MIMaterials.BATTERY_ALLOY, MIParts.PLATE)) + .unlockedBy("has_hull", has(MIBlock.QUANTUM_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/storage_unit/superconductor_storage_unit")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 400) + .itemIn(MIItem.BASIC_UPGRADE, 4) + .itemIn(MIItem.LARGE_MOTOR, 2) + .itemIn(MIItem.LARGE_PUMP) + .itemIn(MIItem.ELECTRONIC_CIRCUIT_BOARD) + .fluidIn(MIFluids.POLYETHYLENE, 1000) + .itemOut(MIItem.ADVANCED_UPGRADE, 4) + .save(output, key("electric_age/upgrades/advanced")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(MIItem.CONVEYOR, 2) + .itemIn(MIItem.MOTOR, 4) + .itemIn(MIItem.ROBOT_ARM, 2) + .itemIn(MIItem.ANALOG_CIRCUIT_BOARD) + .itemOut(MIItem.BASIC_UPGRADE, 4) + .save(output, key("electric_age/upgrades/basic")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 400) + .itemIn(MIItem.LARGE_ADVANCED_MOTOR, 8) + .itemIn(MIItem.LARGE_ADVANCED_PUMP, 4) + .itemIn(MIItem.TURBO_UPGRADE, 4) + .itemIn(MIItem.PROCESSING_UNIT_BOARD) + .fluidIn(MIFluids.POLYVINYL_CHLORIDE, 2500) + .itemOut(MIItem.HIGHLY_ADVANCED_UPGRADE, 4) + .save(output, key("electric_age/upgrades/highly_advanced")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 1000) + .itemIn(MIItem.HIGHLY_ADVANCED_UPGRADE, 32) + .itemIn(MIItem.QUANTUM_CIRCUIT, 8) + .itemIn(MIItem.SINGULARITY) + .itemIn(MIItem.QUANTUM_CIRCUIT_BOARD) + .fluidIn(MIFluids.UU_MATTER, 50) + .itemOut(MIItem.QUANTUM_UPGRADE) + .save(output, key("electric_age/upgrades/quantum")); + machine(MIMachineRecipeTypes.ASSEMBLER, 16, 400) + .itemIn(MIItem.ADVANCED_MOTOR, 16) + .itemIn(MIItem.ADVANCED_PUMP, 2) + .itemIn(MIItem.ADVANCED_UPGRADE, 4) + .itemIn(MIItem.DIGITAL_CIRCUIT_BOARD) + .fluidIn(MIFluids.POLYVINYL_CHLORIDE, 1000) + .itemOut(MIItem.TURBO_UPGRADE, 4) + .save(output, key("electric_age/upgrades/turbo")); + shaped(RecipeCategory.MISC, miItem("superconductor_ev_transformer")) + .pattern(" OO") + .pattern("IH ") + .pattern(" OO") + .define('H', MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .define('I', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE)) + .define('O', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.HIGHLY_ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/ev_supra/down")); + shaped(RecipeCategory.MISC, miItem("ev_superconductor_transformer")) + .pattern("X") + .define('X', miItem("superconductor_ev_transformer")) + .unlockedBy("has_ingredient", has(miItem("superconductor_ev_transformer"))) + .save(output, key("electric_age/transformer/ev_supra/down_to_up")); + shaped(RecipeCategory.MISC, miItem("ev_superconductor_transformer")) + .pattern("II ") + .pattern(" HO") + .pattern("II ") + .define('H', MIBlock.HIGHLY_ADVANCED_MACHINE_HULL) + .define('I', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .define('O', MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.HIGHLY_ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/ev_supra/up")); + shaped(RecipeCategory.MISC, miItem("superconductor_ev_transformer")) + .pattern("X") + .define('X', miItem("ev_superconductor_transformer")) + .unlockedBy("has_ingredient", has(miItem("ev_superconductor_transformer"))) + .save(output, key("electric_age/transformer/ev_supra/up_to_down")); + shaped(RecipeCategory.MISC, miItem("ev_hv_transformer")) + .pattern(" OO") + .pattern("IH ") + .pattern(" OO") + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('I', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .define('O', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/hv_ev/down")); + shaped(RecipeCategory.MISC, miItem("hv_ev_transformer")) + .pattern("X") + .define('X', miItem("ev_hv_transformer")) + .unlockedBy("has_ingredient", has(miItem("ev_hv_transformer"))) + .save(output, key("electric_age/transformer/hv_ev/down_to_up")); + shaped(RecipeCategory.MISC, miItem("hv_ev_transformer")) + .pattern("II ") + .pattern(" HO") + .pattern("II ") + .define('H', MIBlock.TURBO_MACHINE_HULL) + .define('I', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .define('O', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.TURBO_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/hv_ev/up")); + shaped(RecipeCategory.MISC, miItem("ev_hv_transformer")) + .pattern("X") + .define('X', miItem("hv_ev_transformer")) + .unlockedBy("has_ingredient", has(miItem("hv_ev_transformer"))) + .save(output, key("electric_age/transformer/hv_ev/up_to_down")); + shaped(RecipeCategory.MISC, miItem("mv_lv_transformer")) + .pattern(" OO") + .pattern("IH ") + .pattern(" OO") + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('I', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('O', MIMaterials.TIN.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/lv_mv/down")); + shaped(RecipeCategory.MISC, miItem("lv_mv_transformer")) + .pattern("X") + .define('X', miItem("mv_lv_transformer")) + .unlockedBy("has_ingredient", has(miItem("mv_lv_transformer"))) + .save(output, key("electric_age/transformer/lv_mv/down_to_up")); + shaped(RecipeCategory.MISC, miItem("lv_mv_transformer")) + .pattern("II ") + .pattern(" HO") + .pattern("II ") + .define('H', MIBlock.BASIC_MACHINE_HULL) + .define('I', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('O', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.BASIC_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/lv_mv/up")); + shaped(RecipeCategory.MISC, miItem("mv_lv_transformer")) + .pattern("X") + .define('X', miItem("lv_mv_transformer")) + .unlockedBy("has_ingredient", has(miItem("lv_mv_transformer"))) + .save(output, key("electric_age/transformer/lv_mv/up_to_down")); + shaped(RecipeCategory.MISC, miItem("hv_mv_transformer")) + .pattern(" OO") + .pattern("IH ") + .pattern(" OO") + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('I', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .define('O', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/mv_hv/down")); + shaped(RecipeCategory.MISC, miItem("mv_hv_transformer")) + .pattern("X") + .define('X', miItem("hv_mv_transformer")) + .unlockedBy("has_ingredient", has(miItem("hv_mv_transformer"))) + .save(output, key("electric_age/transformer/mv_hv/down_to_up")); + shaped(RecipeCategory.MISC, miItem("mv_hv_transformer")) + .pattern("II ") + .pattern(" HO") + .pattern("II ") + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('I', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('O', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("electric_age/transformer/mv_hv/up")); + shaped(RecipeCategory.MISC, miItem("hv_mv_transformer")) + .pattern("X") + .define('X', miItem("mv_hv_transformer")) + .unlockedBy("has_ingredient", has(miItem("mv_hv_transformer"))) + .save(output, key("electric_age/transformer/mv_hv/up_to_down")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 8000) + .itemIn(MIBlock.QUANTUM_MACHINE_HULL) + .itemIn(MIItem.QUANTUM_UPGRADE, 2) + .itemIn(MIItem.QUANTUM_CIRCUIT, 4) + .fluidIn(MIFluids.UU_MATTER, 500) + .itemOut(miItem("replicator")) + .save(output, key("electric_age/machine/assembler/replicator")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(MITags.FLUID_PIPES, 3) + .itemIn(MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROTOR), 3) + .itemIn(MIItem.ADVANCED_MOTOR) + .fluidIn(MIFluids.SOLDERING_ALLOY, 200) + .itemOut(MIItem.ADVANCED_PUMP) + .save(output, key("electric_age/component/assembler/advanced_pump")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(partIngredient(MIMaterials.GOLD, MIParts.PLATE), 2) + .itemIn(MIMaterials.COPPER.getPart(MIParts.WIRE), 2) + .itemIn(MIItem.RUBBER_SHEET) + .itemOut(MIItem.CAPACITOR, 4) + .save(output, key("electric_age/component/assembler/capacitor")); + machine(MIMachineRecipeTypes.ASSEMBLER, 16, 400) + .itemIn(MITags.FLUID_PIPES, 3) + .itemIn(MIItem.SMALL_HEAT_EXCHANGER, 2) + .itemIn(partIngredient(MIMaterials.TIN, MIParts.PLATE), 6) + .fluidIn(MIFluids.CRYOFLUID, 1000) + .itemOut(MIItem.COOLING_CELL) + .save(output, key("electric_age/component/assembler/cooling_cell")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(MIMaterials.COPPER.getPart(MIParts.WIRE), 8) + .itemIn(partIngredient(MIMaterials.STEEL, MIParts.ROD)) + .itemOut(MIItem.INDUCTOR, 4) + .save(output, key("electric_age/component/assembler/inductor")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(MITags.FLUID_PIPES, 3) + .itemIn(MIMaterials.TIN.getPart(MIParts.ROTOR), 3) + .itemIn(MIItem.MOTOR) + .fluidIn(MIFluids.SOLDERING_ALLOY, 100) + .itemOut(MIItem.PUMP) + .save(output, key("electric_age/component/assembler/pump")); + machine(MIMachineRecipeTypes.ASSEMBLER, 20, 400) + .itemIn(MIItem.ARITHMETIC_LOGIC_UNIT, 2) + .itemIn(partIngredient(MIMaterials.CARBON, MIParts.PLATE), 2) + .itemIn(Tags.Items.GLASS_PANES, 2) + .itemIn(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.WIRE), 6) + .fluidIn(MIFluids.CRYOFLUID, 250) + .fluidIn(MIFluids.TRITIUM, 50) + .itemOut(MIItem.QUBIT) + .save(output, key("electric_age/component/assembler/qubit")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(MIMaterials.COPPER.getPart(MIParts.FINE_WIRE), 2) + .itemIn(partIngredient(MIMaterials.COAL, MIParts.DUST)) + .itemOut(MIItem.RESISTOR, 12) + .save(output, key("electric_age/component/assembler/resistor")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 64, 1500) + .itemIn(partIngredient(MIMaterials.SILICON, MIParts.DUST), 32) + .itemIn(partIngredient(MIMaterials.IRIDIUM, MIParts.TINY_DUST)) + .fluidIn(MIFluids.ARGON, 1250) + .itemOut(MIItem.MONOCRYSTALLINE_SILICON) + .save(output, key("electric_age/component/blast_furnace/monocrystalline_silicon")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 400) + .itemIn(partIngredient(MIMaterials.SILICON, MIParts.PLATE)) + .itemIn(partIngredient(MIMaterials.ANTIMONY, MIParts.TINY_DUST)) + .itemOut(MIMaterials.SILICON.getPart(MIParts.N_DOPED_PLATE)) + .save(output, key("electric_age/component/chemical_reactor/n_doped_silicon")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 400) + .itemIn(partIngredient(MIMaterials.SILICON, MIParts.PLATE)) + .itemIn(partIngredient(MIMaterials.ALUMINUM, MIParts.TINY_DUST)) + .itemOut(MIMaterials.SILICON.getPart(MIParts.P_DOPED_PLATE)) + .save(output, key("electric_age/component/chemical_reactor/p_doped_silicon")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 12, 400) + .itemIn(MIItem.SILICON_WAFER) + .itemIn(partIngredient(MIMaterials.ANTIMONY, MIParts.DUST)) + .itemIn(partIngredient(MIMaterials.ALUMINUM, MIParts.DUST)) + .fluidIn(MIFluids.ARGON, 250) + .fluidIn(MIFluids.STYRENE_BUTADIENE_RUBBER, 500) + .itemOut(MIItem.RANDOM_ACCESS_MEMORY, 2) + .save(output, key("electric_age/component/chemical_reactor/random_acces_memory")); + shaped(RecipeCategory.MISC, MIItem.ADVANCED_MOTOR) + .pattern("cwr") + .pattern("wmw") + .pattern("rwc") + .define('m', MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROD_MAGNETIC)) + .define('r', partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.ROD)) + .define('c', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .define('w', MIMaterials.ANNEALED_COPPER.getPart(MIParts.WIRE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/advanced_motor")); + shaped(RecipeCategory.MISC, MIItem.ADVANCED_PUMP) + .pattern("ppp") + .pattern("rmr") + .pattern("brb") + .define('m', MIItem.ADVANCED_MOTOR) + .define('r', MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROTOR)) + .define('p', MITags.FLUID_PIPES) + .define('b', MIMaterials.STAINLESS_STEEL.getPart(MIParts.BOLT)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("electric_age/component/craft/advanced_pump")); + shaped(RecipeCategory.MISC, MIItem.AIR_INTAKE) + .pattern("ara") + .pattern("rRr") + .pattern("ara") + .define('r', partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.PLATE)) + .define('R', MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROTOR)) + .define('a', partIngredient(MIMaterials.ALUMINUM, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STAINLESS_STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/air_intake")); + shaped(RecipeCategory.MISC, MIItem.AND_GATE) + .pattern("wr ") + .pattern("wAw") + .pattern("wr ") + .define('r', MIItem.RESISTOR) + .define('A', MIItem.OP_AMP) + .define('w', MIMaterials.ALUMINUM.getPart(MIParts.WIRE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/and_gate")); + shaped(RecipeCategory.MISC, MIItem.ARITHMETIC_LOGIC_UNIT, 1) + .pattern("NaN") + .pattern("oPo") + .pattern("NaN") + .define('P', partIngredient(MIMaterials.DIAMOND, MIParts.PLATE)) + .define('a', MIItem.AND_GATE) + .define('o', MIItem.OR_GATE) + .define('N', MIItem.NOT_GATE) + .unlockedBy("has_plate", hasPartTag(MIMaterials.DIAMOND, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/arithmetic_logic_unit")); + shaped(RecipeCategory.MISC, MIItem.CAPACITOR) + .pattern(" P ") + .pattern("wSw") + .pattern(" P ") + .define('P', partIngredient(MIMaterials.GOLD, MIParts.PLATE)) + .define('w', MIMaterials.COPPER.getPart(MIParts.WIRE)) + .define('S', MIItem.RUBBER_SHEET) + .unlockedBy("has_plate", hasPartTag(MIMaterials.GOLD, MIParts.PLATE)) + .save(output, key("electric_age/component/craft/capacitor")); + shaped(RecipeCategory.MISC, MIItem.CONVEYOR) + .pattern("rrr") + .pattern("mcm") + .pattern("rrr") + .define('m', MIItem.MOTOR) + .define('r', MIItem.RUBBER_SHEET) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/conveyor")); + shaped(RecipeCategory.MISC, MIItem.DIODE) + .pattern("ePg") + .pattern("eSg") + .pattern("ePg") + .define('S', partIngredient(MIMaterials.SILICON, MIParts.PLATE)) + .define('g', Tags.Items.GLASS_BLOCKS) + .define('e', MIMaterials.ELECTRUM.getPart(MIParts.FINE_WIRE)) + .define('P', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.SILICON, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/diode")); + shaped(RecipeCategory.MISC, MIItem.DIODE, 2) + .pattern("ePg") + .pattern("eSg") + .pattern("ePg") + .define('S', MIMaterials.SILICON.getPart(MIParts.N_DOPED_PLATE)) + .define('g', Tags.Items.GLASS_BLOCKS) + .define('e', MIMaterials.ELECTRUM.getPart(MIParts.FINE_WIRE)) + .define('P', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/diode_doped")); + shaped(RecipeCategory.MISC, MIItem.INDUCTOR) + .pattern("www") + .pattern("wrw") + .pattern("www") + .define('r', partIngredient(MIMaterials.STEEL, MIParts.ROD)) + .define('w', MIMaterials.COPPER.getPart(MIParts.WIRE)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("electric_age/component/craft/inductor")); + shaped(RecipeCategory.MISC, MIItem.INVAR_ROTARY_BLADE) + .pattern(" d ") + .pattern("dGd") + .pattern(" d ") + .define('d', partIngredient(MIMaterials.DIAMOND, MIParts.DUST)) + .define('G', partIngredient(MIMaterials.INVAR, MIParts.GEAR)) + .unlockedBy("has_gear", hasPartTag(MIMaterials.INVAR, MIParts.GEAR)) + .save(assemblerExportOutput, key("electric_age/component/craft/invar_rotary_blade")); + shaped(RecipeCategory.MISC, MIItem.LARGE_ADVANCED_MOTOR) + .pattern("mmm") + .pattern("Crr") + .pattern("mmm") + .define('C', MIItem.PROCESSING_UNIT) + .define('r', partIngredient(MIMaterials.TITANIUM, MIParts.ROD)) + .define('m', MIItem.ADVANCED_MOTOR) + .unlockedBy("has_processing_unit", has(MIItem.PROCESSING_UNIT)) + .save(assemblerExportOutput, key("electric_age/component/craft/large_advanced_motor")); + shaped(RecipeCategory.MISC, MIItem.LARGE_ADVANCED_PUMP) + .pattern("ppp") + .pattern("rMr") + .pattern("CrC") + .define('C', MIItem.PROCESSING_UNIT) + .define('r', MIMaterials.TITANIUM.getPart(MIParts.ROTOR)) + .define('M', MIItem.LARGE_ADVANCED_MOTOR) + .define('p', MIItem.ADVANCED_PUMP) + .unlockedBy("has_processing_unit", has(MIItem.PROCESSING_UNIT)) + .save(assemblerExportOutput, key("electric_age/component/craft/large_advanced_pump")); + shaped(RecipeCategory.MISC, MIItem.LARGE_HEAT_EXCHANGER) + .pattern("ghg") + .pattern("RLR") + .pattern("ghg") + .define('h', MIItem.SMALL_HEAT_EXCHANGER) + .define('L', MIItem.LARGE_ADVANCED_PUMP) + .define('R', MIMaterials.ALUMINUM.getPart(MIParts.ROTOR)) + .define('g', partIngredient(MIMaterials.INVAR, MIParts.GEAR)) + .unlockedBy("has_gear", hasPartTag(MIMaterials.INVAR, MIParts.GEAR)) + .save(assemblerExportOutput, key("electric_age/component/craft/large_heat_exchanger")); + shaped(RecipeCategory.MISC, MIItem.LARGE_MOTOR) + .pattern("mmm") + .pattern("Crr") + .pattern("mmm") + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .define('r', partIngredient(MIMaterials.ALUMINUM, MIParts.ROD)) + .define('m', MIItem.MOTOR) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/component/craft/large_motor")); + shaped(RecipeCategory.MISC, MIItem.LARGE_PUMP) + .pattern("ppp") + .pattern("rMr") + .pattern("CrC") + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .define('r', MIMaterials.ALUMINUM.getPart(MIParts.ROTOR)) + .define('M', MIItem.LARGE_MOTOR) + .define('p', MIItem.PUMP) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/component/craft/large_pump")); + shaped(RecipeCategory.MISC, MIItem.MEMORY_MANAGEMENT_UNIT, 1) + .pattern("WWW") + .pattern("wPw") + .pattern("WWW") + .define('P', partIngredient(MIMaterials.EMERALD, MIParts.PLATE)) + .define('w', MIItem.SILICON_WAFER) + .define('W', MIMaterials.PLATINUM.getPart(MIParts.FINE_WIRE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.EMERALD, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/memory_management_unit")); + shaped(RecipeCategory.MISC, MIItem.MOTOR) + .pattern("cwr") + .pattern("wmw") + .pattern("rwc") + .define('m', MIMaterials.STEEL.getPart(MIParts.ROD_MAGNETIC)) + .define('r', partIngredient(MIMaterials.STEEL, MIParts.ROD)) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('w', MIMaterials.COPPER.getPart(MIParts.WIRE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/motor")); + shaped(RecipeCategory.MISC, MIItem.NOT_GATE) + .pattern(" ") + .pattern("wAr") + .pattern(" ") + .define('r', MIItem.RESISTOR) + .define('A', MIItem.OP_AMP) + .define('w', MIMaterials.ALUMINUM.getPart(MIParts.WIRE)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/not_gate")); + shaped(RecipeCategory.MISC, MIItem.OP_AMP) + .pattern("rTT") + .pattern("rdr") + .pattern("rTT") + .define('r', MIItem.RESISTOR) + .define('T', MIItem.TRANSISTOR) + .define('d', MIItem.DIODE) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/op_amp")); + shaped(RecipeCategory.MISC, MIItem.OR_GATE) + .pattern(" A ") + .pattern("wdw") + .pattern(" A ") + .define('A', MIItem.OP_AMP) + .define('w', MIMaterials.ALUMINUM.getPart(MIParts.WIRE)) + .define('d', MIItem.DIODE) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("electric_age/component/craft/or_gate")); + shaped(RecipeCategory.MISC, MIItem.OVERDRIVE_MODULE) + .pattern("wdw") + .pattern("tbt") + .pattern("wdw") + .define('d', MIItem.DIODE) + .define('t', MIItem.TRANSISTOR) + .define('w', MIMaterials.ELECTRUM.getPart(MIParts.FINE_WIRE)) + .define('b', MIItem.ELECTRONIC_CIRCUIT_BOARD) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/component/craft/overdrive_module")); + shaped(RecipeCategory.MISC, MIItem.PISTON) + .pattern("ppp") + .pattern("crr") + .pattern("cmg") + .define('m', MIItem.MOTOR) + .define('r', partIngredient(MIMaterials.STEEL, MIParts.ROD)) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('p', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('g', partIngredient(MIMaterials.STEEL, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/piston")); + shaped(RecipeCategory.MISC, MIItem.PUMP) + .pattern("ppp") + .pattern("rmr") + .pattern("brb") + .define('m', MIItem.MOTOR) + .define('r', MIMaterials.TIN.getPart(MIParts.ROTOR)) + .define('p', MITags.FLUID_PIPES) + .define('b', MIMaterials.TIN.getPart(MIParts.BOLT)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("electric_age/component/craft/pump")); + shaped(RecipeCategory.MISC, MIItem.REDSTONE_CONTROL_MODULE) + .pattern("dtd") + .pattern("rcr") + .pattern("ibi") + .define('d', Items.REDSTONE) + .define('t', Items.REDSTONE_TORCH) + .define('c', MIItem.CAPACITOR) + .define('r', MIItem.RESISTOR) + .define('b', MIItem.ANALOG_CIRCUIT_BOARD) + .define('i', MIItem.INDUCTOR) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/component/craft/redstone_control_module")); + shaped(RecipeCategory.MISC, MIItem.RESISTOR, 3) + .pattern(" P ") + .pattern("FCF") + .pattern(" P ") + .define('P', Items.PAPER) + .define('F', MIMaterials.COPPER.getPart(MIParts.FINE_WIRE)) + .define('C', partIngredient(MIMaterials.COAL, MIParts.DUST)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("electric_age/component/craft/resistor")); + shaped(RecipeCategory.MISC, MIItem.ROBOT_ARM) + .pattern("ccc") + .pattern("mrm") + .pattern("pCr") + .define('m', MIItem.MOTOR) + .define('r', partIngredient(MIMaterials.STEEL, MIParts.ROD)) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('p', MIItem.PISTON) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/component/craft/robot_arm")); + shaped(RecipeCategory.MISC, MIItem.SMALL_HEAT_EXCHANGER) + .pattern("pPp") + .pattern("PLP") + .pattern("pPp") + .define('P', partIngredient(MIMaterials.INVAR, MIParts.PLATE)) + .define('L', MIMaterials.STAINLESS_STEEL.getPart(MIParts.LARGE_PLATE)) + .define('p', MIItem.ADVANCED_PUMP) + .unlockedBy("has_plate", hasPartTag(MIMaterials.INVAR, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/small_heat_exchanger")); + shaped(RecipeCategory.MISC, MIMaterials.STEEL.getPart(MIParts.ROD_MAGNETIC)) + .pattern(" RR") + .pattern("RrR") + .pattern("RR ") + .define('R', Items.REDSTONE) + .define('r', partIngredient(MIMaterials.STEEL, MIParts.ROD)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("electric_age/component/craft/steel_rod_magnetic")); + shaped(RecipeCategory.MISC, MIItem.TRANSISTOR, 2) + .pattern(" e ") + .pattern("PPP") + .pattern("SSS") + .define('S', partIngredient(MIMaterials.SILICON, MIParts.PLATE)) + .define('e', MIMaterials.ELECTRUM.getPart(MIParts.FINE_WIRE)) + .define('P', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.SILICON, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/transistor")); + shaped(RecipeCategory.MISC, MIItem.TRANSISTOR, 4) + .pattern(" e ") + .pattern("PPP") + .pattern("SsS") + .define('S', MIMaterials.SILICON.getPart(MIParts.P_DOPED_PLATE)) + .define('s', MIMaterials.SILICON.getPart(MIParts.N_DOPED_PLATE)) + .define('e', MIMaterials.ELECTRUM.getPart(MIParts.FINE_WIRE)) + .define('P', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/transistor_doped")); + shaped(RecipeCategory.MISC, MIItem.ULTRADENSE_METAL_BALL) + .pattern("TlT") + .pattern("lIl") + .pattern("TlT") + .define('T', MIMaterials.TUNGSTEN.getPart(MIParts.LARGE_PLATE)) + .define('l', partIngredient(MIMaterials.LEAD, MIParts.PLATE)) + .define('I', partIngredient(MIMaterials.IRIDIUM, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.LEAD, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/component/craft/ultradense_metal_ball")); + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 16, 600) + .itemIn(MIItem.MONOCRYSTALLINE_SILICON) + .fluidIn(MIFluids.LUBRICANT, 500) + .itemOut(MIItem.SILICON_WAFER, 32) + .save(output, key("electric_age/component/cutting_machine/silicon_waffer")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(MIItem.ULTRADENSE_METAL_BALL) + .itemIn(MIBlock.NUKE, 64) + .itemOut(MIItem.SINGULARITY) + .save(output, key("electric_age/component/implosion_compressor/singularity")); + machine(MIMachineRecipeTypes.POLARIZER, 16, 400) + .itemIn(partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.ROD)) + .itemIn(MIMaterials.NEODYMIUM.getPart(MIParts.DUST)) + .itemOut(MIMaterials.STAINLESS_STEEL.getPart(MIParts.ROD_MAGNETIC)) + .save(output, key("electric_age/component/polarizer/stainless_steel_rod_magnetic")); + machine(MIMachineRecipeTypes.ASSEMBLER, 16, 500) + .itemIn(MIMaterials.ALUMINUM.getPart(MIParts.CABLE), 6) + .itemIn(MIMaterials.SILICON.getPart(MIParts.BATTERY)) + .itemIn(MIItem.ELECTRONIC_CIRCUIT_BOARD) + .itemIn(MIMaterials.STAINLESS_STEEL.getPart(MIParts.PLATE), 4) + .fluidIn(MIFluids.POLYETHYLENE, 750) + .itemOut(MIItem.DIGITAL_CIRCUIT_BOARD) + .save(output, key("electric_age/circuit/assembler/digital_circuit_board")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 1200) + .itemIn(MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE), 8) + .itemIn(MIMaterials.CADMIUM.getPart(MIParts.BATTERY), 2) + .itemIn(MIItem.DIGITAL_CIRCUIT_BOARD) + .itemIn(partIngredient(MIMaterials.PLATINUM, MIParts.PLATE), 4) + .fluidIn(MIFluids.POLYVINYL_CHLORIDE, 1500) + .itemOut(MIItem.PROCESSING_UNIT_BOARD) + .save(output, key("electric_age/circuit/assembler/processing_unit_board")); + machine(MIMachineRecipeTypes.ASSEMBLER, 64, 2000) + .itemIn(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE), 12) + .itemIn(MIMaterials.PLUTONIUM.getPart(MIParts.BATTERY), 2) + .itemIn(MIItem.PROCESSING_UNIT_BOARD) + .itemIn(partIngredient(MIMaterials.IRIDIUM, MIParts.PLATE), 6) + .fluidIn(MIFluids.HELIUM_3, 50) + .itemOut(MIItem.QUANTUM_CIRCUIT_BOARD) + .save(output, key("electric_age/circuit/assembler/quantum_circuit_board")); + shaped(RecipeCategory.MISC, MIItem.DIGITAL_CIRCUIT) + .pattern("cOc") + .pattern("NbN") + .pattern("cAc") + .define('O', MIItem.OR_GATE) + .define('c', MIItem.ELECTRONIC_CIRCUIT) + .define('N', MIItem.NOT_GATE) + .define('A', MIItem.AND_GATE) + .define('b', MIItem.DIGITAL_CIRCUIT_BOARD) + .unlockedBy("has_digital_circuit", has(MIItem.DIGITAL_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/digital_circuit")); + shaped(RecipeCategory.MISC, MIItem.ELECTRONIC_CIRCUIT) + .pattern("cdc") + .pattern("tbt") + .pattern("cdc") + .define('d', MIItem.DIODE) + .define('c', MIItem.ANALOG_CIRCUIT) + .define('t', MIItem.TRANSISTOR) + .define('b', MIItem.ELECTRONIC_CIRCUIT_BOARD) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/electronic_circuit")); + shaped(RecipeCategory.MISC, MIItem.ELECTRONIC_CIRCUIT_BOARD) + .pattern("eAe") + .pattern("AbA") + .pattern("eBe") + .define('A', partIngredient(MIMaterials.ALUMINUM, MIParts.PLATE)) + .define('e', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('b', MIItem.ANALOG_CIRCUIT_BOARD) + .define('B', MIMaterials.REDSTONE.getPart(MIParts.BATTERY)) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/electronic_circuit_board")); + shaped(RecipeCategory.MISC, MIItem.ANALOG_CIRCUIT) + .pattern("RLR") + .pattern("CBC") + .pattern("www") + .define('L', MIItem.INDUCTOR) + .define('w', MIMaterials.COPPER.getPart(MIParts.WIRE)) + .define('R', MIItem.RESISTOR) + .define('C', MIItem.CAPACITOR) + .define('B', MIItem.ANALOG_CIRCUIT_BOARD) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/lv_circuit")); + shaped(RecipeCategory.MISC, MIItem.ANALOG_CIRCUIT_BOARD) + .pattern("r") + .pattern("c") + .pattern("r") + .define('r', MIItem.RUBBER_SHEET) + .define('c', partIngredient(MIMaterials.COPPER, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.COPPER, MIParts.PLATE)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/lv_circuit_board")); + shaped(RecipeCategory.MISC, MIItem.PROCESSING_UNIT) + .pattern("DUD") + .pattern("MbM") + .pattern("DAD") + .define('D', MIItem.DIGITAL_CIRCUIT) + .define('M', MIItem.RANDOM_ACCESS_MEMORY) + .define('U', MIItem.MEMORY_MANAGEMENT_UNIT) + .define('A', MIItem.ARITHMETIC_LOGIC_UNIT) + .define('b', MIItem.PROCESSING_UNIT_BOARD) + .unlockedBy("has_digital_circuit", has(MIItem.DIGITAL_CIRCUIT)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/processing_unit")); + shaped(RecipeCategory.MISC, MIItem.QUANTUM_CIRCUIT) + .pattern("PCP") + .pattern("QbQ") + .pattern("PCP") + .define('P', MIItem.PROCESSING_UNIT) + .define('C', MIItem.COOLING_CELL) + .define('Q', MIItem.QUBIT) + .define('b', MIItem.QUANTUM_CIRCUIT_BOARD) + .unlockedBy("has_quantum_circuit", has(MIItem.QUANTUM_CIRCUIT_BOARD)) + .save(assemblerExportOutput, key("electric_age/circuit/craft/quantum_circuit")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 1000) + .itemIn(MIBlock.QUANTUM_MACHINE_HULL) + .itemIn(MIItem.SINGULARITY) + .itemIn(MIItem.QUANTUM_CIRCUIT, 2) + .itemIn(partIngredient(MIMaterials.IRIDIUM, MIParts.PLATE), 16) + .itemIn(MIItem.LARGE_ADVANCED_MOTOR, 8) + .itemIn(MIMaterials.TITANIUM.getPart(MIParts.BARREL)) + .itemOut(MIMaterials.IRIDIUM.getPart(MIParts.BARREL)) + .save(output, key("electric_age/blocks/assembler/quantum_barrel")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 1000) + .itemIn(MIBlock.QUANTUM_MACHINE_HULL) + .itemIn(MIItem.SINGULARITY) + .itemIn(MIItem.QUANTUM_CIRCUIT, 2) + .itemIn(partIngredient(MIMaterials.IRIDIUM, MIParts.PLATE), 16) + .itemIn(MIItem.LARGE_ADVANCED_PUMP, 8) + .itemIn(MIMaterials.TITANIUM.getPart(MIParts.TANK)) + .itemOut(MIMaterials.IRIDIUM.getPart(MIParts.TANK)) + .save(output, key("electric_age/blocks/assembler/quantum_tank")); + } + + private void fusionReactorRecipes() { + machine(MIMachineRecipeTypes.FUSION_REACTOR, 16000, 1200) + .fluidIn(MIFluids.DEUTERIUM, 1000) + .fluidIn(MIFluids.DEUTERIUM, 1000) + .fluidOut(MIFluids.HELIUM_PLASMA, 500) + .fluidOut(MIFluids.TRITIUM, 500) + .save(output, key("fusion_reactor/deuterium_deuterium")); + machine(MIMachineRecipeTypes.FUSION_REACTOR, 16000, 900) + .fluidIn(MIFluids.DEUTERIUM, 1000) + .fluidIn(MIFluids.TRITIUM, 1000) + .fluidOut(MIFluids.HELIUM_PLASMA, 1000) + .fluidOut(MIFluids.HYDROGEN, 1000) + .save(output, key("fusion_reactor/deuterium_tritium")); + machine(MIMachineRecipeTypes.FUSION_REACTOR, 16000, 600) + .fluidIn(MIFluids.HELIUM_3, 1000) + .fluidIn(MIFluids.HELIUM_3, 1000) + .fluidOut(MIFluids.HELIUM_PLASMA, 1000) + .fluidOut(MIFluids.HYDROGEN, 2000) + .save(output, key("fusion_reactor/helium_helium")); + machine(MIMachineRecipeTypes.FUSION_REACTOR, 16000, 300) + .fluidIn(MIFluids.HELIUM_3, 1000) + .fluidIn(MIFluids.TRITIUM, 1000) + .fluidOut(MIFluids.HELIUM_PLASMA, 1000) + .fluidOut(MIFluids.DEUTERIUM, 1000) + .fluidOut(MIFluids.HYDROGEN, 1000) + .save(output, key("fusion_reactor/helium_tritium")); + } + + private void materialsRecipes() { + shapeless(RecipeCategory.MISC, MIMaterials.BRONZE.getPart(MIParts.DUST), 3) + .requires(partIngredient(MIMaterials.COPPER, MIParts.DUST), 3) + .requires(partIngredient(MIMaterials.TIN, MIParts.DUST)) + .unlockedBy("has_tin", hasPartTag(MIMaterials.TIN, MIParts.INGOT)) + .save(output, key("materials/bronze_dust")); + shapeless(RecipeCategory.MISC, MIMaterials.BRONZE.getPart(MIParts.TINY_DUST), 3) + .requires(partIngredient(MIMaterials.COPPER, MIParts.TINY_DUST), 3) + .requires(partIngredient(MIMaterials.TIN, MIParts.TINY_DUST)) + .unlockedBy("has_tin", hasPartTag(MIMaterials.TIN, MIParts.INGOT)) + .save(output, key("materials/bronze_tiny_dust")); + shaped(RecipeCategory.MISC, MIBlock.FIRE_CLAY_BRICKS, 1) + .pattern("TT") + .pattern("TT") + .define('T', MIMaterials.FIRE_CLAY.getPart(MIParts.INGOT)) + .unlockedBy("has_ingredient", has(MIMaterials.FIRE_CLAY.getPart(MIParts.INGOT))) + .save(output, key("materials/fire_clay_bricks")); + shaped(RecipeCategory.MISC, MIMaterials.FIRE_CLAY.getPart(MIParts.DUST), 3) + .pattern("TC") + .pattern("TC") + .define('C', MIMaterials.BRICK.getPart(MIParts.DUST)) + .define('T', Items.CLAY_BALL) + .unlockedBy("TODO", has(TODO)) + .save(output, key("materials/fire_clay_dust")); + shapeless(RecipeCategory.MISC, MIItem.UNCOOKED_STEEL_DUST, 7) + .requires(partIngredient(MIMaterials.IRON, MIParts.DUST), 7) + .requires(partIngredient(MIMaterials.COKE, MIParts.DUST), 2) + .unlockedBy("has_coke", has(MIMaterials.COKE.getPart(MIParts.GEM))) + .unlockedBy("has_coke_dust", hasPartTag(MIMaterials.COKE, MIParts.DUST)) + .save(output, key("materials/uncooked_steel_dust")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 600) + .itemIn(MIBlock.INDUSTRIAL_TNT, 6) + .itemIn(MIMaterials.PLUTONIUM.getPart(MIParts.INGOT), 4) + .itemIn(MIItem.PROCESSING_UNIT, 2) + .itemIn(MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.PLATE), 4) + .fluidIn(MIFluids.TRITIUM, 50) + .fluidIn(MIFluids.DEUTERIUM, 100) + .itemOut(MIBlock.NUKE, 2) + .save(output, key("materials/assembler/nuke")); + machine(MIMachineRecipeTypes.ASSEMBLER, 32, 600) + .itemIn(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.WIRE), 3) + .itemIn(MIItem.COOLING_CELL, 2) + .fluidIn(MIFluids.POLYVINYL_CHLORIDE, 1000) + .itemOut(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE), 6) + .save(output, key("materials/assembler/superconductor_cable")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 64, 600) + .itemIn(partIngredient(MIMaterials.COPPER, MIParts.DUST)) + .fluidIn(MIFluids.OXYGEN, 250) + .itemOut(MIMaterials.ANNEALED_COPPER.getPart(MIParts.HOT_INGOT)) + .save(output, key("materials/blast_furnace/annealed_copper")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 32, 2000) + .itemIn(partIngredient(MIMaterials.BAUXITE, MIParts.BLOCK)) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.INGOT)) + .save(output, key("materials/blast_furnace/bauxite_to_aluminum_ingot")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 32, 200) + .itemIn(partIngredient(MIMaterials.BAUXITE, MIParts.DUST)) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.NUGGET)) + .save(output, key("materials/blast_furnace/bauxite_to_aluminum_nugget")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 4, 100) + .itemIn(Items.REDSTONE) + .fluidOut(MIFluids.MOLTEN_REDSTONE, 90) + .save(output, key("materials/blast_furnace/molten_redstone")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 2, 200) + .fluidIn(MIFluids.RAW_SYNTHETIC_OIL, 100) + .fluidOut(MIFluids.SYNTHETIC_OIL, 100) + .save(output, key("materials/blast_furnace/raw_oil_to_oil")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 32, 400) + .itemIn(partIngredient(MIMaterials.QUARTZ, MIParts.DUST)) + .itemIn(MIMaterials.COKE.getPart(MIParts.DUST)) + .itemOut(MIMaterials.SILICON.getPart(MIParts.DUST)) + .save(output, key("materials/blast_furnace/silicium_from_quartz")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 32, 400) + .itemIn(partIngredient(MIMaterials.QUARTZ, MIParts.DUST), 2) + .itemIn(MIMaterials.CARBON.getPart(MIParts.DUST)) + .itemOut(MIMaterials.SILICON.getPart(MIParts.DUST), 2) + .save(output, key("materials/blast_furnace/silicium_from_quartz_with_carbon")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 4, 300) + .itemIn(partIngredient(MIMaterials.SOLDERING_ALLOY, MIParts.DUST)) + .fluidOut(MIFluids.SOLDERING_ALLOY, 90) + .save(output, key("materials/blast_furnace/soldering_alloy")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 4, 60) + .itemIn(partIngredient(MIMaterials.SOLDERING_ALLOY, MIParts.TINY_DUST)) + .fluidOut(MIFluids.SOLDERING_ALLOY, 10) + .save(output, key("materials/blast_furnace/soldering_alloy_tiny_dust")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 2, 600) + .itemIn(MIItem.UNCOOKED_STEEL_DUST) + .itemOut(MIMaterials.STEEL.getPart(MIParts.INGOT)) + .save(output, key("materials/blast_furnace/steel")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 16, 400) + .itemIn(MIMaterials.CARBON.getPart(MIParts.DUST)) + .itemIn(partIngredient(MIMaterials.IRON, MIParts.DUST), 4) + .itemOut(MIMaterials.STEEL.getPart(MIParts.INGOT), 5) + .save(output, key("materials/blast_furnace/steel_with_carbon")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 128, 1200) + .itemIn(partIngredient(MIMaterials.SUPERCONDUCTOR, MIParts.DUST)) + .itemOut(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.HOT_INGOT)) + .save(output, key("materials/blast_furnace/superconductor")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 128, 400) + .itemIn(partIngredient(MIMaterials.TITANIUM, MIParts.RAW_METAL), 3) + .fluidIn(MIFluids.MANGANESE_SULFURIC_SOLUTION, 3000) + .itemOut(MIMaterials.TITANIUM.getPart(MIParts.HOT_INGOT), 4) + .fluidOut(MIFluids.MANGANESE_SULFURIC_SOLUTION, 2500) + .save(output, key("materials/blast_furnace/titanium_from_raw")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 16, 400) + .itemIn(partIngredient(MIMaterials.COAL, MIParts.DUST)) + .itemOut(MIMaterials.CARBON.getPart(MIParts.DUST)) + .save(output, key("materials/centrifuge/carbon")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 16, 2400) + .itemIn(partIngredient(MIMaterials.RUBY, MIParts.DUST), 6) + .itemOut(MIMaterials.CHROMIUM.getPart(MIParts.CRUSHED_DUST)) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.DUST), 2) + .save(output, key("materials/centrifuge/chromium_crushed_dust")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 1200) + .fluidIn(MIFluids.HYDROGEN, 1000) + .fluidOut(MIFluids.DEUTERIUM, 20) + .fluidOut(MIFluids.TRITIUM, 1) + .save(output, key("materials/centrifuge/deuterium")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 8, 300) + .itemIn(Items.GRAVEL) + .itemOut(Items.FLINT, 2) + .save(output, key("materials/centrifuge/flint")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 1200) + .fluidIn(Fluids.WATER, 1000) + .fluidOut(MIFluids.HEAVY_WATER, 20) + .save(output, key("materials/centrifuge/heavy_water")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 2000) + .fluidIn(MIFluids.HELIUM, 1000) + .fluidOut(MIFluids.HELIUM_3, 5) + .save(output, key("materials/centrifuge/helium_3")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 100) + .itemIn(partIngredient(MIMaterials.LIGNITE_COAL, MIParts.DUST), 27) + .itemOut(MIMaterials.COAL.getPart(MIParts.DUST), 10) + .save(output, key("materials/centrifuge/lignite_coal")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 24, 600) + .fluidIn(MIFluids.LIQUID_AIR, 3000) + .fluidOut(MIFluids.OXYGEN, 650) + .fluidOut(MIFluids.NITROGEN, 2315) + .fluidOut(MIFluids.ARGON, 35) + .save(output, key("materials/centrifuge/liquid_air")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 8, 1200) + .itemIn(Items.RAW_IRON, 6) + .itemOut(MIMaterials.IRON.getPart(MIParts.DUST), 8) + .itemOut(MIMaterials.MANGANESE.getPart(MIParts.CRUSHED_DUST)) + .save(output, key("materials/centrifuge/manganese_crushed_dust")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 10, 2400) + .itemIn(partIngredient(MIMaterials.MONAZITE, MIParts.DUST), 9) + .itemOut(MIMaterials.NEODYMIUM.getPart(MIParts.DUST), 3) + .itemOut(MIMaterials.YTTRIUM.getPart(MIParts.DUST), 3) + .itemOut(MIMaterials.CADMIUM.getPart(MIParts.DUST), 3) + .fluidOut(MIFluids.HELIUM, 300, 0.5f) + .save(output, key("materials/centrifuge/mozanite_dust")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 10, 240) + .itemIn(partIngredient(MIMaterials.MONAZITE, MIParts.TINY_DUST), 9) + .itemOut(MIMaterials.NEODYMIUM.getPart(MIParts.TINY_DUST), 3) + .itemOut(MIMaterials.YTTRIUM.getPart(MIParts.TINY_DUST), 3) + .itemOut(MIMaterials.CADMIUM.getPart(MIParts.TINY_DUST), 3) + .save(output, key("materials/centrifuge/mozanite_tiny_dust")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 8, 1200) + .fluidIn(MIFluids.PLATINUM_SULFURIC_SOLUTION, 1000) + .itemOut(MIMaterials.IRIDIUM.getPart(MIParts.TINY_DUST), 1, 0.05f) + .fluidOut(MIFluids.PURIFIED_PLATINUM_SULFURIC_SOLUTION, 1000) + .save(output, key("materials/centrifuge/purified_platinum_sulfuric_solution")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 8, 1200) + .itemIn(Items.REDSTONE, 10) + .itemOut(MIMaterials.IRON.getPart(MIParts.DUST), 5) + .itemOut(MIMaterials.RUBY.getPart(MIParts.DUST)) + .itemOut(MIMaterials.QUARTZ.getPart(MIParts.DUST)) + .itemOut(MIMaterials.NEODYMIUM.getPart(MIParts.TINY_DUST), 1, 0.5f) + .save(output, key("materials/centrifuge/ruby_dust")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 64, 6000) + .itemIn(partIngredient(MIMaterials.URANIUM, MIParts.DUST), 9) + .itemOut(MIMaterials.URANIUM_235.getPart(MIParts.TINY_DUST)) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 64) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 16) + .fluidOut(MIFluids.HELIUM, 150, 0.5f) + .save(output, key("materials/centrifuge/uranium")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 8, 200) + .fluidIn(MIFluids.NAPHTHA, 200) + .itemOut(MIItem.WAX) + .fluidOut(MIFluids.LUBRICANT, 150) + .save(output, key("materials/centrifuge/wax")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 200) + .itemIn(MIMaterials.CHROMIUM.getPart(MIParts.CRUSHED_DUST)) + .fluidIn(MIFluids.HYDROCHLORIC_ACID, 9000) + .fluidOut(MIFluids.CHROMIUM_HYDROCHLORIC_SOLUTION, 9000) + .save(output, key("materials/chemical_reactor/chromium_hydrochloric_solution")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 200) + .fluidIn(MIFluids.OXYGEN, 1000) + .fluidIn(MIFluids.DEUTERIUM, 2000) + .fluidOut(MIFluids.HEAVY_WATER, 3000) + .save(output, key("materials/chemical_reactor/heavy_water")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) + .fluidIn(MIFluids.HYDROGEN, 1000) + .fluidIn(MIFluids.CHLORINE, 1000) + .fluidOut(MIFluids.HYDROCHLORIC_ACID, 2000) + .save(output, key("materials/chemical_reactor/hydrochloric_acid")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 200) + .itemIn(MIMaterials.MANGANESE.getPart(MIParts.CRUSHED_DUST)) + .fluidIn(MIFluids.SULFURIC_ACID, 9000) + .fluidOut(MIFluids.MANGANESE_SULFURIC_SOLUTION, 9000) + .save(output, key("materials/chemical_reactor/manganese_sulfuric_solution")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 200) + .itemIn(partIngredient(MIMaterials.PLATINUM, MIParts.RAW_METAL)) + .fluidIn(MIFluids.SULFURIC_ACID, 9000) + .fluidOut(MIFluids.PLATINUM_SULFURIC_SOLUTION, 9000) + .save(output, key("materials/chemical_reactor/platinum_sulfuric_solution")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 200) + .itemIn(partIngredient(MIMaterials.SODIUM, MIParts.DUST)) + .fluidIn(MIFluids.OXYGEN, 1000) + .fluidIn(MIFluids.HYDROGEN, 1000) + .fluidOut(MIFluids.SODIUM_HYDROXIDE, 2000) + .save(output, key("materials/chemical_reactor/sodium_hydroxide")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 200) + .itemIn(partIngredient(MIMaterials.SULFUR, MIParts.DUST)) + .fluidIn(MIFluids.OXYGEN, 200) + .fluidIn(Fluids.WATER, 200) + .fluidOut(MIFluids.SULFURIC_ACID, 500) + .save(output, key("materials/chemical_reactor/sulfuric_acid")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 200) + .fluidIn(MIFluids.OXYGEN, 1000) + .fluidIn(MIFluids.HYDROGEN, 2000) + .fluidOut(Fluids.WATER, 3000) + .save(output, key("materials/chemical_reactor/water")); + machine(MIMachineRecipeTypes.COKE_OVEN, 2, 600) + .itemIn(Items.COAL) + .itemOut(MIMaterials.COKE.getPart(MIParts.GEM)) + .fluidOut(MIFluids.CREOSOTE, 500, 0.5f) + .save(output, key("materials/coke_oven/coke")); + machine(MIMachineRecipeTypes.COKE_OVEN, 2, 600) + .itemIn(partIngredient(MIMaterials.COAL, MIParts.DUST)) + .itemOut(MIMaterials.COKE.getPart(MIParts.DUST)) + .fluidOut(MIFluids.CREOSOTE, 500, 0.5f) + .save(output, key("materials/coke_oven/coke_dust")); + machine(MIMachineRecipeTypes.COMPRESSOR, 32, 600) + .itemIn(MIItem.MIXED_INGOT_BLASTPROOF, 2) + .itemOut(MIMaterials.BLASTPROOF_ALLOY.getPart(MIParts.PLATE)) + .save(output, key("materials/compressor/blastproof_alloy_plate")); + machine(MIMachineRecipeTypes.COMPRESSOR, 32, 2400) + .itemIn(partIngredient(MIMaterials.TUNGSTEN, MIParts.TINY_DUST)) + .itemOut(MIMaterials.TUNGSTEN.getPart(MIParts.NUGGET)) + .save(output, key("materials/compressor/tungsten_tiny_dust_to_ingot")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 32, 1200) + .itemIn(partIngredient(MIMaterials.BAUXITE, MIParts.DUST), 10) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.DUST), 4) + .itemOut(MIMaterials.TITANIUM.getPart(MIParts.TINY_DUST), 3) + .fluidOut(MIFluids.OXYGEN, 2000, 0.5f) + .save(output, key("materials/electrolyzer/bauxite")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 32, 400) + .itemIn(partIngredient(MIMaterials.EMERALD, MIParts.DUST), 23) + .itemOut(MIMaterials.BERYLLIUM.getPart(MIParts.DUST), 3) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.DUST), 2) + .itemOut(MIMaterials.SILICON.getPart(MIParts.DUST), 6) + .fluidOut(MIFluids.OXYGEN, 3000) + .save(output, key("materials/electrolyzer/beryllium_dust")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 16, 400) + .fluidIn(MIFluids.CHROMIUM_HYDROCHLORIC_SOLUTION, 1000) + .itemOut(MIMaterials.CHROMIUM.getPart(MIParts.TINY_DUST), 3) + .fluidOut(MIFluids.HYDROGEN, 450) + .fluidOut(MIFluids.CHLORINE, 450) + .save(output, key("materials/electrolyzer/chromium_tiny_dust")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 8, 600) + .fluidIn(MIFluids.HEAVY_WATER, 3000) + .fluidOut(MIFluids.DEUTERIUM, 2000) + .fluidOut(MIFluids.OXYGEN, 1000) + .save(output, key("materials/electrolyzer/heavy_water")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 32, 2400) + .itemIn(partIngredient(MIMaterials.LAPIS, MIParts.DUST), 18) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.DUST), 3) + .itemOut(MIMaterials.SODIUM.getPart(MIParts.DUST), 2) + .itemOut(MIMaterials.SILICON.getPart(MIParts.DUST)) + .fluidOut(MIFluids.OXYGEN, 2500, 0.5f) + .save(output, key("materials/electrolyzer/lapis")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 16, 400) + .fluidIn(MIFluids.MANGANESE_SULFURIC_SOLUTION, 1000) + .itemOut(MIMaterials.MANGANESE.getPart(MIParts.TINY_DUST), 3) + .fluidOut(MIFluids.SULFURIC_ACID, 900) + .save(output, key("materials/electrolyzer/manganese_tiny_dust")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 32, 600) + .fluidIn(MIFluids.PURIFIED_PLATINUM_SULFURIC_SOLUTION, 1000) + .itemOut(MIMaterials.PLATINUM.getPart(MIParts.TINY_DUST), 3) + .fluidOut(MIFluids.SULFURIC_ACID, 900) + .save(output, key("materials/electrolyzer/platinum_tiny_dust")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 8, 400) + .itemIn(partIngredient(MIMaterials.SALT, MIParts.DUST), 2) + .itemOut(MIMaterials.SODIUM.getPart(MIParts.DUST)) + .fluidOut(MIFluids.CHLORINE, 125) + .save(output, key("materials/electrolyzer/salt_electrolysis")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 32, 300) + .fluidIn(MIFluids.SULFURIC_ACID, 500) + .itemOut(MIMaterials.SULFUR.getPart(MIParts.DUST)) + .fluidOut(MIFluids.OXYGEN, 200) + .fluidOut(Fluids.WATER, 200) + .save(output, key("materials/electrolyzer/sulfuric_acid")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 40, 2500) + .itemIn(MIItem.SINGULARITY, 1, 0.0f) + .fluidOut(MIFluids.UU_MATTER, 1) + .save(output, key("materials/electrolyzer/uu_matter")); + machine(MIMachineRecipeTypes.ELECTROLYZER, 8, 600) + .fluidIn(Fluids.WATER, 3000) + .fluidOut(MIFluids.HYDROGEN, 2000) + .fluidOut(MIFluids.OXYGEN, 1000) + .save(output, key("materials/electrolyzer/water")); + forgeHammer(Items.BRICK, new ItemStackTemplate(MIMaterials.BRICK.getPartItem(MIParts.TINY_DUST), 3), 0) + .save(output, key("materials/forge_hammer/brick_dust")); + forgeHammer(Items.BRICK, MIMaterials.BRICK.getPart(MIParts.DUST), 20) + .save(output, key("materials/forge_hammer/brick_dust_with_tool")); + forgeHammer(Tags.Items.ORES_COPPER, new ItemStackTemplate(MIMaterials.COPPER.getPartItem(MIParts.DUST), 12), 60) + .save(output, key("materials/forge_hammer/copper_ore_to_dust_with_tool")); + forgeHammer(Tags.Items.ORES_COPPER, new ItemStackTemplate(Items.RAW_COPPER, 5), 0) + .save(output, key("materials/forge_hammer/copper_ore_to_raw")); + forgeHammer(Tags.Items.ORES_COPPER, new ItemStackTemplate(Items.RAW_COPPER, 8), 20) + .save(output, key("materials/forge_hammer/copper_ore_to_raw_with_tool")); + machine(MIMachineRecipeTypes.HEAT_EXCHANGER, 2, 400) + .fluidIn(Fluids.LAVA, 10) + .fluidIn(Fluids.WATER, 500) + .itemOut(Items.OBSIDIAN, 1, 0.01f) + .fluidOut(MIFluids.STEAM, 8000) + .save(output, key("materials/heat_exchanger/lava")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(partIngredient(MIMaterials.BERYLLIUM, MIParts.TINY_DUST), 9) + .itemIn(partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.NUGGET)) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(MIMaterials.BERYLLIUM.getPart(MIParts.INGOT)) + .save(output, key("materials/implosion_compressor/beryllium")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(MIItem.MIXED_INGOT_BLASTPROOF) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(MIMaterials.BLASTPROOF_ALLOY.getPart(MIParts.INGOT), 3) + .save(output, key("materials/implosion_compressor/blastproof_alloy_plate")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(partIngredient(MIMaterials.DIAMOND, MIParts.DUST)) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(Items.DIAMOND) + .save(output, key("materials/implosion_compressor/diamond")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(partIngredient(MIMaterials.EMERALD, MIParts.DUST)) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(Items.EMERALD) + .save(output, key("materials/implosion_compressor/emerald")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(MIItem.MIXED_INGOT_IRIDIUM) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(MIMaterials.IRIDIUM.getPart(MIParts.PLATE)) + .save(output, key("materials/implosion_compressor/iridium_plate")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(MIItem.MIXED_PLATE_NUCLEAR) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(MIMaterials.NUCLEAR_ALLOY.getPart(MIParts.PLATE), 3) + .save(output, key("materials/implosion_compressor/nuclear_alloy_plate")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(partIngredient(MIMaterials.TUNGSTEN, MIParts.TINY_DUST), 9) + .itemIn(partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.NUGGET)) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(MIMaterials.TUNGSTEN.getPart(MIParts.INGOT)) + .save(output, key("materials/implosion_compressor/tungsten")); + machine(MIMachineRecipeTypes.MACERATOR, 2, 200) + .itemIn(Items.BRICKS) + .itemOut(MIMaterials.BRICK.getPart(MIParts.DUST), 4) + .save(output, key("materials/macerator/brick_dust_from_block")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(ItemTags.TERRACOTTA) + .itemOut(MIMaterials.BRICK.getPart(MIParts.DUST), 4) + .save(output, key("materials/macerator/brick_dust_from_terracotta")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(partIngredient(MIMaterials.COPPER, MIParts.ORE)) + .itemOut(Items.RAW_COPPER, 8) + .save(output, key("materials/macerator/copper_ore_to_raw")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(partIngredient(MIMaterials.LAPIS, MIParts.ORE)) + .itemOut(MIMaterials.LAPIS.getPart(MIParts.CRUSHED_DUST), 16) + .save(output, key("materials/macerator/lapis_ore_to_crushed")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(partIngredient(MIMaterials.LEAD, MIParts.RAW_METAL)) + .itemOut(MIMaterials.LEAD.getPart(MIParts.DUST)) + .itemOut(MIMaterials.SILVER.getPart(MIParts.RAW_METAL), 1, 0.5f) + .itemOut(MIMaterials.LEAD.getPart(MIParts.DUST), 1, 0.5f) + .save(output, key("materials/macerator/lead_crushed_to_dust")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(MIMaterials.LIGNITE_COAL.getPart(MIParts.CRUSHED_DUST)) + .itemOut(MIMaterials.LIGNITE_COAL.getPart(MIParts.DUST)) + .itemOut(MIMaterials.LIGNITE_COAL.getPart(MIParts.DUST), 1, 0.5f) + .itemOut(MIMaterials.SULFUR.getPart(MIParts.DUST), 1, 0.5f) + .save(output, key("materials/macerator/lignite_coal_crushed_to_dust")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(partIngredient(MIMaterials.QUARTZ, MIParts.ORE)) + .itemOut(MIMaterials.QUARTZ.getPart(MIParts.CRUSHED_DUST), 4) + .save(output, key("materials/macerator/quartz_ore_to_crushed")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(partIngredient(MIMaterials.REDSTONE, MIParts.ORE)) + .itemOut(MIMaterials.REDSTONE.getPart(MIParts.CRUSHED_DUST), 6) + .save(output, key("materials/macerator/redstone_ore_to_crushed")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(ItemTags.LOGS) + .itemOut(MIItem.WOOD_PULP, 12) + .save(output, key("materials/macerator/wood_pulp")); + machine(MIMachineRecipeTypes.MIXER, 2, 400) + .itemIn(MIMaterials.CARBON.getPart(MIParts.DUST)) + .fluidIn(Fluids.WATER, 100) + .fluidOut(MIFluids.RAW_SYNTHETIC_OIL, 200) + .save(output, key("materials/mixer/carbon_dust_to_raw_oil")); + machine(MIMachineRecipeTypes.MIXER, 2, 400) + .itemIn(MIMaterials.COKE.getPart(MIParts.DUST)) + .fluidIn(Fluids.WATER, 100) + .fluidOut(MIFluids.RAW_SYNTHETIC_OIL, 200) + .save(output, key("materials/mixer/coke_to_raw_oil")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(MIMaterials.BRICK.getPart(MIParts.DUST), 2) + .itemIn(Items.CLAY_BALL, 2) + .itemOut(MIMaterials.FIRE_CLAY.getPart(MIParts.DUST), 4) + .save(output, key("materials/mixer/fire_clay_dust")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(MIMaterials.COKE.getPart(MIParts.DUST)) + .itemIn(partIngredient(MIMaterials.SULFUR, MIParts.DUST)) + .itemOut(Items.GUNPOWDER, 2) + .save(output, key("materials/mixer/gunpowder")); + machine(MIMachineRecipeTypes.MIXER, 16, 200) + .itemIn(ItemTags.SAND, 4) + .itemIn(Items.FLINT, 3) + .fluidIn(MIFluids.TOLUENE, 250) + .fluidIn(MIFluids.NITROGEN, 1000) + .itemOut(MIBlock.INDUSTRIAL_TNT, 4) + .save(output, key("materials/mixer/itnt")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.REDSTONE) + .fluidIn(MIFluids.CREOSOTE, 500) + .fluidOut(MIFluids.LUBRICANT, 500) + .save(output, key("materials/mixer/lubricant")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.REDSTONE) + .fluidIn(MIFluids.NAPHTHA, 500) + .fluidOut(MIFluids.LUBRICANT, 500) + .save(output, key("materials/mixer/lubricant_oil")); + machine(MIMachineRecipeTypes.MIXER, 4, 300) + .itemIn(partIngredient(MIMaterials.SULFUR, MIParts.DUST)) + .fluidIn(MIFluids.SYNTHETIC_OIL, 1000) + .fluidOut(MIFluids.SYNTHETIC_RUBBER, 1000) + .save(output, key("materials/mixer/oil_to_rubber")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.PAPER) + .fluidIn(MIFluids.SYNTHETIC_OIL, 100) + .itemOut(MIItem.RUBBER_SHEET, 2) + .save(output, key("materials/mixer/oil_to_rubber_sheet")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.PAPER) + .fluidIn(MIFluids.SYNTHETIC_RUBBER, 100) + .itemOut(MIItem.RUBBER_SHEET, 12) + .save(output, key("materials/mixer/rubber_sheet_from_synthetic")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(partIngredient(MIMaterials.IRON, MIParts.DUST), 7) + .itemIn(MIMaterials.COKE.getPart(MIParts.DUST), 2) + .itemOut(MIItem.UNCOOKED_STEEL_DUST, 9) + .save(output, key("materials/mixer/uncooked_steel_dust")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(MIMaterials.FIRE_CLAY.getPart(MIParts.INGOT), 4) + .itemOut(MIBlock.FIRE_CLAY_BRICKS) + .save(output, key("materials/packer/fire_bricks")); + machine(MIMachineRecipeTypes.PACKER, 2, 200) + .itemIn(partIngredient(MIMaterials.TUNGSTEN, MIParts.INGOT)) + .itemIn(partIngredient(MIMaterials.TITANIUM, MIParts.INGOT)) + .itemIn(partIngredient(MIMaterials.STAINLESS_STEEL, MIParts.INGOT)) + .itemOut(MIItem.MIXED_INGOT_BLASTPROOF) + .save(output, key("materials/packer/mixed_ingot_blastproof")); + machine(MIMachineRecipeTypes.PACKER, 2, 200) + .itemIn(partIngredient(MIMaterials.BLASTPROOF_ALLOY, MIParts.INGOT)) + .itemIn(partIngredient(MIMaterials.IRIDIUM, MIParts.INGOT)) + .itemIn(partIngredient(MIMaterials.BLASTPROOF_ALLOY, MIParts.INGOT)) + .itemOut(MIItem.MIXED_INGOT_IRIDIUM) + .save(output, key("materials/packer/mixed_ingot_iridium")); + machine(MIMachineRecipeTypes.PACKER, 2, 200) + .itemIn(MIMaterials.BLASTPROOF_ALLOY.getPart(MIParts.PLATE)) + .itemIn(partIngredient(MIMaterials.BERYLLIUM, MIParts.PLATE)) + .itemIn(partIngredient(MIMaterials.CADMIUM, MIParts.PLATE)) + .itemOut(MIItem.MIXED_PLATE_NUCLEAR) + .save(output, key("materials/packer/mixed_plate_nuclear")); + machine(MIMachineRecipeTypes.PRESSURIZER, 8, 200) + .itemIn(MIItem.AIR_INTAKE, 1, 0.0f) + .fluidOut(MIFluids.LIQUID_AIR, 1000) + .save(output, key("materials/pressurizer/liquid_air")); + machine(MIMachineRecipeTypes.VACUUM_FREEZER, 256, 250) + .fluidIn(MIFluids.ARGON, 140) + .fluidIn(MIFluids.HELIUM, 60) + .fluidOut(MIFluids.CRYOFLUID, 200) + .save(output, key("materials/vacuum_freezer/cryofluid")); + machine(MIMachineRecipeTypes.VACUUM_FREEZER, 32, 200) + .itemIn(MIItem.AIR_INTAKE, 1, 0.0f) + .fluidOut(MIFluids.LIQUID_AIR, 1000) + .save(output, key("materials/vacuum_freezer/liquid_air")); + machine(MIMachineRecipeTypes.VACUUM_FREEZER, 16, 5) + .fluidIn(MIFluids.MOLTEN_REDSTONE, 90) + .itemOut(Items.REDSTONE) + .save(output, key("materials/vacuum_freezer/redstone")); + machine(MIMachineRecipeTypes.PRESSURIZER) + .fluidIn(MIFluids.HIGH_PRESSURE_HEAVY_WATER, 125) + .fluidOut(MIFluids.HEAVY_WATER, 1000) + .save(output, key("materials/pressurizer/down/heavy_water")); + machine(MIMachineRecipeTypes.PRESSURIZER) + .fluidIn(MIFluids.HIGH_PRESSURE_HEAVY_WATER_STEAM, 125) + .fluidOut(MIFluids.HEAVY_WATER_STEAM, 1000) + .save(output, key("materials/pressurizer/down/heavy_water_steam")); + machine(MIMachineRecipeTypes.PRESSURIZER) + .fluidIn(MIFluids.HIGH_PRESSURE_STEAM, 125) + .fluidOut(MIFluids.STEAM, 1000) + .save(output, key("materials/pressurizer/down/steam")); + machine(MIMachineRecipeTypes.PRESSURIZER) + .fluidIn(MIFluids.HIGH_PRESSURE_WATER, 125) + .fluidOut(Fluids.WATER, 1000) + .save(output, key("materials/pressurizer/down/water")); + machine(MIMachineRecipeTypes.PRESSURIZER, 64, 1200) + .fluidIn(MIFluids.HEAVY_WATER, 1000) + .fluidOut(MIFluids.HIGH_PRESSURE_HEAVY_WATER, 125) + .save(output, key("materials/pressurizer/up/heavy_water")); + machine(MIMachineRecipeTypes.PRESSURIZER, 64, 75) + .fluidIn(MIFluids.HEAVY_WATER_STEAM, 1000) + .fluidOut(MIFluids.HIGH_PRESSURE_HEAVY_WATER_STEAM, 125) + .save(output, key("materials/pressurizer/up/heavy_water_steam")); + machine(MIMachineRecipeTypes.PRESSURIZER, 64, 75) + .fluidIn(MIFluids.STEAM, 1000) + .fluidOut(MIFluids.HIGH_PRESSURE_STEAM, 125) + .save(output, key("materials/pressurizer/up/steam")); + machine(MIMachineRecipeTypes.PRESSURIZER, 64, 1200) + .fluidIn(Fluids.WATER, 1000) + .fluidOut(MIFluids.HIGH_PRESSURE_WATER, 125) + .save(output, key("materials/pressurizer/up/water")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 6000) + .itemIn(MIMaterials.HE_MOX.getPart(MIParts.FUEL_ROD_DEPLETED)) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 36) + .itemOut(MIMaterials.PLUTONIUM.getPart(MIParts.TINY_DUST), 36) + .save(output, key("materials/centrifuge/nuclear_recycling/he_mox_fuel_rod")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 6000) + .itemIn(MIMaterials.HE_URANIUM.getPart(MIParts.FUEL_ROD_DEPLETED)) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 36) + .itemOut(MIMaterials.PLUTONIUM.getPart(MIParts.TINY_DUST), 18) + .itemOut(MIMaterials.URANIUM_235.getPart(MIParts.TINY_DUST), 18) + .save(output, key("materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 6000) + .itemIn(MIMaterials.LE_MOX.getPart(MIParts.FUEL_ROD_DEPLETED)) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 48) + .itemOut(MIMaterials.PLUTONIUM.getPart(MIParts.TINY_DUST), 30) + .save(output, key("materials/centrifuge/nuclear_recycling/le_mox_fuel_rod")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 6000) + .itemIn(MIMaterials.LE_URANIUM.getPart(MIParts.FUEL_ROD_DEPLETED)) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 48) + .itemOut(MIMaterials.PLUTONIUM.getPart(MIParts.TINY_DUST), 24) + .itemOut(MIMaterials.URANIUM_235.getPart(MIParts.TINY_DUST), 6) + .save(output, key("materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 6000) + .itemIn(MIMaterials.URANIUM.getPart(MIParts.FUEL_ROD_DEPLETED)) + .itemOut(MIMaterials.URANIUM_238.getPart(MIParts.TINY_DUST), 53) + .itemOut(MIMaterials.PLUTONIUM.getPart(MIParts.TINY_DUST), 27) + .itemOut(MIMaterials.URANIUM_235.getPart(MIParts.TINY_DUST), 1, 0.66f) + .save(output, key("materials/centrifuge/nuclear_recycling/uranium_fuel_rod")); + } + + private void miscRecipes() { + shaped(RecipeCategory.MISC, MIBlock.FORGE_HAMMER) + .pattern("___") + .pattern(" i ") + .pattern("iii") + .define('_', Items.HEAVY_WEIGHTED_PRESSURE_PLATE) + .define('i', Items.IRON_INGOT) + .unlockedBy("TODO", has(TODO)) + .save(output, key("misc/forge_hammer")); + shaped(RecipeCategory.MISC, MIItem.GUIDEBOOK) + .pattern("ccc") + .pattern("cbc") + .pattern("ccc") + .define('c', partIngredient(MIMaterials.COPPER, MIParts.NUGGET)) + .define('b', Items.BOOK) + .unlockedBy("TODO", has(TODO)) + .save(output, key("misc/guide_book")); + shaped(RecipeCategory.MISC, MIItem.PACKER_BLOCK_TEMPLATE) + .pattern("b") + .pattern("p") + .define('b', Items.BRICKS) + .define('p', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(output, key("misc/packer_block_template")); + shaped(RecipeCategory.MISC, MIItem.PACKER_DOUBLE_INGOT_TEMPLATE) + .pattern("b") + .pattern("p") + .define('b', MIMaterials.IRON.getPart(MIParts.DOUBLE_INGOT)) + .define('p', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(output, key("misc/packer_double_ingot_template")); + shaped(RecipeCategory.MISC, MIBlock.TRASH_CAN) + .pattern("PPP") + .pattern("PLP") + .pattern("PPP") + .define('P', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('L', Items.LAVA_BUCKET) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(output, key("misc/trash_can")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(partIngredient(MIMaterials.STEEL, MIParts.PLATE), 8) + .fluidIn(Fluids.LAVA, 1000) + .itemOut(MIBlock.TRASH_CAN) + .save(output, key("misc/trash_can_assembler")); + } + + private void oilRecipes() { + machine(MIMachineRecipeTypes.OIL_DRILLING_RIG, 8, 200) + .itemIn(MIMaterials.ALUMINUM.getPart(MIParts.DRILL), 1, 0.04f) + .fluidOut(MIFluids.CRUDE_OIL, 500) + .save(output, key("oil/crude_oil")); + shaped(RecipeCategory.MISC, MultiblockMachines.OIL_DRILLING_RIG) + .pattern("LGL") + .pattern("PHP") + .pattern("LpL") + .define('L', MIMaterials.STEEL.getPart(MIParts.LARGE_PLATE)) + .define('G', MIItem.ELECTRONIC_CIRCUIT) + .define('P', MIItem.LARGE_PUMP) + .define('H', MIBlock.ADVANCED_MACHINE_HULL) + .define('p', MITags.FLUID_PIPES) + .unlockedBy("has_hull", has(MIBlock.ADVANCED_MACHINE_HULL)) + .save(assemblerExportOutput, key("oil/oil_drilling_rig")); + machine(MIMachineRecipeTypes.OIL_DRILLING_RIG, 32, 200) + .itemIn(MIMaterials.STAINLESS_STEEL.getPart(MIParts.DRILL), 1, 0.02f) + .fluidOut(MIFluids.SHALE_OIL, 4000) + .save(output, key("oil/shale_oil")); + machine(MIMachineRecipeTypes.OIL_DRILLING_RIG) + .itemIn(MIMaterials.COPPER.getPart(MIParts.DRILL), 1, 0.02f) + .fluidOut(Fluids.WATER, 16000) + .save(output, key("oil/water")); + machine(MIMachineRecipeTypes.BLAST_FURNACE, 32, 50) + .fluidIn(MIFluids.METHANE, 200) + .fluidOut(MIFluids.ACETYLENE, 200) + .save(output, key("oil/blast_furnace/methane_to_acetylene")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 10, 80) + .itemIn(Items.SLIME_BALL, 1, 0.0f) + .fluidIn(MIFluids.ACRYLIC_GLUE, 25) + .itemOut(Items.SLIME_BALL) + .save(output, key("oil/chemical_reactor/acrylic_glue_to_slime")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 12, 200) + .itemIn(partIngredient(MIMaterials.COAL, MIParts.DUST)) + .fluidIn(MIFluids.ACETYLENE, 1000) + .fluidOut(MIFluids.HYDROGEN, 2000) + .save(output, key("oil/chemical_reactor/actylene_to_hydrogen")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 12, 300) + .fluidIn(MIFluids.BENZENE, 750) + .fluidIn(MIFluids.ETHYLENE, 750) + .fluidIn(MIFluids.HYDROCHLORIC_ACID, 100) + .fluidOut(MIFluids.ETHYLBENZENE, 750) + .save(output, key("oil/chemical_reactor/benzene_ethylene_to_ethylbenzene")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 300) + .itemIn(partIngredient(MIMaterials.NICKEL, MIParts.TINY_DUST), 4) + .fluidIn(MIFluids.BENZENE, 500) + .fluidIn(MIFluids.HYDROGEN, 750) + .fluidOut(MIFluids.CAPROLACTAM, 600) + .save(output, key("oil/chemical_reactor/caprolactam")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 300) + .itemIn(partIngredient(MIMaterials.ALUMINUM, MIParts.TINY_DUST)) + .fluidIn(MIFluids.ETHANOL, 750) + .fluidOut(MIFluids.BUTADIENE, 375) + .fluidOut(Fluids.WATER, 750) + .fluidOut(MIFluids.HYDROGEN, 250) + .save(output, key("oil/chemical_reactor/ethanol_to_butadiene")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 20, 300) + .fluidIn(MIFluids.ETHANOL, 500) + .fluidIn(MIFluids.ACRYLIC_ACID, 25) + .fluidOut(MIFluids.DIETHYL_ETHER, 250) + .fluidOut(Fluids.WATER, 250) + .save(output, key("oil/chemical_reactor/ethanol_to_diethyl_ether")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 10, 280) + .itemIn(partIngredient(MIMaterials.SULFUR, MIParts.DUST)) + .fluidIn(MIFluids.ETHANOL, 1000) + .fluidOut(MIFluids.ETHYLENE, 500) + .fluidOut(MIFluids.SULFURIC_ACID, 400) + .save(output, key("oil/chemical_reactor/ethanol_to_ethylene")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 20, 240) + .itemIn(partIngredient(MIMaterials.IRON, MIParts.DUST)) + .fluidIn(MIFluids.ETHYLBENZENE, 1000) + .fluidIn(MIFluids.STEAM, 2000) + .fluidOut(MIFluids.STYRENE, 1000) + .fluidOut(MIFluids.HYDROGEN, 500) + .save(output, key("oil/chemical_reactor/ethylbenzene_to_styrene")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 10, 140) + .fluidIn(MIFluids.ETHYLENE, 200) + .fluidIn(Fluids.WATER, 200) + .fluidIn(MIFluids.SULFURIC_ACID, 35) + .fluidOut(MIFluids.ETHANOL, 200) + .save(output, key("oil/chemical_reactor/ethylene_to_ethanol")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) + .itemIn(Items.STRING, 1, 0.0f) + .fluidIn(MIFluids.NYLON, 20) + .itemOut(Items.STRING) + .save(output, key("oil/chemical_reactor/nylon_to_string")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 12, 300) + .fluidIn(MIFluids.PLANT_OIL, 6000) + .fluidIn(MIFluids.ETHANOL, 400) + .fluidIn(MIFluids.SODIUM_HYDROXIDE, 100) + .fluidOut(MIFluids.RAW_BIODIESEL, 1500) + .save(output, key("oil/chemical_reactor/plant_oil_to_raw_biodiesel")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 10, 240) + .fluidIn(MIFluids.PROPENE, 400) + .fluidIn(MIFluids.OXYGEN, 600) + .fluidOut(MIFluids.ACRYLIC_ACID, 400) + .fluidOut(Fluids.WATER, 400) + .save(output, key("oil/chemical_reactor/propene_to_acrylic_acid")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 200) + .fluidIn(MIFluids.RAW_BIODIESEL, 1000) + .fluidIn(MIFluids.STEAM, 1000) + .fluidOut(MIFluids.BIODIESEL, 700) + .fluidOut(MIFluids.ETHANOL, 250) + .save(output, key("oil/chemical_reactor/raw_biodiesel_to_biodiesel")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 10, 150) + .fluidIn(MIFluids.STYRENE, 500) + .fluidIn(MIFluids.BUTADIENE, 500) + .fluidOut(MIFluids.STYRENE_BUTADIENE, 1000) + .save(output, key("oil/chemical_reactor/styrene_butadiene")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 500) + .fluidIn(MIFluids.ACETYLENE, 1000) + .fluidIn(MIFluids.HYDROCHLORIC_ACID, 1000) + .fluidOut(MIFluids.VINYL_CHLORIDE, 1000) + .save(output, key("oil/chemical_reactor/vinyl_chloride")); + machine(MIMachineRecipeTypes.DISTILLERY, 8, 800) + .fluidIn(MIFluids.SUGAR_SOLUTION, 1000) + .fluidOut(MIFluids.ETHANOL, 10) + .save(output, key("oil/distillation/ethanol_from_sugar")); + machine(MIMachineRecipeTypes.MIXER, 8, 600) + .fluidIn(MIFluids.HEAVY_FUEL, 1000) + .fluidIn(MIFluids.LIGHT_FUEL, 5000) + .fluidOut(MIFluids.DIESEL, 6000) + .save(output, key("oil/mixer/diesel")); + machine(MIMachineRecipeTypes.MIXER, 12, 450) + .fluidIn(MIFluids.BIODIESEL, 2000) + .fluidIn(MIFluids.DIETHYL_ETHER, 250) + .fluidOut(MIFluids.BOOSTED_DIESEL, 1500) + .save(output, key("oil/mixer/diethyl_ether_biodiesel_boost")); + machine(MIMachineRecipeTypes.MIXER, 12, 300) + .fluidIn(MIFluids.DIESEL, 1000) + .fluidIn(MIFluids.DIETHYL_ETHER, 250) + .fluidOut(MIFluids.BOOSTED_DIESEL, 1200) + .save(output, key("oil/mixer/diethyl_ether_diesel_boost")); + machine(MIMachineRecipeTypes.MIXER, 2, 200) + .itemIn(Items.REDSTONE) + .fluidIn(MIFluids.PLANT_OIL, 1000) + .fluidOut(MIFluids.LUBRICANT, 500) + .save(output, key("oil/mixer/lubricant_from_plant_oil")); + machine(MIMachineRecipeTypes.MIXER, 2, 200) + .itemIn(Items.SUGAR, 8) + .fluidIn(Fluids.WATER, 1000) + .fluidOut(MIFluids.SUGAR_SOLUTION, 1000) + .save(output, key("oil/mixer/sugar_solution")); + machine(MIMachineRecipeTypes.VACUUM_FREEZER, 128, 300) + .fluidIn(MIFluids.STYRENE_BUTADIENE_RUBBER, 200) + .itemOut(MIItem.RUBBER_SHEET, 64) + .save(output, key("oil/vacuum_freezer/styrene_butadiene_rubber")); + } + + private void quarryRecipes() { + shaped(RecipeCategory.MISC, MIMaterials.ALUMINUM.getPart(MIParts.DRILL), 4) + .pattern("gpd") + .pattern("mCp") + .pattern("cmg") + .define('d', MIMaterials.ALUMINUM.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.FLUID_PIPES) + .define('m', MIItem.PUMP) + .define('c', MIMaterials.ELECTRUM.getPart(MIParts.CABLE)) + .define('C', MIItem.ELECTRONIC_CIRCUIT) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT)) + .save(assemblerExportOutput, key("quarry/drill/aluminum_drill")); + shaped(RecipeCategory.MISC, MIMaterials.BRONZE.getPart(MIParts.DRILL), 4) + .pattern(" d") + .pattern("gp ") + .pattern("fg ") + .define('d', MIMaterials.BRONZE.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.ITEM_PIPES) + .define('f', MITags.FLUID_PIPES) + .unlockedBy("has_gear", hasPartTag(MIMaterials.IRON, MIParts.GEAR)) + .save(assemblerExportOutput, key("quarry/drill/bronze_drill")); + shaped(RecipeCategory.MISC, MIMaterials.COPPER.getPart(MIParts.DRILL), 4) + .pattern(" d") + .pattern("gp ") + .pattern("fg ") + .define('d', MIMaterials.COPPER.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.ITEM_PIPES) + .define('f', MITags.FLUID_PIPES) + .unlockedBy("has_gear", hasPartTag(MIMaterials.IRON, MIParts.GEAR)) + .save(assemblerExportOutput, key("quarry/drill/copper_drill")); + shaped(RecipeCategory.MISC, MIMaterials.GOLD.getPart(MIParts.DRILL), 4) + .pattern("gpd") + .pattern("mCp") + .pattern("cmg") + .define('d', MIMaterials.GOLD.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.ITEM_PIPES) + .define('m', MIItem.MOTOR) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT)) + .save(assemblerExportOutput, key("quarry/drill/gold_drill")); + shaped(RecipeCategory.MISC, MIMaterials.STAINLESS_STEEL.getPart(MIParts.DRILL), 4) + .pattern("gpd") + .pattern("mCf") + .pattern("cPg") + .define('d', MIMaterials.STAINLESS_STEEL.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.ITEM_PIPES) + .define('f', MITags.FLUID_PIPES) + .define('m', MIItem.ADVANCED_MOTOR) + .define('P', MIItem.ADVANCED_PUMP) + .define('c', MIMaterials.ALUMINUM.getPart(MIParts.CABLE)) + .define('C', MIItem.DIGITAL_CIRCUIT) + .unlockedBy("has_digital_circuit", has(MIItem.DIGITAL_CIRCUIT)) + .save(assemblerExportOutput, key("quarry/drill/stainless_steel_drill")); + shaped(RecipeCategory.MISC, MIMaterials.STEEL.getPart(MIParts.DRILL), 4) + .pattern("gpd") + .pattern("mCp") + .pattern("cmg") + .define('d', MIMaterials.STEEL.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.ITEM_PIPES) + .define('m', MIItem.MOTOR) + .define('c', MIMaterials.TIN.getPart(MIParts.CABLE)) + .define('C', MIItem.ANALOG_CIRCUIT) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT)) + .save(assemblerExportOutput, key("quarry/drill/steel_drill")); + shaped(RecipeCategory.MISC, MIMaterials.TITANIUM.getPart(MIParts.DRILL), 4) + .pattern("gpd") + .pattern("mCp") + .pattern("cmg") + .define('d', MIMaterials.TITANIUM.getPart(MIParts.DRILL_HEAD)) + .define('g', partIngredient(MIMaterials.IRON, MIParts.GEAR)) + .define('p', MITags.ITEM_PIPES) + .define('m', MIItem.LARGE_ADVANCED_MOTOR) + .define('c', MIMaterials.ANNEALED_COPPER.getPart(MIParts.CABLE)) + .define('C', MIItem.PROCESSING_UNIT) + .unlockedBy("has_processing_unit", has(MIItem.PROCESSING_UNIT)) + .save(assemblerExportOutput, key("quarry/drill/titanium_drill")); + } + + private void steamAgeRecipes() { + shaped(RecipeCategory.MISC, miItem("fluid_pipe"), 16) + .pattern("CCC") + .pattern("rPr") + .pattern("CCC") + .define('C', MIMaterials.BRONZE.getPart(MIParts.CURVED_PLATE)) + .define('r', MIMaterials.COPPER.getPart(MIParts.ROTOR)) + .define('P', Items.GLASS_PANE) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("steam_age/fluid_pipe")); + shaped(RecipeCategory.MISC, miItem("item_pipe"), 16) + .pattern("CCC") + .pattern("G G") + .pattern("CCC") + .define('C', MIMaterials.BRONZE.getPart(MIParts.CURVED_PLATE)) + .define('G', partIngredient(MIMaterials.STEEL, MIParts.GEAR)) + .unlockedBy("has_gear", hasPartTag(MIMaterials.STEEL, MIParts.GEAR)) + .save(assemblerExportOutput, key("steam_age/item_pipe")); + shaped(RecipeCategory.MISC, miItem("bronze_boiler"), 1) + .pattern("#T#") + .pattern("#F#") + .pattern("BBB") + .define('#', partIngredient(MIMaterials.BRONZE, MIParts.PLATE)) + .define('T', MIMaterials.BRONZE.getPart(MIParts.TANK)) + .define('B', MIBlock.FIRE_CLAY_BRICKS) + .define('F', Items.FURNACE) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BRONZE, MIParts.PLATE)) + .save(assemblerExportOutput, key("steam_age/bronze/boiler")); + shaped(RecipeCategory.MISC, MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING_PIPE), 2) + .pattern("p p") + .pattern("p#p") + .pattern("p p") + .define('#', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .define('p', MIMaterials.BRONZE.getPart(MIParts.CURVED_PLATE)) + .unlockedBy("has_machine_casing", has(MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/bronze/casing_pipe")); + shaped(RecipeCategory.MISC, miItem("bronze_compressor"), 1) + .pattern("rFr") + .pattern("GCG") + .pattern("ppp") + .define('F', MIBlock.FORGE_HAMMER) + .define('G', partIngredient(MIMaterials.COPPER, MIParts.GEAR)) + .define('C', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('r', partIngredient(MIMaterials.COPPER, MIParts.ROD)) + .unlockedBy("has_machine_casing", has(MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/bronze/compressor")); + shaped(RecipeCategory.MISC, miItem("bronze_cutting_machine"), 1) + .pattern("gdg") + .pattern("GCG") + .pattern("ppp") + .define('d', Items.DIAMOND) + .define('G', partIngredient(MIMaterials.COPPER, MIParts.GEAR)) + .define('C', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('g', Tags.Items.GLASS_BLOCKS) + .unlockedBy("has_machine_casing", has(MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/bronze/cutting_machine")); + shaped(RecipeCategory.MISC, miItem("bronze_furnace"), 1) + .pattern("###") + .pattern("#F#") + .pattern("BBB") + .define('#', partIngredient(MIMaterials.BRONZE, MIParts.PLATE)) + .define('F', Items.FURNACE) + .define('B', MIBlock.FIRE_CLAY_BRICKS) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BRONZE, MIParts.PLATE)) + .save(assemblerExportOutput, key("steam_age/bronze/furnace")); + shaped(RecipeCategory.MISC, miItem("bronze_macerator"), 1) + .pattern("dGd") + .pattern("GCG") + .pattern("ppp") + .define('d', Items.DIAMOND) + .define('G', partIngredient(MIMaterials.COPPER, MIParts.GEAR)) + .define('C', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .unlockedBy("has_machine_casing", has(MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/bronze/macerator")); + shaped(RecipeCategory.MISC, MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .pattern("PPP") + .pattern("PGP") + .pattern("PPP") + .define('P', partIngredient(MIMaterials.BRONZE, MIParts.PLATE)) + .define('G', partIngredient(MIMaterials.BRONZE, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.BRONZE, MIParts.PLATE)) + .save(assemblerExportOutput, key("steam_age/bronze/machine_casing")); + shaped(RecipeCategory.MISC, miItem("bronze_mixer"), 1) + .pattern("gGg") + .pattern("rCr") + .pattern("ppp") + .define('r', MIMaterials.COPPER.getPart(MIParts.ROTOR)) + .define('G', partIngredient(MIMaterials.COPPER, MIParts.GEAR)) + .define('C', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('g', Tags.Items.GLASS_BLOCKS) + .unlockedBy("has_machine_casing", has(MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/bronze/mixer")); + shaped(RecipeCategory.MISC, miItem("bronze_water_pump"), 1) + .pattern("rTr") + .pattern("GCG") + .pattern("ppp") + .define('r', MIMaterials.COPPER.getPart(MIParts.ROTOR)) + .define('C', MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('G', partIngredient(MIMaterials.COPPER, MIParts.GEAR)) + .define('T', MIMaterials.BRONZE.getPart(MIParts.TANK)) + .unlockedBy("has_machine_casing", has(MIMaterials.BRONZE.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/bronze/water_pump")); + shaped(RecipeCategory.MISC, MultiblockMachines.COKE_OVEN, 1) + .pattern("BBB") + .pattern("BFB") + .pattern("BBB") + .define('B', Items.BRICKS) + .define('F', Items.FURNACE) + .unlockedBy("TODO", has(TODO)) + .save(output, key("steam_age/fireclay/coke_oven")); + shaped(RecipeCategory.MISC, MultiblockMachines.STEAM_BLAST_FURNACE, 1) + .pattern("BBB") + .pattern("BFB") + .pattern("BBB") + .define('B', MIBlock.FIRE_CLAY_BRICKS) + .define('F', Items.BLAST_FURNACE) + .unlockedBy("TODO", has(TODO)) + .save(output, key("steam_age/fireclay/steam_blast_furnace")); + shaped(RecipeCategory.MISC, miItem("steel_boiler"), 1) + .pattern("#T#") + .pattern("#F#") + .pattern("BBB") + .define('#', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('T', MIMaterials.STEEL.getPart(MIParts.TANK)) + .define('B', MIBlock.FIRE_CLAY_BRICKS) + .define('F', Items.FURNACE) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("steam_age/steel/boiler")); + shaped(RecipeCategory.MISC, MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING_PIPE), 2) + .pattern("p p") + .pattern("p#p") + .pattern("p p") + .define('#', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('p', MIMaterials.STEEL.getPart(MIParts.CURVED_PLATE)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/steel/casing_pipe")); + shaped(RecipeCategory.MISC, miItem("steel_furnace"), 1) + .pattern("###") + .pattern("#F#") + .pattern("BBB") + .define('#', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('F', Items.FURNACE) + .define('B', MIBlock.FIRE_CLAY_BRICKS) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("steam_age/steel/furnace")); + shaped(RecipeCategory.MISC, MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .pattern("PPP") + .pattern("PGP") + .pattern("PPP") + .define('P', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('G', partIngredient(MIMaterials.STEEL, MIParts.GEAR)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("steam_age/steel/machine_casing")); + shaped(RecipeCategory.MISC, miItem("steel_packer"), 1) + .pattern("PGP") + .pattern("GCG") + .pattern("ppp") + .define('G', partIngredient(MIMaterials.BRONZE, MIParts.GEAR)) + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('P', MITags.ITEM_PIPES) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/steel/packer")); + shaped(RecipeCategory.MISC, MultiblockMachines.STEAM_QUARRY, 1) + .pattern("LpL") + .pattern("GCG") + .pattern("LPL") + .define('L', MIMaterials.STEEL.getPart(MIParts.LARGE_PLATE)) + .define('p', MITags.ITEM_PIPES) + .define('G', partIngredient(MIMaterials.STEEL, MIParts.GEAR)) + .define('P', MIItem.INVAR_ROTARY_BLADE) + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/steel/quarry")); + shaped(RecipeCategory.MISC, MIItem.STEEL_UPGRADE, 2) + .pattern("rRr") + .pattern("GCG") + .pattern("pFp") + .define('p', MITags.FLUID_PIPES) + .define('G', partIngredient(MIMaterials.BRONZE, MIParts.GEAR)) + .define('R', MIMaterials.BRONZE.getPart(MIParts.ROTOR)) + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('r', partIngredient(MIMaterials.BRONZE, MIParts.ROD)) + .define('F', MIBlock.FIRE_CLAY_BRICKS) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/steel/steel_upgrade")); + shaped(RecipeCategory.MISC, miItem("steel_unpacker"), 1) + .pattern("PGP") + .pattern("RCR") + .pattern("ppp") + .define('G', partIngredient(MIMaterials.BRONZE, MIParts.GEAR)) + .define('C', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('P', MITags.ITEM_PIPES) + .define('R', partIngredient(MIMaterials.BRONZE, MIParts.ROD)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/steel/unpacker")); + shaped(RecipeCategory.MISC, miItem("steel_wiremill")) + .pattern("GpG") + .pattern("rHr") + .pattern("GpG") + .define('G', partIngredient(MIMaterials.BRONZE, MIParts.GEAR)) + .define('H', MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING)) + .define('p', MITags.FLUID_PIPES) + .define('r', MIMaterials.BRONZE.getPart(MIParts.ROTOR)) + .unlockedBy("has_machine_casing", has(MIMaterials.STEEL.getPart(MIParts.MACHINE_CASING))) + .save(assemblerExportOutput, key("steam_age/steel/wiremill")); + machine(MIMachineRecipeTypes.PACKER, 2, 200) + .itemIn(Items.FURNACE) + .itemIn(Items.BRICKS, 8) + .itemOut(MultiblockMachines.COKE_OVEN) + .save(output, key("steam_age/fireclay/packer/coke_oven")); + machine(MIMachineRecipeTypes.PACKER, 2, 200) + .itemIn(Items.BLAST_FURNACE) + .itemIn(MIBlock.FIRE_CLAY_BRICKS, 8) + .itemOut(MultiblockMachines.STEAM_BLAST_FURNACE) + .save(output, key("steam_age/fireclay/packer/packer_steam_blast_furnace")); + shaped(RecipeCategory.MISC, miItem("fluid_pipe"), 8) + .pattern("ppp") + .pattern("pbp") + .pattern("ppp") + .define('p', MITags.FLUID_PIPES) + .define('b', Items.WATER_BUCKET) + .unlockedBy("TODO", has(TODO)) + .save(output, key("steam_age/decolor_pipes/craft/eight_fluid")); + shaped(RecipeCategory.MISC, miItem("item_pipe"), 8) + .pattern("ppp") + .pattern("pbp") + .pattern("ppp") + .define('p', MITags.ITEM_PIPES) + .define('b', Items.WATER_BUCKET) + .unlockedBy("TODO", has(TODO)) + .save(output, key("steam_age/decolor_pipes/craft/eight_item")); + shaped(RecipeCategory.MISC, miItem("fluid_pipe")) + .pattern("pb") + .define('p', MITags.FLUID_PIPES) + .define('b', Items.WATER_BUCKET) + .unlockedBy("TODO", has(TODO)) + .save(output, key("steam_age/decolor_pipes/craft/one_fluid")); + shaped(RecipeCategory.MISC, miItem("item_pipe")) + .pattern("pb") + .define('p', MITags.ITEM_PIPES) + .define('b', Items.WATER_BUCKET) + .unlockedBy("TODO", has(TODO)) + .save(output, key("steam_age/decolor_pipes/craft/one_item")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(MITags.FLUID_PIPES) + .fluidIn(Fluids.WATER, 125) + .itemOut(miItem("fluid_pipe")) + .save(output, key("steam_age/decolor_pipes/mixer/fluid")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(MITags.ITEM_PIPES) + .fluidIn(Fluids.WATER, 125) + .itemOut(miItem("item_pipe")) + .save(output, key("steam_age/decolor_pipes/mixer/item")); + } + + private void toolsRecipes() { + shaped(RecipeCategory.MISC, MIItem.CONFIG_CARD) + .pattern("ggg") + .pattern("rcr") + .pattern("ibi") + .define('g', Items.GLASS_PANE) + .define('c', MIItem.CAPACITOR) + .define('r', MIItem.RESISTOR) + .define('b', MIItem.ANALOG_CIRCUIT_BOARD) + .define('i', MIItem.INDUCTOR) + .unlockedBy("has_analog_circuit", has(MIItem.ANALOG_CIRCUIT_BOARD)) + .save(output, key("tools/config_card")); + shaped(RecipeCategory.MISC, MIItem.DIESEL_CHAINSAW) + .pattern(" Rr") + .pattern("MrR") + .pattern("tM ") + .define('M', MIItem.LARGE_MOTOR) + .define('r', MIItem.INVAR_ROTARY_BLADE) + .define('t', MIMaterials.ALUMINUM.getPart(MIParts.TANK)) + .define('R', MIItem.RUBBER_SHEET) + .unlockedBy("TODO", has(TODO)) + .save(output, key("tools/diesel_chainsaw")); + shaped(RecipeCategory.MISC, MIItem.DIESEL_MINING_DRILL) + .pattern("crH") + .pattern("MPr") + .pattern("tMc") + .define('P', MIItem.LARGE_PUMP) + .define('M', MIItem.LARGE_MOTOR) + .define('r', MIItem.INVAR_ROTARY_BLADE) + .define('t', MIMaterials.ALUMINUM.getPart(MIParts.TANK)) + .define('c', MIItem.ELECTRONIC_CIRCUIT) + .define('H', MIMaterials.ALUMINUM.getPart(MIParts.DRILL_HEAD)) + .unlockedBy("has_electronic_circuit", has(MIItem.ELECTRONIC_CIRCUIT)) + .save(output, key("tools/diesel_mining_drill")); + shaped(RecipeCategory.MISC, MIItem.STEAM_MINING_DRILL) + .pattern("fdd") + .pattern("PDd") + .pattern("bPf") + .define('P', MIMaterials.IRON.getPart(MIParts.LARGE_PLATE)) + .define('f', Items.FURNACE) + .define('b', Items.BUCKET) + .define('d', Items.DIAMOND) + .define('D', MIMaterials.COPPER.getPart(MIParts.DRILL_HEAD)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("tools/steam_mining_drill")); + shaped(RecipeCategory.MISC, MIItem.WRENCH) + .pattern("b b") + .pattern("bbb") + .pattern(" b ") + .define('b', partIngredient(MIMaterials.BRONZE, MIParts.PLATE)) + .unlockedBy("has_ingredient", hasPartTag(MIMaterials.BRONZE, MIParts.PLATE)) + .save(output, key("tools/wrench")); + SmithingTransformRecipeBuilder.smithing( + Ingredient.of(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE), + Ingredient.of(MIItem.DIAMOND_HAMMER), + Ingredient.of(Items.NETHERITE_INGOT), + RecipeCategory.TOOLS, + MIItem.NETHERITE_HAMMER.asItem()) + .unlocks("has_diamond_hammer", has(MIItem.DIAMOND_HAMMER)) + .save(output, key("tools/smithing/netherite_hammer")); + } + + private void vanillaRecipes() { + shaped(RecipeCategory.MISC, Items.BLAST_FURNACE, 2) + .pattern("ppp") + .pattern("pfp") + .pattern("sss") + .define('f', Items.FURNACE) + .define('p', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('s', Items.SMOOTH_STONE) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("vanilla_recipes/blast_furnace")); + shaped(RecipeCategory.MISC, Items.CHAINMAIL_BOOTS) + .pattern("x x") + .pattern("x x") + .define('x', MIMaterials.IRON.getPart(MIParts.RING)) + .unlockedBy("has_ingredient", has(MIMaterials.IRON.getPart(MIParts.RING))) + .save(output, key("vanilla_recipes/chainmail_boots")); + shaped(RecipeCategory.MISC, Items.CHAINMAIL_CHESTPLATE) + .pattern("x x") + .pattern("xxx") + .pattern("xxx") + .define('x', MIMaterials.IRON.getPart(MIParts.RING)) + .unlockedBy("has_ingredient", has(MIMaterials.IRON.getPart(MIParts.RING))) + .save(output, key("vanilla_recipes/chainmail_chestplate")); + shaped(RecipeCategory.MISC, Items.CHAINMAIL_HELMET) + .pattern("xxx") + .pattern("x x") + .define('x', MIMaterials.IRON.getPart(MIParts.RING)) + .unlockedBy("has_ingredient", has(MIMaterials.IRON.getPart(MIParts.RING))) + .save(output, key("vanilla_recipes/chainmail_helmet")); + shaped(RecipeCategory.MISC, Items.CHAINMAIL_LEGGINGS) + .pattern("xxx") + .pattern("x x") + .pattern("x x") + .define('x', MIMaterials.IRON.getPart(MIParts.RING)) + .unlockedBy("has_ingredient", has(MIMaterials.IRON.getPart(MIParts.RING))) + .save(output, key("vanilla_recipes/chainmail_leggings")); + shaped(RecipeCategory.MISC, Items.IRON_CHAIN, 6) + .pattern(" R ") + .pattern(" R ") + .pattern(" R ") + .define('R', MIMaterials.STEEL.getPart(MIParts.RING)) + .unlockedBy("has_ingredient", has(MIMaterials.STEEL.getPart(MIParts.RING))) + .save(output, key("vanilla_recipes/chains")); + shaped(RecipeCategory.MISC, Items.CLAY_BALL, 4) + .pattern("C") + .define('C', Items.CLAY) + .unlockedBy("has_ingredient", has(Items.CLAY)) + .save(output, key("vanilla_recipes/clay_uncrafting")); + shaped(RecipeCategory.MISC, Items.CHEST, 4) + .pattern("lll") + .pattern("l l") + .pattern("lll") + .define('l', ItemTags.LOGS) + .unlockedBy("has_ingredient", has(ItemTags.LOGS)) + .save(output, key("vanilla_recipes/easy_chest")); + shaped(RecipeCategory.MISC, Items.TORCH, 4) + .pattern("X") + .pattern("#") + .define('#', Items.STICK) + .define('X', MIMaterials.LIGNITE_COAL.getPart(MIParts.GEM)) + .unlockedBy("TODO", has(TODO)) + .save(output, key("vanilla_recipes/lignite_torch")); + SimpleCookingRecipeBuilder.smelting(Ingredient.of(Items.WATER_BUCKET), RecipeCategory.MISC, CookingBookCategory.MISC, MIFluids.STEAM.getBucket(), 0, 500) + .unlockedBy("has_bucket", has(Items.WATER_BUCKET)) + .save(output.withConditions(new NotCondition(new ModLoadedCondition("dehydration"))), key("vanilla_recipes/steam_bucket")); + shaped(RecipeCategory.MISC, Items.ANVIL, 2) + .pattern("III") + .pattern(" i ") + .pattern("iii") + .define('I', MIMaterials.STEEL.getPart(MIParts.BLOCK)) + .define('i', MIMaterials.STEEL.getPart(MIParts.INGOT)) + .unlockedBy("TODO", has(TODO)) + .save(assemblerExportOutput, key("vanilla_recipes/steel_anvil")); + shaped(RecipeCategory.MISC, MIBlock.FORGE_HAMMER, 2) + .pattern("___") + .pattern(" i ") + .pattern("iii") + .define('_', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .define('i', partIngredient(MIMaterials.STEEL, MIParts.INGOT)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("vanilla_recipes/steel_forge_hammer")); + shaped(RecipeCategory.MISC, Items.HOPPER, 2) + .pattern("p p") + .pattern("pcp") + .pattern(" p ") + .define('c', Items.CHEST) + .define('p', partIngredient(MIMaterials.STEEL, MIParts.PLATE)) + .unlockedBy("has_plate", hasPartTag(MIMaterials.STEEL, MIParts.PLATE)) + .save(assemblerExportOutput, key("vanilla_recipes/steel_hopper")); + shaped(RecipeCategory.MISC, Items.TORCH, 8) + .pattern("C") + .pattern("s") + .define('C', MIMaterials.COKE.getPart(MIParts.GEM)) + .define('s', Items.STICK) + .unlockedBy("TODO", has(TODO)) + .save(output, key("vanilla_recipes/torch")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(ItemTags.PLANKS, 6) + .itemIn(ItemTags.WOODEN_SLABS, 2) + .itemOut(Items.BARREL, 2) + .save(output, key("vanilla_recipes/assembler/barrel")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(ItemTags.PLANKS, 8) + .itemIn(Items.CHEST, 1, 0.0f) + .itemOut(Items.CHEST, 2) + .save(output, key("vanilla_recipes/assembler/chest")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(partIngredient(MIMaterials.STEEL, MIParts.PLATE), 5) + .itemIn(MIItem.MOTOR) + .itemOut(Items.HOPPER, 2) + .save(output, key("vanilla_recipes/assembler/hopper")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(partIngredient(MIMaterials.GOLD, MIParts.ROD), 6) + .itemIn(Items.STICK) + .itemIn(Items.REDSTONE) + .fluidIn(MIFluids.CREOSOTE, 100) + .itemOut(Items.POWERED_RAIL, 8) + .save(output, key("vanilla_recipes/assembler/powered_rail")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(partIngredient(MIMaterials.STEEL, MIParts.ROD), 6) + .itemIn(Items.STICK) + .fluidIn(MIFluids.CREOSOTE, 100) + .itemOut(Items.RAIL, 16) + .save(output, key("vanilla_recipes/assembler/rail")); + machine(MIMachineRecipeTypes.ASSEMBLER, 8, 200) + .itemIn(Items.PRISMARINE_CRYSTALS, 5) + .itemIn(Items.PRISMARINE_SHARD, 4) + .itemOut(Items.SEA_LANTERN, 2) + .save(output, key("vanilla_recipes/assembler/sea_lantern")); + machine(MIMachineRecipeTypes.CENTRIFUGE, 32, 600) + .fluidIn(Fluids.LAVA, 1000) + .itemOut(MIMaterials.SULFUR.getPart(MIParts.DUST), 17) + .itemOut(MIMaterials.COPPER.getPart(MIParts.NUGGET), 11) + .itemOut(MIMaterials.ALUMINUM.getPart(MIParts.NUGGET), 3, 0.5f) + .itemOut(MIMaterials.CHROMIUM.getPart(MIParts.NUGGET), 1, 0.25f) + .save(output, key("vanilla_recipes/centrifuge/lava")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 4, 400) + .itemIn(partIngredient(MIMaterials.QUARTZ, MIParts.DUST), 4) + .itemIn(partIngredient(MIMaterials.IRON, MIParts.TINY_DUST)) + .fluidIn(Fluids.WATER, 250) + .fluidIn(MIFluids.SODIUM_HYDROXIDE, 500) + .itemOut(Items.AMETHYST_SHARD, 4) + .save(output, key("vanilla_recipes/chemical_reactor/amethyst")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 2, 6000) + .itemIn(Items.BRAIN_CORAL_BLOCK) + .itemIn(Items.BONE_MEAL, 4) + .itemIn(partIngredient(MIMaterials.SALT, MIParts.DUST), 4) + .fluidIn(Fluids.WATER, 9000) + .itemOut(Items.BRAIN_CORAL_BLOCK, 2) + .itemOut(Items.BRAIN_CORAL, 2) + .itemOut(Items.BRAIN_CORAL_FAN, 2) + .fluidOut(Fluids.WATER, 6000) + .save(output, key("vanilla_recipes/chemical_reactor/brain_coral")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 2, 6000) + .itemIn(Items.BUBBLE_CORAL_BLOCK) + .itemIn(Items.BONE_MEAL, 4) + .itemIn(partIngredient(MIMaterials.SALT, MIParts.DUST), 4) + .fluidIn(Fluids.WATER, 9000) + .itemOut(Items.BUBBLE_CORAL_BLOCK, 2) + .itemOut(Items.BUBBLE_CORAL_FAN, 2) + .itemOut(Items.BUBBLE_CORAL, 2) + .fluidOut(Fluids.WATER, 6000) + .save(output, key("vanilla_recipes/chemical_reactor/bubble_coral")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 2, 6000) + .itemIn(Items.FIRE_CORAL_BLOCK) + .itemIn(Items.BONE_MEAL, 4) + .itemIn(partIngredient(MIMaterials.SALT, MIParts.DUST), 4) + .fluidIn(Fluids.WATER, 9000) + .itemOut(Items.FIRE_CORAL_BLOCK, 2) + .itemOut(Items.FIRE_CORAL_FAN, 2) + .itemOut(Items.FIRE_CORAL, 2) + .fluidOut(Fluids.WATER, 6000) + .save(output, key("vanilla_recipes/chemical_reactor/fire_coral")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 2, 6000) + .itemIn(Items.HORN_CORAL_BLOCK) + .itemIn(Items.BONE_MEAL, 4) + .itemIn(partIngredient(MIMaterials.SALT, MIParts.DUST), 4) + .fluidIn(Fluids.WATER, 9000) + .itemOut(Items.HORN_CORAL_BLOCK, 2) + .itemOut(Items.HORN_CORAL_FAN, 2) + .itemOut(Items.HORN_CORAL, 2) + .fluidOut(Fluids.WATER, 6000) + .save(output, key("vanilla_recipes/chemical_reactor/horn_coral")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) + .itemIn(Items.ROTTEN_FLESH, 5) + .fluidIn(MIFluids.OXYGEN, 100) + .itemOut(Items.LEATHER) + .save(output, key("vanilla_recipes/chemical_reactor/leather")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 4, 400) + .itemIn(partIngredient(MIMaterials.QUARTZ, MIParts.DUST), 4) + .itemIn(partIngredient(MIMaterials.BERYLLIUM, MIParts.TINY_DUST), 3) + .itemIn(partIngredient(MIMaterials.ALUMINUM, MIParts.TINY_DUST), 2) + .fluidIn(MIFluids.HYDROGEN, 4000) + .fluidIn(MIFluids.SODIUM_HYDROXIDE, 4000) + .fluidIn(MIFluids.CHLORINE, 250) + .itemOut(Items.PRISMARINE_CRYSTALS, 16) + .save(output, key("vanilla_recipes/chemical_reactor/prismarine_crystals")); + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 2, 6000) + .itemIn(Items.TUBE_CORAL_BLOCK) + .itemIn(Items.BONE_MEAL, 4) + .itemIn(partIngredient(MIMaterials.SALT, MIParts.DUST), 4) + .fluidIn(Fluids.WATER, 9000) + .itemOut(Items.TUBE_CORAL_BLOCK, 2) + .itemOut(Items.TUBE_CORAL_FAN, 2) + .itemOut(Items.TUBE_CORAL, 2) + .fluidOut(Fluids.WATER, 6000) + .save(output, key("vanilla_recipes/chemical_reactor/tube_coral")); + machine(MIMachineRecipeTypes.COMPRESSOR, 4, 6000) + .itemIn(Items.COAL_BLOCK, 16) + .itemOut(Items.DIAMOND) + .save(output, key("vanilla_recipes/compressor/diamond_from_coal")); + machine(MIMachineRecipeTypes.COMPRESSOR) + .itemIn(Tags.Items.GLASS_BLOCKS) + .itemOut(Items.GLASS_BOTTLE, 2) + .save(output, key("vanilla_recipes/compressor/glass_bottle")); + machine(MIMachineRecipeTypes.COMPRESSOR) + .itemIn(Items.MUD) + .itemOut(Items.PACKED_MUD) + .save(output, key("vanilla_recipes/compressor/packed_mud")); + machine(MIMachineRecipeTypes.COMPRESSOR) + .itemIn(Items.SUGAR_CANE) + .itemOut(Items.PAPER, 2) + .save(output, key("vanilla_recipes/compressor/paper_with_sugarcane")); + machine(MIMachineRecipeTypes.CUTTING_MACHINE) + .itemIn(Items.GLASS, 6) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemOut(Items.GLASS_PANE, 16) + .save(output, key("vanilla_recipes/cutting_machine/glass_panes")); + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 50) + .itemIn(ItemTags.PLANKS) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemOut(Items.STICK, 2) + .save(output, key("vanilla_recipes/cutting_machine/sticks")); + forgeHammer(Items.BONE_BLOCK, new ItemStackTemplate(Items.BONE_MEAL, 9), 45) + .save(output, key("vanilla_recipes/forge_hammer/bone_meal_from_block")); + forgeHammer(Items.BONE, new ItemStackTemplate(Items.BONE_MEAL, 6), 30) + .save(output, key("vanilla_recipes/forge_hammer/bone_meal_from_bone")); + forgeHammer(Items.COBBLESTONE, Items.GRAVEL, 10) + .save(output, key("vanilla_recipes/forge_hammer/gravel")); + forgeHammer(Items.GRAVEL, Items.SAND, 10) + .save(output, key("vanilla_recipes/forge_hammer/sand")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 1, 10) + .itemIn(partIngredient(MIMaterials.GOLD, MIParts.BLOCK), 64) + .itemIn(Items.APPLE) + .itemIn(MIBlock.INDUSTRIAL_TNT) + .itemOut(Items.ENCHANTED_GOLDEN_APPLE) + .save(output, key("vanilla_recipes/implosion_compressor/enchanted_golden_apple")); + machine(MIMachineRecipeTypes.IMPLOSION_COMPRESSOR, 64, 10) + .itemIn(MIItem.SINGULARITY) + .itemIn(Items.LAVA_BUCKET) + .itemIn(MIBlock.NUKE, 64) + .itemIn(MIBlock.NUKE, 64) + .itemOut(Items.NETHER_STAR) + .save(output, key("vanilla_recipes/implosion_compressor/nether_star")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.BLAZE_ROD) + .itemOut(Items.BLAZE_POWDER, 4) + .save(output, key("vanilla_recipes/macerator/blaze_dust")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(partIngredient(MIMaterials.LAPIS, MIParts.DUST)) + .itemOut(Items.BLUE_DYE) + .save(output, key("vanilla_recipes/macerator/blue_dye1")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.BONE_BLOCK) + .itemOut(Items.BONE_MEAL, 9) + .save(output, key("vanilla_recipes/macerator/bone_meal_from_block")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.BONE) + .itemOut(Items.BONE_MEAL, 6) + .save(output, key("vanilla_recipes/macerator/bone_meal_from_bone")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.CLAY) + .itemOut(Items.CLAY_BALL, 4) + .save(output, key("vanilla_recipes/macerator/clay_ball")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.DEEPSLATE) + .itemOut(Items.COBBLED_DEEPSLATE) + .save(output, key("vanilla_recipes/macerator/cobbled_deepslate")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.GILDED_BLACKSTONE) + .itemOut(Items.GOLD_NUGGET, 8) + .save(output, key("vanilla_recipes/macerator/gilded_blackstone")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.GLOWSTONE) + .itemOut(Items.GLOWSTONE_DUST, 4) + .save(output, key("vanilla_recipes/macerator/glowstone_dust")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.COBBLESTONE) + .itemOut(Items.GRAVEL) + .save(output, key("vanilla_recipes/macerator/gravel")); + machine(MIMachineRecipeTypes.MACERATOR, 2, 800) + .itemIn(Items.ANCIENT_DEBRIS) + .itemOut(Items.NETHERITE_SCRAP, 2) + .save(output, key("vanilla_recipes/macerator/netherite_scrap")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.RED_SANDSTONE) + .itemOut(Items.RED_SAND, 4) + .save(output, key("vanilla_recipes/macerator/red_sandstone_to_sand")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.GRAVEL) + .itemOut(Items.SAND) + .save(output, key("vanilla_recipes/macerator/sand")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.SANDSTONE) + .itemOut(Items.SAND, 4) + .save(output, key("vanilla_recipes/macerator/sandstone_to_sand")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(ItemTags.WOOL) + .itemOut(Items.STRING, 4) + .save(output, key("vanilla_recipes/macerator/strings")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.SUGAR_CANE) + .itemOut(Items.SUGAR, 3) + .save(output, key("vanilla_recipes/macerator/sugar")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.ANDESITE) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.ANDESITE, 2) + .save(output, key("vanilla_recipes/mixer/andesite")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.CALCITE) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.CALCITE, 2) + .save(output, key("vanilla_recipes/mixer/calcite")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.CLAY) + .save(output, key("vanilla_recipes/mixer/clay")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.DIRT) + .itemIn(Items.GRAVEL) + .itemOut(Items.COARSE_DIRT, 2) + .save(output, key("vanilla_recipes/mixer/coarse_dirt")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.COBBLED_DEEPSLATE) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.COBBLED_DEEPSLATE, 2) + .save(output, key("vanilla_recipes/mixer/cobbled_deepslate")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.COBBLESTONE) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.COBBLESTONE, 2) + .save(output, key("vanilla_recipes/mixer/cobblestone")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.PRISMARINE, 8) + .itemIn(Items.BLACK_DYE) + .itemOut(Items.DARK_PRISMARINE, 8) + .save(output, key("vanilla_recipes/mixer/dark_prismarine")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.DIORITE) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.DIORITE, 2) + .save(output, key("vanilla_recipes/mixer/diorite")); + machine(MIMachineRecipeTypes.MIXER, 2, 600) + .itemIn(Items.COARSE_DIRT) + .fluidIn(Fluids.WATER, 6000) + .itemOut(Items.DIRT) + .save(output, key("vanilla_recipes/mixer/dirt")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.DRIPSTONE_BLOCK) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.DRIPSTONE_BLOCK, 2) + .save(output, key("vanilla_recipes/mixer/dripstone")); + machine(MIMachineRecipeTypes.MIXER, 8, 200) + .itemIn(Items.END_STONE) + .fluidIn(MIFluids.HEAVY_WATER, 1) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.END_STONE, 2) + .save(output, key("vanilla_recipes/mixer/endstone")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SPIDER_EYE) + .itemIn(Items.BROWN_MUSHROOM) + .itemIn(Items.SUGAR) + .itemOut(Items.FERMENTED_SPIDER_EYE) + .save(output, key("vanilla_recipes/mixer/fermented_spider_eye")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.GRANITE) + .fluidIn(Fluids.WATER, 1, 0.0f) + .fluidIn(Fluids.LAVA, 1, 0.0f) + .itemOut(Items.GRANITE, 2) + .save(output, key("vanilla_recipes/mixer/granite")); + machine(MIMachineRecipeTypes.MIXER, 32, 1250) + .itemIn(Items.STONE) + .fluidIn(Fluids.LAVA, 1000, 0.0f) + .fluidOut(Fluids.LAVA, 50) + .save(output, key("vanilla_recipes/mixer/lava")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.DIRT) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.MUD) + .save(output, key("vanilla_recipes/mixer/mud")); + machine(MIMachineRecipeTypes.MIXER, 16, 200) + .itemIn(Items.NETHERITE_SCRAP, 4) + .itemIn(Items.GOLD_INGOT, 4) + .itemOut(Items.NETHERITE_INGOT, 2) + .save(output, key("vanilla_recipes/mixer/netherite")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(MIItem.WOOD_PULP) + .fluidIn(Fluids.WATER, 100) + .itemOut(Items.PAPER, 2) + .save(output, key("vanilla_recipes/mixer/paper")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.REDSTONE) + .itemIn(Items.SAND) + .itemOut(Items.RED_SAND) + .save(output, key("vanilla_recipes/mixer/red_sand")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(ItemTags.SAND, 4) + .itemIn(Items.GUNPOWDER, 5) + .itemOut(Items.TNT, 2) + .save(output, key("vanilla_recipes/mixer/tnt")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.RAIL, 4) + .itemIn(Items.REDSTONE_TORCH) + .itemOut(Items.ACTIVATOR_RAIL, 4) + .save(output, key("vanilla_recipes/packer/activator_rail")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.AMETHYST_SHARD, 4) + .itemOut(Items.AMETHYST_BLOCK) + .save(output, key("vanilla_recipes/packer/amethyst_block")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.PACKED_ICE, 9) + .itemOut(Items.BLUE_ICE) + .save(output, key("vanilla_recipes/packer/blue_ice")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.BONE_MEAL, 9) + .itemOut(Items.BONE_BLOCK) + .save(output, key("vanilla_recipes/packer/bone_block")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.BRICK, 4) + .itemOut(Items.BRICKS) + .save(output, key("vanilla_recipes/packer/bricks")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(MIMaterials.STEEL.getPart(MIParts.CURVED_PLATE), 3) + .itemOut(Items.BUCKET, 4) + .save(output, key("vanilla_recipes/packer/bucket")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.STRING) + .itemIn(MIItem.WAX) + .itemOut(Items.CANDLE) + .save(output, key("vanilla_recipes/packer/candle")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(MIMaterials.STEEL.getPart(MIParts.RING), 3) + .itemOut(Items.IRON_CHAIN, 6) + .save(output, key("vanilla_recipes/packer/chains")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.CHEST) + .itemIn(Items.MINECART) + .itemOut(Items.CHEST_MINECART) + .save(output, key("vanilla_recipes/packer/chest_minecart")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.RAIL, 4) + .itemIn(Items.STONE_PRESSURE_PLATE) + .itemIn(Items.REDSTONE) + .itemOut(Items.DETECTOR_RAIL, 4) + .save(output, key("vanilla_recipes/packer/detector_rail")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.DRIED_KELP, 9) + .itemOut(Items.DRIED_KELP_BLOCK) + .save(output, key("vanilla_recipes/packer/dried_kelp")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.POINTED_DRIPSTONE, 4) + .itemOut(Items.DRIPSTONE_BLOCK) + .save(output, key("vanilla_recipes/packer/dripstone")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(ItemTags.STONE_CRAFTING_MATERIALS, 8) + .itemOut(Items.FURNACE) + .save(output, key("vanilla_recipes/packer/furnace")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.FURNACE) + .itemIn(Items.MINECART) + .itemOut(Items.FURNACE_MINECART) + .save(output, key("vanilla_recipes/packer/furnace_minecart")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.GOLD_NUGGET, 4) + .itemIn(Items.MELON_SLICE) + .itemOut(Items.GLISTERING_MELON_SLICE) + .save(output, key("vanilla_recipes/packer/glistering_melon_slice")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.GLOWSTONE_DUST, 4) + .itemOut(Items.GLOWSTONE) + .save(output, key("vanilla_recipes/packer/glowstone_block")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.GOLD_NUGGET, 4) + .itemIn(Items.CARROT) + .itemOut(Items.GOLDEN_CARROT) + .save(output, key("vanilla_recipes/packer/golden_carrot")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.WHEAT, 9) + .itemOut(Items.HAY_BLOCK) + .save(output, key("vanilla_recipes/packer/hayblock")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.HONEYCOMB, 4) + .itemOut(Items.HONEYCOMB_BLOCK) + .save(output, key("vanilla_recipes/packer/honeycomb")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.HOPPER) + .itemIn(Items.MINECART) + .itemOut(Items.HOPPER_MINECART) + .save(output, key("vanilla_recipes/packer/hopper_minecart")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.MAGMA_CREAM, 4) + .itemOut(Items.MAGMA_BLOCK) + .save(output, key("vanilla_recipes/packer/magma_block")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.BLAZE_POWDER) + .itemIn(Items.SLIME_BALL) + .itemOut(Items.MAGMA_CREAM, 2) + .save(output, key("vanilla_recipes/packer/magma_cream")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.MELON_SLICE, 9) + .itemOut(Items.MELON) + .save(output, key("vanilla_recipes/packer/melon")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(MIMaterials.STEEL.getPart(MIParts.LARGE_PLATE)) + .itemIn(Items.RAIL) + .itemOut(Items.MINECART) + .save(output, key("vanilla_recipes/packer/minecart")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.PACKED_MUD, 4) + .itemOut(Items.MUD_BRICKS, 4) + .save(output, key("vanilla_recipes/packer/mud_bricks")); + machine(MIMachineRecipeTypes.PACKER, 2, 200) + .itemIn(Items.NETHERITE_INGOT, 9) + .itemOut(Items.NETHERITE_BLOCK) + .save(output, key("vanilla_recipes/packer/netherite")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.NETHER_BRICK, 4) + .itemOut(Items.NETHER_BRICKS) + .save(output, key("vanilla_recipes/packer/nether_bricks")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.NETHER_WART, 9) + .itemOut(Items.NETHER_WART_BLOCK) + .save(output, key("vanilla_recipes/packer/nether_warts")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.ICE, 9) + .itemOut(Items.PACKED_ICE) + .save(output, key("vanilla_recipes/packer/packed_ice")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.PRISMARINE_SHARD, 4) + .itemOut(Items.PRISMARINE) + .save(output, key("vanilla_recipes/packer/prismarine")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.PRISMARINE_SHARD, 9) + .itemIn(MIItem.PACKER_BLOCK_TEMPLATE, 1, 0.0f) + .itemOut(Items.PRISMARINE_BRICKS) + .save(output, key("vanilla_recipes/packer/prismarine_bricks")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.POPPED_CHORUS_FRUIT, 4) + .itemOut(Items.PURPUR_BLOCK) + .save(output, key("vanilla_recipes/packer/purpur")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.QUARTZ, 4) + .itemOut(Items.QUARTZ_BLOCK) + .save(output, key("vanilla_recipes/packer/quartz_block")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.RED_SAND, 4) + .itemOut(Items.RED_SANDSTONE) + .save(output, key("vanilla_recipes/packer/red_sandstone")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.SAND, 4) + .itemOut(Items.SANDSTONE) + .save(output, key("vanilla_recipes/packer/sandstone")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.SLIME_BALL, 9) + .itemOut(Items.SLIME_BLOCK) + .save(output, key("vanilla_recipes/packer/slimeblock")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.SNOWBALL, 4) + .itemOut(Items.SNOW_BLOCK) + .save(output, key("vanilla_recipes/packer/snowblock")); + machine(MIMachineRecipeTypes.PACKER) + .itemIn(Items.TNT) + .itemIn(Items.MINECART) + .itemOut(Items.TNT_MINECART) + .save(output, key("vanilla_recipes/packer/tnt_minecart")); + machine(MIMachineRecipeTypes.VACUUM_FREEZER, 16, 200) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.ICE) + .save(output, key("vanilla_recipes/vacuum_freezer/ice")); + machine(MIMachineRecipeTypes.VACUUM_FREEZER, 2, 2400) + .fluidIn(Fluids.LAVA, 1000) + .itemOut(Items.OBSIDIAN) + .save(output, key("vanilla_recipes/vacuum_freezer/obsidian")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLACK_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.BLACK_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/black_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.BLACK_DYE) + .itemOut(Items.BLACK_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/black_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLUE_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.BLUE_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/blue_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.BLUE_DYE) + .itemOut(Items.BLUE_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/blue_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BROWN_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.BROWN_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/brown_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.BROWN_DYE) + .itemOut(Items.BROWN_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/brown_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.CYAN_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.CYAN_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/cyan_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.CYAN_DYE) + .itemOut(Items.CYAN_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/cyan_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.GRAY_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.GRAY_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/gray_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.GRAY_DYE) + .itemOut(Items.GRAY_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/gray_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.GREEN_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.GREEN_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/green_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.GREEN_DYE) + .itemOut(Items.GREEN_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/green_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.LIGHT_BLUE_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.LIGHT_BLUE_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/light_blue_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.LIGHT_BLUE_DYE) + .itemOut(Items.LIGHT_BLUE_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/light_blue_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.LIGHT_GRAY_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.LIGHT_GRAY_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/light_gray_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.LIGHT_GRAY_DYE) + .itemOut(Items.LIGHT_GRAY_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/light_gray_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.LIME_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.LIME_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/lime_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.LIME_DYE) + .itemOut(Items.LIME_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/lime_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.MAGENTA_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.MAGENTA_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/magenta_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.MAGENTA_DYE) + .itemOut(Items.MAGENTA_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/magenta_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.ORANGE_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.ORANGE_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/orange_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.ORANGE_DYE) + .itemOut(Items.ORANGE_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/orange_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.PINK_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.PINK_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/pink_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.PINK_DYE) + .itemOut(Items.PINK_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/pink_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.PURPLE_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.PURPLE_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/purple_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.PURPLE_DYE) + .itemOut(Items.PURPLE_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/purple_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.RED_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.RED_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/red_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.RED_DYE) + .itemOut(Items.RED_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/red_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.WHITE_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.WHITE_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/white_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.WHITE_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/white_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.YELLOW_CONCRETE_POWDER) + .fluidIn(Fluids.WATER, 1000) + .itemOut(Items.YELLOW_CONCRETE) + .save(output, key("vanilla_recipes/mixer/concrete/yellow_concrete")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.SAND, 4) + .itemIn(Items.GRAVEL, 4) + .itemIn(Items.YELLOW_DYE) + .itemOut(Items.YELLOW_CONCRETE_POWDER, 8) + .save(output, key("vanilla_recipes/mixer/concrete/yellow_concrete_powder")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(MIMaterials.COAL.getPart(MIParts.DUST)) + .fluidIn(Fluids.WATER, 50) + .itemOut(Items.BLACK_DYE) + .save(output, key("vanilla_recipes/mixer/dye/black_dye")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.INK_SAC) + .itemOut(Items.BLACK_DYE) + .save(output, key("vanilla_recipes/mixer/dye/black_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.WITHER_ROSE) + .itemOut(Items.BLACK_DYE) + .save(output, key("vanilla_recipes/mixer/dye/black_dye3")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.CORNFLOWER) + .itemOut(Items.BLUE_DYE) + .save(output, key("vanilla_recipes/mixer/dye/blue_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.COCOA_BEANS) + .itemOut(Items.BROWN_DYE) + .save(output, key("vanilla_recipes/mixer/dye/brown_dye")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.GREEN_DYE) + .itemIn(Items.BLUE_DYE) + .itemOut(Items.CYAN_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/cyan_dye")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLACK_DYE) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.GRAY_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/gray_dye")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.BLUE_ORCHID) + .itemOut(Items.LIGHT_BLUE_DYE) + .save(output, key("vanilla_recipes/mixer/dye/light_blue_dye")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLUE_DYE) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.LIGHT_BLUE_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/light_blue_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.AZURE_BLUET) + .itemOut(Items.LIGHT_GRAY_DYE) + .save(output, key("vanilla_recipes/mixer/dye/light_gray_dye1")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.OXEYE_DAISY) + .itemOut(Items.LIGHT_GRAY_DYE) + .save(output, key("vanilla_recipes/mixer/dye/light_gray_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.WHITE_TULIP) + .itemOut(Items.LIGHT_GRAY_DYE) + .save(output, key("vanilla_recipes/mixer/dye/light_gray_dye3")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.GRAY_DYE) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.LIGHT_GRAY_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/light_gray_dye4")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLACK_DYE) + .itemIn(Items.WHITE_DYE, 2) + .itemOut(Items.LIGHT_GRAY_DYE, 3) + .save(output, key("vanilla_recipes/mixer/dye/light_gray_dye5")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.GREEN_DYE) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.LIME_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/lime_dye")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.ALLIUM) + .itemOut(Items.MAGENTA_DYE) + .save(output, key("vanilla_recipes/mixer/dye/magenta_dye1")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.LILAC) + .itemOut(Items.MAGENTA_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/magenta_dye2")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.PURPLE_DYE) + .itemIn(Items.PINK_DYE) + .itemOut(Items.MAGENTA_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/magenta_dye3")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLUE_DYE) + .itemIn(Items.RED_DYE, 2) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.MAGENTA_DYE, 4) + .save(output, key("vanilla_recipes/mixer/dye/magenta_dye4")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.BLUE_DYE) + .itemIn(Items.RED_DYE) + .itemIn(Items.PINK_DYE) + .itemOut(Items.MAGENTA_DYE, 3) + .save(output, key("vanilla_recipes/mixer/dye/magenta_dye5")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.ORANGE_TULIP) + .itemOut(Items.ORANGE_DYE) + .save(output, key("vanilla_recipes/mixer/dye/orange_dye1")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.YELLOW_DYE) + .itemIn(Items.RED_DYE) + .itemOut(Items.ORANGE_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/orange_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.PEONY) + .itemOut(Items.PINK_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/pink_dye")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.PINK_TULIP) + .itemOut(Items.PINK_DYE) + .save(output, key("vanilla_recipes/mixer/dye/pink_dye2")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.RED_DYE) + .itemIn(Items.WHITE_DYE) + .itemOut(Items.PINK_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/pink_dye3")); + machine(MIMachineRecipeTypes.MIXER) + .itemIn(Items.RED_DYE) + .itemIn(Items.BLUE_DYE) + .itemOut(Items.PURPLE_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/purple_dye")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.BEETROOT) + .itemOut(Items.RED_DYE) + .save(output, key("vanilla_recipes/mixer/dye/red_dye1")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.POPPY) + .itemOut(Items.RED_DYE) + .save(output, key("vanilla_recipes/mixer/dye/red_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.ROSE_BUSH) + .itemOut(Items.RED_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/red_dye3")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.RED_TULIP) + .itemOut(Items.RED_DYE) + .save(output, key("vanilla_recipes/mixer/dye/red_dye4")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.BONE_MEAL) + .itemOut(Items.WHITE_DYE) + .save(output, key("vanilla_recipes/mixer/dye/white_dye1")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.LILY_OF_THE_VALLEY) + .itemOut(Items.WHITE_DYE) + .save(output, key("vanilla_recipes/mixer/dye/white_dye2")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.SUNFLOWER) + .itemOut(Items.YELLOW_DYE, 2) + .save(output, key("vanilla_recipes/mixer/dye/yellow_dye")); + machine(MIMachineRecipeTypes.MACERATOR) + .itemIn(Items.DANDELION) + .itemOut(Items.YELLOW_DYE) + .save(output, key("vanilla_recipes/mixer/dye/yellow_dye2")); + } + + private static ResourceKey> key(String path) { + return ResourceKey.create(Registries.RECIPE, MI.id(path)); + } + private static Item TODO = Items.DIAMOND; // TODO for advancement generation... + + // TODO: this would be unnecessary if we had proper static references + private static Item miItem(String path) { + return BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, MI.id(path))); + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new MIRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "MI Recipes (most of them)"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/MIRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/MIRecipesProvider.java deleted file mode 100644 index 3168cc92f..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/MIRecipesProvider.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MI; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Stream; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeProvider; -import net.minecraft.resources.ResourceLocation; - -public abstract class MIRecipesProvider extends RecipeProvider { - public MIRecipesProvider(PackOutput packOutput) { - super(packOutput, CompletableFuture.completedFuture(HolderLookup.Provider.create(Stream.of()))); - } - - protected static ResourceLocation id(String path) { - return MI.id(path); - } - - @Override - public String getName() { - return this.getClass().getSimpleName(); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/MaterialRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/MaterialRecipeProvider.java new file mode 100644 index 000000000..eb070a4c5 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/MaterialRecipeProvider.java @@ -0,0 +1,63 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.materials.Material; +import aztech.modern_industrialization.materials.MaterialRegistry; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; + +import java.util.concurrent.CompletableFuture; + +public class MaterialRecipeProvider extends BaseRecipeProvider { + protected MaterialRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + protected void buildRecipes() { + for (Material material : MaterialRegistry.getMaterials().values()) { + material.registerRecipes.registerRecipes(fluids, items, output); + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new MaterialRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Material Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/MaterialRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/MaterialRecipesProvider.java deleted file mode 100644 index 21351dce7..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/MaterialRecipesProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.materials.Material; -import aztech.modern_industrialization.materials.MaterialRegistry; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; - -public class MaterialRecipesProvider extends MIRecipesProvider { - public MaterialRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - protected void buildRecipes(RecipeOutput recipeOutput) { - for (Material material : MaterialRegistry.getMaterials().values()) { - material.registerRecipes.accept(recipeOutput); - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/PetrochemRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/PetrochemRecipeProvider.java new file mode 100644 index 000000000..53e7e347b --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/PetrochemRecipeProvider.java @@ -0,0 +1,200 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import static aztech.modern_industrialization.MIFluids.*; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.definition.FluidLike; +import aztech.modern_industrialization.fluid.MIFluid; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import com.google.common.base.Preconditions; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.level.material.Fluid; + +import java.util.concurrent.CompletableFuture; + +public class PetrochemRecipeProvider extends BaseRecipeProvider { + protected PetrochemRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + public void buildRecipes() { + generateDistillation(12, 200, f(CRUDE_OIL, 1000), + f(SULFURIC_LIGHT_FUEL, 500), + f(SULFURIC_HEAVY_FUEL, 200), + f(SULFURIC_NAPHTHA, 300)); + generateDistillation(20, 200, f(STEAM_CRACKED_HEAVY_FUEL, 1000), + f(LIGHT_FUEL, 500), + f(METHANE, 100), + f(BUTADIENE, 250), + f(BENZENE, 150)); + generateDistillation(25, 200, f(STEAM_CRACKED_LIGHT_FUEL, 1000), + f(METHANE, 200), + f(ACETYLENE, 100), + f(ETHYLENE, 300), + f(BUTADIENE, 200), + f(BENZENE, 200)); + generateDistillation(15, 200, f(STEAM_CRACKED_NAPHTHA, 1000), + f(METHANE, 150), + f(ACETYLENE, 50), + f(ETHYLENE, 250), + f(PROPENE, 75), + f(BUTADIENE, 125), + f(BENZENE, 150), + f(TOLUENE, 100), + f(ETHYLBENZENE, 100)); + generateDistillation(10, 200, f(SHALE_OIL, 1000), + f(HELIUM, 50), + f(SULFURIC_CRUDE_OIL, 450), + f(SULFURIC_NAPHTHA, 500)); + generateSulfuricPurification(CRUDE_OIL); + generateSulfuricPurification(HEAVY_FUEL); + generateSulfuricPurification(LIGHT_FUEL); + generateSulfuricPurification(NAPHTHA); + generatePolymerization(ETHYLENE, POLYETHYLENE); + generatePolymerization(VINYL_CHLORIDE, POLYVINYL_CHLORIDE); + generatePolymerization(CAPROLACTAM, NYLON); + generatePolymerization(ACRYLIC_ACID, ACRYLIC_GLUE); + generatePolymerization(STYRENE_BUTADIENE, STYRENE_BUTADIENE_RUBBER); + generateSteamCracking(HEAVY_FUEL, STEAM_CRACKED_HEAVY_FUEL); + generateSteamCracking(LIGHT_FUEL, STEAM_CRACKED_LIGHT_FUEL); + generateSteamCracking(NAPHTHA, STEAM_CRACKED_NAPHTHA); + } + + /** + * Generate both the full distillation tower recipe, and each distillery recipe. + */ + private void generateDistillation(int eu, int duration, FluidEntry input, FluidEntry... outputs) { + String basePath = "petrochem/distillation/" + BuiltInRegistries.FLUID.getKey(input.fluid).getPath() + "_"; + + // Full recipe + var full = machine(MIMachineRecipeTypes.DISTILLATION_TOWER, eu * outputs.length, duration); + full.fluidIn(input.fluid, input.amount); + for (var output : outputs) { + full.fluidOut(output.fluid, output.amount); + } + full.offerTo(output, basePath + "full"); + + // Partial recipes + for (int i = 0; i < outputs.length; ++i) { + var output = outputs[i]; + machine(MIMachineRecipeTypes.DISTILLERY, eu, duration) + .fluidIn(input.fluid, input.amount) + .fluidOut(output.fluid, output.amount) + .offerTo(this.output, basePath + i); + } + } + + /** + * Generate the sulfuric -> purified fluid chemical reactor recipe. + */ + private void generateSulfuricPurification(Fluid purifiedFluid) { + String baseName = BuiltInRegistries.FLUID.getKey(purifiedFluid).getPath(); + Fluid sulfuricFluid = BuiltInRegistries.FLUID.getValue(MI.id("sulfuric_" + baseName)); + Preconditions.checkArgument(sulfuricFluid instanceof MIFluid); + + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 400) + .fluidIn(sulfuricFluid, 12000).fluidIn(HYDROGEN.asFluid(), 2000) + .fluidOut(purifiedFluid, 12000).fluidOut(SULFURIC_ACID.asFluid(), 2000) + .offerTo(output, "petrochem/sulfuric_purification/" + baseName); + } + + private void generateSulfuricPurification(FluidLike purifiedFluid) { + generateSulfuricPurification(purifiedFluid.asFluid()); + } + + private void generatePolymerization(Fluid input, Fluid output) { + String baseNameInput = BuiltInRegistries.FLUID.getKey(input).getPath(); + + for (var kind : PolymerizationKind.values()) { + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 12, 700) + .itemIn(conventionTag("tiny_dusts/" + kind.catalystMaterial), kind.inputTinyDust) + .fluidIn(input, 500) + .fluidOut(output, kind.outputMillis) + .offerTo(this.output, "petrochem/polymerization/" + baseNameInput + "_" + kind.name().toLowerCase()); + } + } + + private void generatePolymerization(FluidLike input, FluidLike output) { + generatePolymerization(input.asFluid(), output.asFluid()); + } + + private void generateSteamCracking(FluidLike input, FluidLike output) { + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) + .fluidIn(input, 1000) + .fluidIn(STEAM, 100) + .fluidOut(output, 1000) + .offerTo(this.output, "petrochem/steam_cracking/" + BuiltInRegistries.FLUID.getKey(input.asFluid()).getPath()); + } + + private static FluidEntry f(Fluid fluid, int amount) { + return new FluidEntry(fluid, amount); + } + + private static FluidEntry f(FluidLike fluid, int amount) { + return f(fluid.asFluid(), amount); + } + + private record FluidEntry(Fluid fluid, int amount) {} + + private enum PolymerizationKind { + LEAD("lead", 4, 300), + CHROMIUM("chromium", 1, 700), + ; + + private final String catalystMaterial; + private final int inputTinyDust; + private final int outputMillis; + + PolymerizationKind(String catalystMaterial, int inputTinyDust, int outputMillis) { + this.catalystMaterial = catalystMaterial; + this.inputTinyDust = inputTinyDust; + this.outputMillis = outputMillis; + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new PetrochemRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Petrochem Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/PetrochemRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/PetrochemRecipesProvider.java deleted file mode 100644 index 2253ac384..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/PetrochemRecipesProvider.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import static aztech.modern_industrialization.MIFluids.*; - -import aztech.modern_industrialization.MI; -import aztech.modern_industrialization.definition.FluidLike; -import aztech.modern_industrialization.fluid.MIFluid; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import com.google.common.base.Preconditions; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.world.level.material.Fluid; - -public class PetrochemRecipesProvider extends MIRecipesProvider { - public PetrochemRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - generateDistillation(consumer, 12, 200, f(CRUDE_OIL, 1000), - f(SULFURIC_LIGHT_FUEL, 500), - f(SULFURIC_HEAVY_FUEL, 200), - f(SULFURIC_NAPHTHA, 300)); - generateDistillation(consumer, 20, 200, f(STEAM_CRACKED_HEAVY_FUEL, 1000), - f(LIGHT_FUEL, 500), - f(METHANE, 100), - f(BUTADIENE, 250), - f(BENZENE, 150)); - generateDistillation(consumer, 25, 200, f(STEAM_CRACKED_LIGHT_FUEL, 1000), - f(METHANE, 200), - f(ACETYLENE, 100), - f(ETHYLENE, 300), - f(BUTADIENE, 200), - f(BENZENE, 200)); - generateDistillation(consumer, 15, 200, f(STEAM_CRACKED_NAPHTHA, 1000), - f(METHANE, 150), - f(ACETYLENE, 50), - f(ETHYLENE, 250), - f(PROPENE, 75), - f(BUTADIENE, 125), - f(BENZENE, 150), - f(TOLUENE, 100), - f(ETHYLBENZENE, 100)); - generateDistillation(consumer, 10, 200, f(SHALE_OIL, 1000), - f(HELIUM, 50), - f(SULFURIC_CRUDE_OIL, 450), - f(SULFURIC_NAPHTHA, 500)); - generateSulfuricPurification(consumer, CRUDE_OIL); - generateSulfuricPurification(consumer, HEAVY_FUEL); - generateSulfuricPurification(consumer, LIGHT_FUEL); - generateSulfuricPurification(consumer, NAPHTHA); - generatePolymerization(consumer, ETHYLENE, POLYETHYLENE); - generatePolymerization(consumer, VINYL_CHLORIDE, POLYVINYL_CHLORIDE); - generatePolymerization(consumer, CAPROLACTAM, NYLON); - generatePolymerization(consumer, ACRYLIC_ACID, ACRYLIC_GLUE); - generatePolymerization(consumer, STYRENE_BUTADIENE, STYRENE_BUTADIENE_RUBBER); - generateSteamCracking(consumer, HEAVY_FUEL, STEAM_CRACKED_HEAVY_FUEL); - generateSteamCracking(consumer, LIGHT_FUEL, STEAM_CRACKED_LIGHT_FUEL); - generateSteamCracking(consumer, NAPHTHA, STEAM_CRACKED_NAPHTHA); - } - - /** - * Generate both the full distillation tower recipe, and each distillery recipe. - */ - private void generateDistillation(RecipeOutput consumer, int eu, int duration, FluidEntry input, FluidEntry... outputs) { - String basePath = "petrochem/distillation/" + BuiltInRegistries.FLUID.getKey(input.fluid).getPath() + "_"; - - // Full recipe - var full = new MachineRecipeBuilder(MIMachineRecipeTypes.DISTILLATION_TOWER, eu * outputs.length, duration); - full.addFluidInput(input.fluid, input.amount); - for (var output : outputs) { - full.addFluidOutput(output.fluid, output.amount); - } - full.offerTo(consumer, basePath + "full"); - - // Partial recipes - for (int i = 0; i < outputs.length; ++i) { - var output = outputs[i]; - new MachineRecipeBuilder(MIMachineRecipeTypes.DISTILLERY, eu, duration) - .addFluidInput(input.fluid, input.amount).addFluidOutput(output.fluid, output.amount) - .offerTo(consumer, basePath + i); - } - } - - /** - * Generate the sulfuric -> purified fluid chemical reactor recipe. - */ - private void generateSulfuricPurification(RecipeOutput consumer, Fluid purifiedFluid) { - String baseName = BuiltInRegistries.FLUID.getKey(purifiedFluid).getPath(); - Fluid sulfuricFluid = BuiltInRegistries.FLUID.get(MI.id("sulfuric_" + baseName)); - Preconditions.checkArgument(sulfuricFluid instanceof MIFluid); - - new MachineRecipeBuilder(MIMachineRecipeTypes.CHEMICAL_REACTOR, 16, 400) - .addFluidInput(sulfuricFluid, 12000).addFluidInput(HYDROGEN.asFluid(), 2000) - .addFluidOutput(purifiedFluid, 12000).addFluidOutput(SULFURIC_ACID.asFluid(), 2000) - .offerTo(consumer, "petrochem/sulfuric_purification/" + baseName); - } - - private void generateSulfuricPurification(RecipeOutput consumer, FluidLike purifiedFluid) { - generateSulfuricPurification(consumer, purifiedFluid.asFluid()); - } - - private void generatePolymerization(RecipeOutput consumer, Fluid input, Fluid output) { - String baseNameInput = BuiltInRegistries.FLUID.getKey(input).getPath(); - - for (var kind : PolymerizationKind.values()) { - new MachineRecipeBuilder(MIMachineRecipeTypes.CHEMICAL_REACTOR, 12, 700) - .addItemInput("#c:tiny_dusts/" + kind.catalystMaterial, kind.inputTinyDust) - .addFluidInput(input, 500) - .addFluidOutput(output, kind.outputMillis) - .offerTo(consumer, "petrochem/polymerization/" + baseNameInput + "_" + kind.name().toLowerCase()); - } - } - - private void generatePolymerization(RecipeOutput consumer, FluidLike input, FluidLike output) { - generatePolymerization(consumer, input.asFluid(), output.asFluid()); - } - - private void generateSteamCracking(RecipeOutput consumer, FluidLike input, FluidLike output) { - new MachineRecipeBuilder(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) - .addFluidInput(input, 1000) - .addFluidInput(STEAM, 100) - .addFluidOutput(output, 1000) - .offerTo(consumer, "petrochem/steam_cracking/" + BuiltInRegistries.FLUID.getKey(input.asFluid()).getPath()); - } - - private static FluidEntry f(Fluid fluid, int amount) { - return new FluidEntry(fluid, amount); - } - - private static FluidEntry f(FluidLike fluid, int amount) { - return f(fluid.asFluid(), amount); - } - - private record FluidEntry(Fluid fluid, int amount) {} - - private enum PolymerizationKind { - LEAD("lead", 4, 300), - CHROMIUM("chromium", 1, 700), - ; - - private final String catalystMaterial; - private final int inputTinyDust; - private final int outputMillis; - - PolymerizationKind(String catalystMaterial, int inputTinyDust, int outputMillis) { - this.catalystMaterial = catalystMaterial; - this.inputTinyDust = inputTinyDust; - this.outputMillis = outputMillis; - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/PlankRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/PlankRecipeProvider.java new file mode 100644 index 000000000..2da3b1cc7 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/PlankRecipeProvider.java @@ -0,0 +1,114 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MIFluids; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; + +import java.util.concurrent.CompletableFuture; + +public final class PlankRecipeProvider extends BaseRecipeProvider { + PlankRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + public void buildRecipes() { + genPlanks("oak", true); + genPlanks("spruce", true); + genPlanks("birch", true); + genPlanks("jungle", true); + genPlanks("acacia", true); + genPlanks("dark_oak", true); + genPlanks("mangrove", true); + genPlanks("cherry", true); + genPlanks("crimson", false); + genPlanks("warped", false); + } + + private void genPlanks(String prefix, boolean log) { + String suffixTag = log ? "logs" : "stems"; + String suffix = log ? "log" : "stem"; + + String packedSuffix = log ? "wood" : "hyphae"; + + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemIn(tag("minecraft:" + prefix + "_" + suffixTag), 1) + .itemOut("minecraft:" + prefix + "_planks", 6) + .offerTo(output, "cutting_machine/planks/" + prefix); + + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemIn("minecraft:" + prefix + "_" + suffix, 1) + .itemOut("minecraft:stripped_" + prefix + "_" + suffix, 1) + .offerTo(output, "cutting_machine/stripped/" + prefix); + + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemIn("minecraft:" + prefix + "_" + packedSuffix, 1) + .itemOut("minecraft:stripped_" + prefix + "_" + packedSuffix, 1) + .offerTo(output, "cutting_machine/stripped_wood/" + prefix); + + machine(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100) + .fluidIn(MIFluids.LUBRICANT, 1) + .itemIn("minecraft:" + prefix + "_planks", 1) + .itemOut("minecraft:" + prefix + "_slab", 2) + .offerTo(output, "cutting_machine/slabs/" + prefix); + + // packer + + machine(MIMachineRecipeTypes.PACKER, 2, 100) + .itemIn("minecraft:" + prefix + "_" + suffix, 4) + .itemOut("minecraft:" + prefix + "_" + packedSuffix, 3) + .offerTo(output, "packer/wood/" + prefix); + + machine(MIMachineRecipeTypes.PACKER, 2, 100) + .itemIn("minecraft:stripped_" + prefix + "_" + suffix, 4) + .itemOut("minecraft:stripped_" + prefix + "_" + packedSuffix, 3) + .offerTo(output, "packer/stripped_wood/" + prefix); + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new PlankRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Plank Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/PlankRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/PlankRecipesProvider.java deleted file mode 100644 index 815d6efee..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/PlankRecipesProvider.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MIFluids; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; - -public final class PlankRecipesProvider extends MIRecipesProvider { - public PlankRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - genPlanks(consumer, "oak", true); - genPlanks(consumer, "spruce", true); - genPlanks(consumer, "birch", true); - genPlanks(consumer, "jungle", true); - genPlanks(consumer, "acacia", true); - genPlanks(consumer, "dark_oak", true); - genPlanks(consumer, "mangrove", true); - genPlanks(consumer, "cherry", true); - genPlanks(consumer, "crimson", false); - genPlanks(consumer, "warped", false); - } - - private static void genPlanks(RecipeOutput consumer, String prefix, boolean log) { - String suffixTag = log ? "logs" : "stems"; - String suffix = log ? "log" : "stem"; - - String packedSuffix = log ? "wood" : "hyphae"; - - var planks = new MachineRecipeBuilder(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100).addFluidInput(MIFluids.LUBRICANT, 1) - .addItemInput("#minecraft:" + prefix + "_" + suffixTag, 1).addItemOutput("minecraft:" + prefix + "_planks", 6); - - planks.offerTo(consumer, "cutting_machine/planks/" + prefix); - - var stripped = new MachineRecipeBuilder(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100).addFluidInput(MIFluids.LUBRICANT, 1) - .addItemInput("minecraft:" + prefix + "_" + suffix, 1).addItemOutput("minecraft:stripped_" + prefix + "_" + suffix, 1); - - stripped.offerTo(consumer, "cutting_machine/stripped/" + prefix); - - var strippedWood = new MachineRecipeBuilder(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100).addFluidInput(MIFluids.LUBRICANT, 1) - .addItemInput("minecraft:" + prefix + "_" + packedSuffix, 1).addItemOutput("minecraft:stripped_" + prefix + "_" + packedSuffix, 1); - - strippedWood.offerTo(consumer, "cutting_machine/stripped_wood/" + prefix); - - var slab = new MachineRecipeBuilder(MIMachineRecipeTypes.CUTTING_MACHINE, 2, 100).addFluidInput(MIFluids.LUBRICANT, 1) - .addItemInput("minecraft:" + prefix + "_planks", 1).addItemOutput("minecraft:" + prefix + "_slab", 2); - - slab.offerTo(consumer, "cutting_machine/slabs/" + prefix); - - // packer - - var packedWood = new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 2, 100).addItemInput("minecraft:" + prefix + "_" + suffix, 4) - .addItemOutput("minecraft:" + prefix + "_" + packedSuffix, 3); - packedWood.offerTo(consumer, "packer/wood/" + prefix); - - var packedStrippedWood = new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 2, 100) - .addItemInput("minecraft:stripped_" + prefix + "_" + suffix, 4) - .addItemOutput("minecraft:stripped_" + prefix + "_" + packedSuffix, 3); - packedStrippedWood.offerTo(consumer, "packer/stripped_wood/" + prefix); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/UpgradeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/UpgradeProvider.java deleted file mode 100644 index 2b6161825..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/UpgradeProvider.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MI; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import aztech.modern_industrialization.recipe.json.ShapelessRecipeBuilder; -import java.util.List; -import java.util.Set; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.world.item.Item; - -public class UpgradeProvider extends MIRecipesProvider { - public UpgradeProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput consumer) { - buildSteelUpgrades(consumer); - buildQuantumUpgrades(consumer); - } - - private static final String[] STEEL_UPGRADE_MACHINES = { "compressor", "macerator", "cutting_machine", "water_pump", "mixer", "furnace", - "boiler" }; - private static final Set STEEL_NO_UNPACKER = Set.of("furnace", "boiler"); - - private void buildSteelUpgrades(RecipeOutput consumer) { - Item upgrade = BuiltInRegistries.ITEM.get(MI.id("steel_upgrade")); - - for (String machine : STEEL_UPGRADE_MACHINES) { - Item bronze = BuiltInRegistries.ITEM.get(MI.id("bronze_" + machine)); - Item steel = BuiltInRegistries.ITEM.get(MI.id("steel_" + machine)); - - var recipe = ShapelessRecipeBuilder.shapeless(steel) - .requires(bronze) - .requires(upgrade); - recipe.offerTo(consumer, "upgrade/craft/steel/" + machine); - - var recipePacker = new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 2, 100).addItemInput(bronze, 1) - .addItemInput(upgrade, 1).addItemOutput(steel, 1); - recipePacker.offerTo(consumer, "upgrade/packer/steel/" + machine); - - if (!STEEL_NO_UNPACKER.contains(machine)) { - var recipeUnpacker = new MachineRecipeBuilder(MIMachineRecipeTypes.UNPACKER, 2, 100).addItemOutput(bronze, 1) - .addItemOutput(upgrade, 1).addItemInput(steel, 1); - recipeUnpacker.offerTo(consumer, "upgrade/unpacker/steel/" + machine); - } - } - } - - private static final List QUANTUM_ITEMS = List.of("helmet", "chestplate", "leggings", "boots", "sword"); - - private void buildQuantumUpgrades(RecipeOutput consumer) { - for (var itemType : QUANTUM_ITEMS) { - var packerRecipe = new MachineRecipeBuilder(MIMachineRecipeTypes.PACKER, 1_000_000, 200) - .addItemInput("minecraft:netherite_" + itemType, 1) - .addItemInput("modern_industrialization:quantum_upgrade", 1) - .addItemOutput("modern_industrialization:quantum_" + itemType, 1); - packerRecipe.offerTo(consumer, "upgrade/packer/quantum/" + itemType); - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/UpgradeRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/UpgradeRecipeProvider.java new file mode 100644 index 000000000..a6bef7731 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/UpgradeRecipeProvider.java @@ -0,0 +1,108 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import aztech.modern_industrialization.recipe.json.ShapelessRecipeBuilder; +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.Item; + +public class UpgradeRecipeProvider extends BaseRecipeProvider { + protected UpgradeRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + public void buildRecipes() { + buildSteelUpgrades(); + buildQuantumUpgrades(); + } + + private static final String[] STEEL_UPGRADE_MACHINES = { "compressor", "macerator", "cutting_machine", "water_pump", "mixer", "furnace", + "boiler" }; + private static final Set STEEL_NO_UNPACKER = Set.of("furnace", "boiler"); + + private void buildSteelUpgrades() { + Item upgrade = BuiltInRegistries.ITEM.getValue(MI.id("steel_upgrade")); + + for (String machine : STEEL_UPGRADE_MACHINES) { + Item bronze = BuiltInRegistries.ITEM.getValue(MI.id("bronze_" + machine)); + Item steel = BuiltInRegistries.ITEM.getValue(MI.id("steel_" + machine)); + + var recipe = ShapelessRecipeBuilder.shapeless(steel) + .requires(bronze) + .requires(upgrade); + recipe.offerTo(output, "upgrade/craft/steel/" + machine); + + var recipePacker = machine(MIMachineRecipeTypes.PACKER, 2, 100).itemIn(bronze, 1) + .itemIn(upgrade, 1).itemOut(steel, 1); + recipePacker.offerTo(output, "upgrade/packer/steel/" + machine); + + if (!STEEL_NO_UNPACKER.contains(machine)) { + var recipeUnpacker = machine(MIMachineRecipeTypes.UNPACKER, 2, 100).itemOut(bronze, 1) + .itemOut(upgrade, 1).itemIn(steel, 1); + recipeUnpacker.offerTo(output, "upgrade/unpacker/steel/" + machine); + } + } + } + + private static final List QUANTUM_ITEMS = List.of("helmet", "chestplate", "leggings", "boots", "sword"); + + private void buildQuantumUpgrades() { + for (var itemType : QUANTUM_ITEMS) { + var packerRecipe = machine(MIMachineRecipeTypes.PACKER, 1_000_000, 200) + .itemIn("minecraft:netherite_" + itemType, 1) + .itemIn("modern_industrialization:quantum_upgrade", 1) + .itemOut("modern_industrialization:quantum_" + itemType, 1); + packerRecipe.offerTo(output, "upgrade/packer/quantum/" + itemType); + } + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new UpgradeRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Upgrade Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/VanillaCompatRecipeProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/VanillaCompatRecipeProvider.java new file mode 100644 index 000000000..3318c6833 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/recipe/VanillaCompatRecipeProvider.java @@ -0,0 +1,134 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.datagen.recipe; + +import aztech.modern_industrialization.MIFluids; +import aztech.modern_industrialization.MIItem; +import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; +import aztech.modern_industrialization.recipe.json.ShapelessRecipeBuilder; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; + +import java.util.concurrent.CompletableFuture; + +/** + * Datagen for recipes that produce vanilla materials using MI machines. + */ +public class VanillaCompatRecipeProvider extends BaseRecipeProvider { + protected VanillaCompatRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + public void buildRecipes() { + generateCopperOxidation(Items.COPPER_BLOCK, Items.EXPOSED_COPPER, Items.WEATHERED_COPPER, Items.OXIDIZED_COPPER); + generateCopperOxidation(Items.CUT_COPPER, Items.EXPOSED_CUT_COPPER, Items.WEATHERED_CUT_COPPER, Items.OXIDIZED_CUT_COPPER); + generateCopperOxidation(Items.CUT_COPPER_SLAB, Items.EXPOSED_CUT_COPPER_SLAB, Items.WEATHERED_CUT_COPPER_SLAB, + Items.OXIDIZED_CUT_COPPER_SLAB); + generateCopperOxidation(Items.CUT_COPPER_STAIRS, Items.EXPOSED_CUT_COPPER_STAIRS, Items.WEATHERED_CUT_COPPER_STAIRS, + Items.OXIDIZED_CUT_COPPER_STAIRS); + // waxed variants + generateCopperOxidation(Items.WAXED_COPPER_BLOCK, Items.WAXED_EXPOSED_COPPER, Items.WAXED_WEATHERED_COPPER, + Items.WAXED_OXIDIZED_COPPER); + generateCopperOxidation(Items.WAXED_CUT_COPPER, Items.WAXED_EXPOSED_CUT_COPPER, Items.WAXED_WEATHERED_CUT_COPPER, + Items.WAXED_OXIDIZED_CUT_COPPER); + generateCopperOxidation(Items.WAXED_CUT_COPPER_SLAB, Items.WAXED_EXPOSED_CUT_COPPER_SLAB, Items.WAXED_WEATHERED_CUT_COPPER_SLAB, + Items.WAXED_OXIDIZED_CUT_COPPER_SLAB); + generateCopperOxidation(Items.WAXED_CUT_COPPER_STAIRS, Items.WAXED_EXPOSED_CUT_COPPER_STAIRS, + Items.WAXED_WEATHERED_CUT_COPPER_STAIRS, Items.WAXED_OXIDIZED_CUT_COPPER_STAIRS); + + // wax + generateWax(Items.COPPER_BLOCK, Items.WAXED_COPPER_BLOCK); + generateWax(Items.CUT_COPPER, Items.WAXED_CUT_COPPER); + generateWax(Items.CUT_COPPER_SLAB, Items.WAXED_CUT_COPPER_SLAB); + generateWax(Items.CUT_COPPER_STAIRS, Items.WAXED_CUT_COPPER_STAIRS); + generateWax(Items.EXPOSED_COPPER, Items.WAXED_EXPOSED_COPPER); + generateWax(Items.EXPOSED_CUT_COPPER, Items.WAXED_EXPOSED_CUT_COPPER); + generateWax(Items.EXPOSED_CUT_COPPER_SLAB, Items.WAXED_EXPOSED_CUT_COPPER_SLAB); + generateWax(Items.EXPOSED_CUT_COPPER_STAIRS, Items.WAXED_EXPOSED_CUT_COPPER_STAIRS); + generateWax(Items.WEATHERED_COPPER, Items.WAXED_WEATHERED_COPPER); + generateWax(Items.WEATHERED_CUT_COPPER, Items.WAXED_WEATHERED_CUT_COPPER); + generateWax(Items.WEATHERED_CUT_COPPER_SLAB, Items.WAXED_WEATHERED_CUT_COPPER_SLAB); + generateWax(Items.WEATHERED_CUT_COPPER_STAIRS, Items.WAXED_WEATHERED_CUT_COPPER_STAIRS); + generateWax(Items.OXIDIZED_COPPER, Items.WAXED_OXIDIZED_COPPER); + generateWax(Items.OXIDIZED_CUT_COPPER, Items.WAXED_OXIDIZED_CUT_COPPER); + generateWax(Items.OXIDIZED_CUT_COPPER_SLAB, Items.WAXED_OXIDIZED_CUT_COPPER_SLAB); + generateWax(Items.OXIDIZED_CUT_COPPER_STAIRS, Items.WAXED_OXIDIZED_CUT_COPPER_STAIRS); + + // misc recipes + machine(MIMachineRecipeTypes.MACERATOR, 2, 100) + .itemIn(Items.STONE, 1) + .itemOut(Items.COBBLESTONE, 1) + .offerTo(output, "vanilla_recipes/macerator/stone_to_cobblestone"); + } + + private void generateCopperOxidation(Item unaffected, Item exposed, Item weathered, Item oxidized) { + oxidize(unaffected, exposed); + oxidize(exposed, weathered); + oxidize(weathered, oxidized); + } + + private void oxidize(Item from, Item to) { + machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) + .itemIn(from, 1) + .fluidIn(MIFluids.OXYGEN, 100) + .itemOut(to, 1) + .offerTo(output, "vanilla_recipes/oxidation/" + BuiltInRegistries.ITEM.getKey(from).getPath()); + } + + private void generateWax(Item from, Item to) { + var recipe = ShapelessRecipeBuilder.shapeless(to).requires(from).requires(MIItem.WAX); + recipe.offerTo(output, "vanilla_recipes/waxing/" + BuiltInRegistries.ITEM.getKey(from).getPath()); + + MachineRecipeBuilder chemicalReactorRecipe = machine(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) + .itemIn(from, 1) + .itemIn(MIItem.WAX, 1) + .itemOut(to, 1); + + chemicalReactorRecipe.offerTo(output, "vanilla_recipes/chemical_reactor/waxing/" + BuiltInRegistries.ITEM.getKey(from).getPath()); + } + + public static class Runner extends RecipeProvider.Runner { + public Runner(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new VanillaCompatRecipeProvider(registries, output); + } + + @Override + public String getName() { + return "Vanilla Compat Recipes"; + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/recipe/VanillaCompatRecipesProvider.java b/src/main/java/aztech/modern_industrialization/datagen/recipe/VanillaCompatRecipesProvider.java deleted file mode 100644 index e8dff5ebf..000000000 --- a/src/main/java/aztech/modern_industrialization/datagen/recipe/VanillaCompatRecipesProvider.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.datagen.recipe; - -import aztech.modern_industrialization.MIFluids; -import aztech.modern_industrialization.MIItem; -import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.machines.recipe.MachineRecipeBuilder; -import aztech.modern_industrialization.recipe.json.ShapelessRecipeBuilder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; - -/** - * Datagen for recipes that produce vanilla materials using MI machines. - */ -public class VanillaCompatRecipesProvider extends MIRecipesProvider { - public VanillaCompatRecipesProvider(PackOutput packOutput) { - super(packOutput); - } - - @Override - public void buildRecipes(RecipeOutput exporter) { - generateCopperOxidation(exporter, Items.COPPER_BLOCK, Items.EXPOSED_COPPER, Items.WEATHERED_COPPER, Items.OXIDIZED_COPPER); - generateCopperOxidation(exporter, Items.CUT_COPPER, Items.EXPOSED_CUT_COPPER, Items.WEATHERED_CUT_COPPER, Items.OXIDIZED_CUT_COPPER); - generateCopperOxidation(exporter, Items.CUT_COPPER_SLAB, Items.EXPOSED_CUT_COPPER_SLAB, Items.WEATHERED_CUT_COPPER_SLAB, - Items.OXIDIZED_CUT_COPPER_SLAB); - generateCopperOxidation(exporter, Items.CUT_COPPER_STAIRS, Items.EXPOSED_CUT_COPPER_STAIRS, Items.WEATHERED_CUT_COPPER_STAIRS, - Items.OXIDIZED_CUT_COPPER_STAIRS); - // waxed variants - generateCopperOxidation(exporter, Items.WAXED_COPPER_BLOCK, Items.WAXED_EXPOSED_COPPER, Items.WAXED_WEATHERED_COPPER, - Items.WAXED_OXIDIZED_COPPER); - generateCopperOxidation(exporter, Items.WAXED_CUT_COPPER, Items.WAXED_EXPOSED_CUT_COPPER, Items.WAXED_WEATHERED_CUT_COPPER, - Items.WAXED_OXIDIZED_CUT_COPPER); - generateCopperOxidation(exporter, Items.WAXED_CUT_COPPER_SLAB, Items.WAXED_EXPOSED_CUT_COPPER_SLAB, Items.WAXED_WEATHERED_CUT_COPPER_SLAB, - Items.WAXED_OXIDIZED_CUT_COPPER_SLAB); - generateCopperOxidation(exporter, Items.WAXED_CUT_COPPER_STAIRS, Items.WAXED_EXPOSED_CUT_COPPER_STAIRS, - Items.WAXED_WEATHERED_CUT_COPPER_STAIRS, Items.WAXED_OXIDIZED_CUT_COPPER_STAIRS); - - // wax - generateWax(exporter, Items.COPPER_BLOCK, Items.WAXED_COPPER_BLOCK); - generateWax(exporter, Items.CUT_COPPER, Items.WAXED_CUT_COPPER); - generateWax(exporter, Items.CUT_COPPER_SLAB, Items.WAXED_CUT_COPPER_SLAB); - generateWax(exporter, Items.CUT_COPPER_STAIRS, Items.WAXED_CUT_COPPER_STAIRS); - generateWax(exporter, Items.EXPOSED_COPPER, Items.WAXED_EXPOSED_COPPER); - generateWax(exporter, Items.EXPOSED_CUT_COPPER, Items.WAXED_EXPOSED_CUT_COPPER); - generateWax(exporter, Items.EXPOSED_CUT_COPPER_SLAB, Items.WAXED_EXPOSED_CUT_COPPER_SLAB); - generateWax(exporter, Items.EXPOSED_CUT_COPPER_STAIRS, Items.WAXED_EXPOSED_CUT_COPPER_STAIRS); - generateWax(exporter, Items.WEATHERED_COPPER, Items.WAXED_WEATHERED_COPPER); - generateWax(exporter, Items.WEATHERED_CUT_COPPER, Items.WAXED_WEATHERED_CUT_COPPER); - generateWax(exporter, Items.WEATHERED_CUT_COPPER_SLAB, Items.WAXED_WEATHERED_CUT_COPPER_SLAB); - generateWax(exporter, Items.WEATHERED_CUT_COPPER_STAIRS, Items.WAXED_WEATHERED_CUT_COPPER_STAIRS); - generateWax(exporter, Items.OXIDIZED_COPPER, Items.WAXED_OXIDIZED_COPPER); - generateWax(exporter, Items.OXIDIZED_CUT_COPPER, Items.WAXED_OXIDIZED_CUT_COPPER); - generateWax(exporter, Items.OXIDIZED_CUT_COPPER_SLAB, Items.WAXED_OXIDIZED_CUT_COPPER_SLAB); - generateWax(exporter, Items.OXIDIZED_CUT_COPPER_STAIRS, Items.WAXED_OXIDIZED_CUT_COPPER_STAIRS); - - // misc recipes - new MachineRecipeBuilder(MIMachineRecipeTypes.MACERATOR, 2, 100) - .addItemInput(Items.STONE, 1) - .addItemOutput(Items.COBBLESTONE, 1) - .offerTo(exporter, "vanilla_recipes/macerator/stone_to_cobblestone"); - } - - private void generateCopperOxidation(RecipeOutput exporter, Item unaffected, Item exposed, Item weathered, Item oxidized) { - oxidize(exporter, unaffected, exposed); - oxidize(exporter, exposed, weathered); - oxidize(exporter, weathered, oxidized); - } - - private void oxidize(RecipeOutput exporter, Item from, Item to) { - new MachineRecipeBuilder(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) - .addItemInput(from, 1) - .addFluidInput(MIFluids.OXYGEN, 100) - .addItemOutput(to, 1) - .offerTo(exporter, "vanilla_recipes/oxidation/" + BuiltInRegistries.ITEM.getKey(from).getPath()); - } - - private void generateWax(RecipeOutput exporter, Item from, Item to) { - var recipe = ShapelessRecipeBuilder.shapeless(to).requires(from).requires(MIItem.WAX); - recipe.offerTo(exporter, "vanilla_recipes/waxing/" + BuiltInRegistries.ITEM.getKey(from).getPath()); - - MachineRecipeBuilder chemicalReactorRecipe = new MachineRecipeBuilder(MIMachineRecipeTypes.CHEMICAL_REACTOR, 8, 100) - .addItemInput(from, 1) - .addItemInput(MIItem.WAX, 1) - .addItemOutput(to, 1); - - chemicalReactorRecipe.offerTo(exporter, "vanilla_recipes/chemical_reactor/waxing/" + BuiltInRegistries.ITEM.getKey(from).getPath()); - } -} diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/MIBlockTagProvider.java b/src/main/java/aztech/modern_industrialization/datagen/tag/MIBlockTagProvider.java index bccf35fe5..63bfcab75 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/tag/MIBlockTagProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/tag/MIBlockTagProvider.java @@ -32,19 +32,16 @@ import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.BlockTagsProvider; -import net.neoforged.neoforge.common.data.ExistingFileHelper; -import org.jspecify.annotations.Nullable; public class MIBlockTagProvider extends BlockTagsProvider { - public MIBlockTagProvider(PackOutput output, CompletableFuture lookupProvider, - @Nullable ExistingFileHelper existingFileHelper) { - super(output, lookupProvider, MI.ID, existingFileHelper); + public MIBlockTagProvider(PackOutput output, CompletableFuture lookupProvider) { + super(output, lookupProvider, MI.ID); } @Override @@ -68,7 +65,7 @@ protected void addTags(HolderLookup.Provider provider) { } var key = BlockTags.create(entry.getKey().location()); if (optional) { - tag(key).addOptional(itemKey); + tag(key).addOptional(block.get()); } else { tag(key).add(block.get()); } @@ -76,20 +73,20 @@ protected void addTags(HolderLookup.Provider provider) { } for (var entry : TagsToGenerate.tagToBeAddedToAnotherTag.entrySet()) { - var tagId = ResourceLocation.parse(entry.getKey()); for (var tag : entry.getValue()) { - if (this.builders.containsKey(ResourceLocation.parse(tag))) { - tag(key(tagId)).addTag(key(tag)); + // Skip item tag if it was already skipped above due to no item existing + if (this.builders.containsKey(tag.location())) { + tag(key(entry.getKey().location())).addTag(key(tag.location())); } } } } - private static TagKey key(ResourceLocation id) { + private static TagKey key(Identifier id) { return TagKey.create(BuiltInRegistries.BLOCK.key(), id); } private static TagKey key(String id) { - return key(ResourceLocation.parse(id)); + return key(Identifier.parse(id)); } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/MIFluidTagProvider.java b/src/main/java/aztech/modern_industrialization/datagen/tag/MIFluidTagProvider.java index 2d8c98f72..78744482e 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/tag/MIFluidTagProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/tag/MIFluidTagProvider.java @@ -31,16 +31,13 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.FluidTagsProvider; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.FluidTags; import net.neoforged.neoforge.common.Tags; -import net.neoforged.neoforge.common.data.ExistingFileHelper; -import org.jspecify.annotations.Nullable; public class MIFluidTagProvider extends FluidTagsProvider { - public MIFluidTagProvider(PackOutput output, CompletableFuture lookupProvider, - @Nullable ExistingFileHelper existingFileHelper) { - super(output, lookupProvider, MI.ID, existingFileHelper); + public MIFluidTagProvider(PackOutput output, CompletableFuture lookupProvider) { + super(output, lookupProvider, MI.ID); } @Override @@ -51,7 +48,7 @@ protected void addTags(HolderLookup.Provider pProvider) { } // Give a #c: tag to every MI fluid. That should allow other mods to use MI's fluids in many cases. - tag(FluidTags.create(ResourceLocation.fromNamespaceAndPath("c", def.path()))) + tag(FluidTags.create(Identifier.fromNamespaceAndPath("c", def.path()))) .add(def.asFluid()); } diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java b/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java index 532174f68..23ba4e568 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java @@ -28,7 +28,6 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIItem; import aztech.modern_industrialization.MITags; -import aztech.modern_industrialization.compat.ae2.MIAEAddon; import aztech.modern_industrialization.machines.blockentities.ReplicatorMachineBlockEntity; import aztech.modern_industrialization.materials.MIMaterials; import aztech.modern_industrialization.materials.part.MIParts; @@ -38,24 +37,24 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; -import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.neoforged.fml.ModList; import net.neoforged.neoforge.common.Tags; -import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ItemTagsProvider; import org.jspecify.annotations.Nullable; public class MIItemTagProvider extends ItemTagsProvider { private final boolean runtimeDatagen; public MIItemTagProvider(PackOutput output, CompletableFuture lookupProvider, - @Nullable ExistingFileHelper existingFileHelper, boolean runtimeDatagen) { - super(output, lookupProvider, CompletableFuture.completedFuture(TagLookup.empty()), MI.ID, existingFileHelper); + boolean runtimeDatagen) { + super(output, lookupProvider, MI.ID); this.runtimeDatagen = runtimeDatagen; } @@ -65,7 +64,7 @@ protected void addTags(HolderLookup.Provider provider) { boolean optional = TagsToGenerate.optionalTags.contains(entry.getKey()); for (var item : entry.getValue()) { if (optional) { - tag(entry.getKey()).addOptional(BuiltInRegistries.ITEM.getKey(item)); + tag(entry.getKey()).addOptional(item); } else { tag(entry.getKey()).add(item); } @@ -73,9 +72,8 @@ protected void addTags(HolderLookup.Provider provider) { } for (var entry : TagsToGenerate.tagToBeAddedToAnotherTag.entrySet()) { - var tagId = ResourceLocation.parse(entry.getKey()); for (var tag : entry.getValue()) { - tag(key(tagId)).addTag(key(tag)); + tag(entry.getKey()).addTag(tag); } } @@ -106,19 +104,20 @@ protected void addTags(HolderLookup.Provider provider) { tag(ItemTags.LEG_ARMOR).add(MIItem.QUANTUM_LEGGINGS.asItem()); tag(ItemTags.FOOT_ARMOR).add(MIItem.RUBBER_BOOTS.asItem(), MIItem.QUANTUM_BOOTS.asItem()); - tag(ItemTags.COALS).add(ResourceKey.create(Registries.ITEM, MI.id("lignite_coal"))); + tag(ItemTags.COALS).add(BuiltInRegistries.ITEM.getValue(MI.id("lignite_coal"))); if (ModList.get().isLoaded("ae2") && !runtimeDatagen) { - tag(P2PTunnelAttunement.getAttunementTag(MIAEAddon.ENERGY_P2P_TUNNEL)) - .add(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE).asItem()); + // TODO 26.1 +// tag(P2PTunnelAttunement.getAttunementTag(MIAEAddon.ENERGY_P2P_TUNNEL)) +// .add(MIMaterials.SUPERCONDUCTOR.getPart(MIParts.CABLE).asItem()); } } - private static TagKey key(ResourceLocation id) { + private static TagKey key(Identifier id) { return TagKey.create(BuiltInRegistries.ITEM.key(), id); } private static TagKey key(String id) { - return key(ResourceLocation.parse(id)); + return key(Identifier.parse(id)); } } diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/MIPoiTypeTagProvider.java b/src/main/java/aztech/modern_industrialization/datagen/tag/MIPoiTypeTagProvider.java index aa40410e7..22f134d34 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/tag/MIPoiTypeTagProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/tag/MIPoiTypeTagProvider.java @@ -31,13 +31,10 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.tags.PoiTypeTagsProvider; import net.minecraft.tags.PoiTypeTags; -import net.neoforged.neoforge.common.data.ExistingFileHelper; -import org.jspecify.annotations.Nullable; public class MIPoiTypeTagProvider extends PoiTypeTagsProvider { - public MIPoiTypeTagProvider(PackOutput output, CompletableFuture lookupProvider, - @Nullable ExistingFileHelper existingFileHelper) { - super(output, lookupProvider, MI.ID, existingFileHelper); + public MIPoiTypeTagProvider(PackOutput output, CompletableFuture lookupProvider) { + super(output, lookupProvider, MI.ID); } @Override diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/MIVillagerTradesTagProvider.java b/src/main/java/aztech/modern_industrialization/datagen/tag/MIVillagerTradesTagProvider.java new file mode 100644 index 000000000..576004630 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/datagen/tag/MIVillagerTradesTagProvider.java @@ -0,0 +1,54 @@ +package aztech.modern_industrialization.datagen.tag; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.trading.MITradeTags; +import aztech.modern_industrialization.trading.MITrades; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.KeyTagProvider; +import net.minecraft.world.item.trading.VillagerTrade; + +import java.util.concurrent.CompletableFuture; + +public class MIVillagerTradesTagProvider extends KeyTagProvider { + public MIVillagerTradesTagProvider(PackOutput output, CompletableFuture lookupProvider) { + super(output, Registries.VILLAGER_TRADE, lookupProvider, MI.ID); + } + + @Override + protected void addTags(HolderLookup.Provider registries) { + tag(MITradeTags.INDUSTRIALIST_LEVEL_1) + .add(MITrades.INDUSTRIALIST_1_LIGNITE_EMERALD) + .add(MITrades.INDUSTRIALIST_1_EMERALD_FIRE_CLAY) + .add(MITrades.INDUSTRIALIST_1_EMERALD_STEEL_HAMMER) + .add(MITrades.INDUSTRIALIST_1_EMERALD_COPPER) + .add(MITrades.INDUSTRIALIST_1_EMERALD_TIN); + + tag(MITradeTags.INDUSTRIALIST_LEVEL_2) + .add(MITrades.INDUSTRIALIST_2_EMERALD_COPPER_GEAR) + .add(MITrades.INDUSTRIALIST_2_EMERALD_COPPER_ROTOR) + .add(MITrades.INDUSTRIALIST_2_EMERALD_BRONZE_INGOT) + .add(MITrades.INDUSTRIALIST_2_EMERALD_RUBBER_SHEET) + .add(MITrades.INDUSTRIALIST_2_SULFUR_DUST_EMERALD); + + tag(MITradeTags.INDUSTRIALIST_LEVEL_3) + .add(MITrades.INDUSTRIALIST_3_EMERALD_BRONZE_GEAR) + .add(MITrades.INDUSTRIALIST_3_EMERALD_BRONZE_ROTOR) + .add(MITrades.INDUSTRIALIST_3_EMERALD_STEEL_INGOT) + .add(MITrades.INDUSTRIALIST_3_ITEM_PIPE_EMERALD) + .add(MITrades.INDUSTRIALIST_3_FLUID_PIPE_EMERALD); + + tag(MITradeTags.INDUSTRIALIST_LEVEL_4) + .add(MITrades.INDUSTRIALIST_4_EMERALD_STEEL_GEAR) + .add(MITrades.INDUSTRIALIST_4_EMERALD_STEEL_PLATE) + .add(MITrades.INDUSTRIALIST_4_EMERALD_STEEL_UPGRADE) + .add(MITrades.INDUSTRIALIST_4_COPPER_CABLE_EMERALD) + .add(MITrades.INDUSTRIALIST_4_TIN_CABLE_EMERALD); + + tag(MITradeTags.INDUSTRIALIST_LEVEL_5) + .add(MITrades.INDUSTRIALIST_5_EMERALD_ANALOG_CIRCUIT) + .add(MITrades.INDUSTRIALIST_5_EMERALD_MOTOR) + .add(MITrades.INDUSTRIALIST_5_EMERALD_BRONZE_DRILL); + } +} diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/TagsToGenerate.java b/src/main/java/aztech/modern_industrialization/datagen/tag/TagsToGenerate.java index 63cd7a9fe..3ad5fc74a 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/tag/TagsToGenerate.java +++ b/src/main/java/aztech/modern_industrialization/datagen/tag/TagsToGenerate.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.MIItem; import java.util.*; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -37,7 +37,7 @@ public class TagsToGenerate { private static final Map, List> tagToItemMap = new HashMap<>(); static final Set> optionalTags = new HashSet<>(); public static final Map tagTranslations = new HashMap<>(); - static final Map> tagToBeAddedToAnotherTag = new HashMap<>(); + static final Map, Set>> tagToBeAddedToAnotherTag = new HashMap<>(); static Map, List> getTags() { var ret = HashMap., List>newHashMap(tagToItemMap.size()); @@ -63,16 +63,13 @@ static Map, List> getTags() { return ret; } - private static void addTranslation(String tag, String tagEnglishName) { - var tagId = ResourceLocation.parse(tag); - tagTranslations.put("tag.%s.%s".formatted(tagId.getNamespace(), tagId.getPath()).replace('/', '.'), tagEnglishName); + private static void addTranslation(TagKey tag, String tagEnglishName) { + var tagId = tag.location(); + tagTranslations.put("tag.item.%s.%s".formatted(tagId.getNamespace(), tagId.getPath()).replace('/', '.'), tagEnglishName); } - public static void generateTag(String tag, ItemLike item, String tagEnglishName) { - if (tag.startsWith("#")) { - throw new IllegalArgumentException("Tag must not start with #: " + tag); - } - generateTagNoTranslation(ItemTags.create(ResourceLocation.parse(tag)), item); + public static void generateTag(TagKey tag, ItemLike item, String tagEnglishName) { + generateTagNoTranslation(tag, item); addTranslation(tag, tagEnglishName); } @@ -80,22 +77,13 @@ public static void generateTagNoTranslation(TagKey tag, ItemLike item) { tagToItemMap.computeIfAbsent(tag, t -> new ArrayList<>()).add(item); } - public static void addTagToTag(String tagTobeAdded, String tagTarget, String targetEnglishName) { - if (tagTobeAdded.startsWith("#")) { - throw new IllegalArgumentException("Tag must not start with #: " + tagTobeAdded); - } - if (tagTarget.startsWith("#")) { - throw new IllegalArgumentException("Tag must not start with #: " + tagTarget); - } + private static final Comparator> TAG_COMPARATOR = Comparator.comparing(TagKey::location); - tagToBeAddedToAnotherTag.computeIfAbsent(tagTarget, t -> new TreeSet<>()).add(tagTobeAdded); + public static void addTagToTag(TagKey tagTobeAdded, TagKey tagTarget, String targetEnglishName) { + tagToBeAddedToAnotherTag.computeIfAbsent(tagTarget, t -> new TreeSet<>(TAG_COMPARATOR)).add(tagTobeAdded); addTranslation(tagTarget, targetEnglishName); } - public static void generateTag(TagKey tag, ItemLike item, String tagEnglishName) { - generateTag(tag.location().toString(), item, tagEnglishName); - } - public static void markTagOptional(TagKey tag) { optionalTags.add(tag); } diff --git a/src/main/java/aztech/modern_industrialization/datagen/translation/TranslationProvider.java b/src/main/java/aztech/modern_industrialization/datagen/translation/TranslationProvider.java index 786630f08..ba34c673e 100644 --- a/src/main/java/aztech/modern_industrialization/datagen/translation/TranslationProvider.java +++ b/src/main/java/aztech/modern_industrialization/datagen/translation/TranslationProvider.java @@ -44,7 +44,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.CompletableFuture; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; @@ -73,13 +73,13 @@ public void addTranslation(String key, String englishValue) { private void addManualEntries() { addTranslation("block.modern_industrialization.pipe", "Pipe(s)"); - addTranslation("entity.minecraft.villager.modern_industrialization.industrialist", "Industrialist"); + addTranslation("entity.modern_industrialization.villager.industrialist", "Industrialist"); addTranslation("key.categories.modern_industrialization.modern_industrialization", "Modern Industrialization"); addTranslation("key.modern_industrialization.toggle_flight", "Toggle Flight"); addTranslation("key.modern_industrialization.toggle_3x3", "Toggle 3x3 Mining"); addTranslation("text.autoconfig.modern_industrialization.title", "Modern Industrialization Menu"); - addTranslation("tag.modern_industrialization.replicator_blacklist", "Replicator Blacklist"); + addTranslation("tag.item.modern_industrialization.replicator_blacklist", "Replicator Blacklist"); addTranslation("config.jade.plugin_modern_industrialization.overclock", "Machine Overclock"); addTranslation("config.jade.plugin_modern_industrialization.pipe", "Pipe Information"); diff --git a/src/main/java/aztech/modern_industrialization/debug/DebugCommands.java b/src/main/java/aztech/modern_industrialization/debug/DebugCommands.java index 3ea819d05..222238a16 100644 --- a/src/main/java/aztech/modern_industrialization/debug/DebugCommands.java +++ b/src/main/java/aztech/modern_industrialization/debug/DebugCommands.java @@ -26,8 +26,8 @@ import static net.minecraft.commands.Commands.argument; import static net.minecraft.commands.Commands.literal; -import static net.minecraft.commands.arguments.ResourceLocationArgument.getId; -import static net.minecraft.commands.arguments.ResourceLocationArgument.id; +import static net.minecraft.commands.arguments.IdentifierArgument.getId; +import static net.minecraft.commands.arguments.IdentifierArgument.id; import static net.minecraft.commands.arguments.coordinates.BlockPosArgument.blockPos; import static net.minecraft.commands.arguments.coordinates.BlockPosArgument.getLoadedBlockPos; @@ -38,6 +38,7 @@ import aztech.modern_industrialization.pipes.MIPipes; import aztech.modern_industrialization.pipes.api.PipeNetworkType; import aztech.modern_industrialization.pipes.impl.PipeNetworks; +import aztech.modern_industrialization.stats.PlayerStatistics; import aztech.modern_industrialization.stats.PlayerStatisticsData; import com.mojang.brigadier.Command; import com.mojang.brigadier.exceptions.CommandSyntaxException; @@ -46,10 +47,12 @@ import com.mojang.logging.LogUtils; import java.io.IOException; import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.core.BlockPos; +import net.minecraft.nbt.NbtOps; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.block.Blocks; @@ -69,7 +72,7 @@ public static void init() { } event.getDispatcher().register(literal("mi") - .requires(source -> source.hasPermission(4)) + .requires(Commands.hasPermission(Commands.LEVEL_ADMINS)) .then(literal("pipes") .then(argument("pos", blockPos()) .then(literal("clear") @@ -135,7 +138,7 @@ private static int clearPipes(CommandSourceStack src, BlockPos pos) { return Command.SINGLE_SUCCESS; } - private static int addGhostPipe(CommandSourceStack src, BlockPos pos, ResourceLocation pipeType) throws CommandSyntaxException { + private static int addGhostPipe(CommandSourceStack src, BlockPos pos, Identifier pipeType) throws CommandSyntaxException { PipeNetworkType type = PipeNetworkType.get(pipeType); if (type == null) { throw new SimpleCommandExceptionType(Component.literal("Unknown pipe network type: " + pipeType)).create(); @@ -157,7 +160,7 @@ private static int addGhostPipe(CommandSourceStack src, BlockPos pos, ResourceLo } private static int claimMachines(ServerPlayer player) { - for (var level : player.server.getAllLevels()) { + for (var level : player.level().getServer().getAllLevels()) { var chunkSource = level.getChunkSource(); for (var pos : chunkSource.chunkMap.updatingChunkMap.keySet()) { var chunk = chunkSource.getChunk(ChunkPos.getX(pos), ChunkPos.getZ(pos), false); @@ -176,8 +179,9 @@ private static int claimMachines(ServerPlayer player) { } private static int dumpStats(ServerPlayer player) { - player.displayClientMessage(Component.literal( - PlayerStatisticsData.get(player.server).get(player).toTag().toString()), false); + var stats = PlayerStatisticsData.get(player.server).get(player); + var statsTag = PlayerStatistics.CODEC.encodeStart(NbtOps.INSTANCE, stats).getOrThrow(); + player.displayClientMessage(Component.literal(statsTag.toString()), false); return Command.SINGLE_SUCCESS; } diff --git a/src/main/java/aztech/modern_industrialization/definition/BlockDefinition.java b/src/main/java/aztech/modern_industrialization/definition/BlockDefinition.java index 69be49d4d..74491601c 100644 --- a/src/main/java/aztech/modern_industrialization/definition/BlockDefinition.java +++ b/src/main/java/aztech/modern_industrialization/definition/BlockDefinition.java @@ -26,18 +26,19 @@ import aztech.modern_industrialization.MIItem; import aztech.modern_industrialization.datagen.loot.MIBlockLoot; -import aztech.modern_industrialization.datagen.model.BaseModelProvider; import aztech.modern_industrialization.items.SortOrder; import java.util.List; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Supplier; + +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; import net.minecraft.tags.TagKey; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; -import net.neoforged.neoforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.registries.DeferredBlock; import org.jspecify.annotations.Nullable; @@ -45,7 +46,7 @@ public class BlockDefinition extends Definition implements Item private final DeferredBlock block; public final ItemDefinition blockItem; - public final BiConsumer modelGenerator; + public final BiConsumer modelGenerator; @Nullable public final MIBlockLoot blockLoot; public final List> tags; @@ -55,8 +56,8 @@ public class BlockDefinition extends Definition implements Item public BlockDefinition(String englishName, DeferredBlock block, BiFunction blockItemCtor, - BiConsumer modelGenerator, - BiConsumer itemModelGenerator, + BiConsumer modelGenerator, + BiConsumer itemModelGenerator, @Nullable MIBlockLoot blockLoot, List> tags, SortOrder sortOrder) { @@ -65,7 +66,7 @@ public BlockDefinition(String englishName, DeferredBlock block, this.blockItem = MIItem.item( englishName, path(), - s -> blockItemCtor.apply(block.get(), s), + p -> blockItemCtor.apply(block.get(), p.useBlockDescriptionPrefix()), itemModelGenerator, sortOrder); this.modelGenerator = modelGenerator; diff --git a/src/main/java/aztech/modern_industrialization/definition/Definition.java b/src/main/java/aztech/modern_industrialization/definition/Definition.java index 7549b1368..40fa5f1fc 100644 --- a/src/main/java/aztech/modern_industrialization/definition/Definition.java +++ b/src/main/java/aztech/modern_industrialization/definition/Definition.java @@ -28,19 +28,19 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public abstract class Definition { public static List TRANSLATABLE_DEFINITION = new ArrayList<>(); - private final ResourceLocation id; + private final Identifier id; private final String englishName; public String getEnglishName() { return englishName; } - public ResourceLocation getId() { + public Identifier getId() { return id; } diff --git a/src/main/java/aztech/modern_industrialization/definition/FluidDefinition.java b/src/main/java/aztech/modern_industrialization/definition/FluidDefinition.java index a4e9da05f..307279b2e 100644 --- a/src/main/java/aztech/modern_industrialization/definition/FluidDefinition.java +++ b/src/main/java/aztech/modern_industrialization/definition/FluidDefinition.java @@ -30,14 +30,13 @@ import aztech.modern_industrialization.fluid.MIBucketItem; import aztech.modern_industrialization.fluid.MIFluid; import aztech.modern_industrialization.fluid.MIFluidBlock; -import aztech.modern_industrialization.fluid.MIFluidType; import aztech.modern_industrialization.items.SortOrder; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import net.minecraft.world.item.BucketItem; import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class FluidDefinition extends Definition implements FluidLike { public static final int LOW_OPACITY = 180; @@ -48,7 +47,7 @@ public class FluidDefinition extends Definition implements FluidLike { private final DeferredHolder fluid; private DeferredBlock fluidBlock; private ItemDefinition bucketItemDefinition; - private DeferredHolder fluidType; + private DeferredHolder fluidType; public final int color; public final int opacity; @@ -63,7 +62,7 @@ public FluidDefinition(String englishName, String id, int color, int opacity, Fl this.isGas = isGas; fluid = MIFluids.FLUIDS.register(id, () -> new MIFluid(fluidBlock, bucketItemDefinition, fluidType, color)); - fluidBlock = MIBlock.BLOCKS.register(id, () -> new MIFluidBlock(color)); + fluidBlock = MIBlock.BLOCKS.registerBlock(id, p -> new MIFluidBlock(p, color)); bucketItemDefinition = MIItem.item(englishName + " Bucket", id + "_bucket", s -> new MIBucketItem(fluid.get(), color, s), SortOrder.BUCKETS); fluidType = MIFluids.FLUID_TYPES.register(id, @@ -73,7 +72,7 @@ public FluidDefinition(String englishName, String id, int color, int opacity, Fl if (isGas) { props.density(-1000); // Make it lighter than air! } - return new MIFluidType(fluidBlock, props); + return new FluidType(props); }); this.fluidTexture = texture; @@ -98,7 +97,11 @@ public BucketItem getBucket() { return bucketItemDefinition.asItem(); } - public FluidVariant variant() { - return FluidVariant.of(asFluid()); + public FluidType getFluidType() { + return fluidType.get(); + } + + public FluidResource resource() { + return FluidResource.of(asFluid()); } } diff --git a/src/main/java/aztech/modern_industrialization/definition/ItemDefinition.java b/src/main/java/aztech/modern_industrialization/definition/ItemDefinition.java index 014af91fa..5b804e37f 100644 --- a/src/main/java/aztech/modern_industrialization/definition/ItemDefinition.java +++ b/src/main/java/aztech/modern_industrialization/definition/ItemDefinition.java @@ -27,10 +27,11 @@ import aztech.modern_industrialization.items.SortOrder; import java.util.function.BiConsumer; import java.util.function.Consumer; + +import net.minecraft.client.data.models.ItemModelGenerators; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; -import net.neoforged.neoforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.registries.DeferredItem; import org.jspecify.annotations.Nullable; @@ -38,12 +39,12 @@ public class ItemDefinition extends Definition implements ItemLi private final DeferredItem item; public final SortOrder sortOrder; - public final BiConsumer modelGenerator; + public final BiConsumer modelGenerator; @Nullable private Consumer onItemRegistrationEvent; public ItemDefinition(String englishName, DeferredItem item, - BiConsumer modelGenerator, SortOrder sortOrder) { + BiConsumer modelGenerator, SortOrder sortOrder) { super(englishName, item.getId().getPath()); this.item = item; this.modelGenerator = modelGenerator; diff --git a/src/main/java/aztech/modern_industrialization/fluid/MIBucketItem.java b/src/main/java/aztech/modern_industrialization/fluid/MIBucketItem.java index 86c8429a4..54a6cbc9b 100644 --- a/src/main/java/aztech/modern_industrialization/fluid/MIBucketItem.java +++ b/src/main/java/aztech/modern_industrialization/fluid/MIBucketItem.java @@ -42,6 +42,6 @@ public MIBucketItem(MIFluid fluid, int color, Properties settings) { @Override public Component getName(ItemStack stack) { - return Component.translatable(this.getDescriptionId(stack)).setStyle(Style.EMPTY.withColor(TextColor.fromRgb(color))); + return Component.translatable(this.getDescriptionId()).setStyle(Style.EMPTY.withColor(TextColor.fromRgb(color))); } } diff --git a/src/main/java/aztech/modern_industrialization/fluid/MIFluid.java b/src/main/java/aztech/modern_industrialization/fluid/MIFluid.java index ad7f394fa..1f2180a4f 100644 --- a/src/main/java/aztech/modern_industrialization/fluid/MIFluid.java +++ b/src/main/java/aztech/modern_industrialization/fluid/MIFluid.java @@ -44,10 +44,10 @@ public class MIFluid extends Fluid { private final Supplier block; private final ItemLike bucketItem; - private final Supplier fluidType; + private final Supplier fluidType; public final int color; - public MIFluid(Supplier block, ItemLike bucketItem, Supplier fluidType, int color) { + public MIFluid(Supplier block, ItemLike bucketItem, Supplier fluidType, int color) { this.block = block; this.bucketItem = bucketItem; this.fluidType = fluidType; diff --git a/src/main/java/aztech/modern_industrialization/fluid/MIFluidBlock.java b/src/main/java/aztech/modern_industrialization/fluid/MIFluidBlock.java index b5211ccd6..37f3754ef 100644 --- a/src/main/java/aztech/modern_industrialization/fluid/MIFluidBlock.java +++ b/src/main/java/aztech/modern_industrialization/fluid/MIFluidBlock.java @@ -39,9 +39,9 @@ public class MIFluidBlock extends Block { private final int color; - public MIFluidBlock(int color) { + public MIFluidBlock(Properties properties, int color) { // .air() to make `FluidType#canBePlacedInLevel` return false - super(BlockBehaviour.Properties.of().mapColor(MapColor.WATER).replaceable().pushReaction(PushReaction.DESTROY).liquid().air()); + super(properties.mapColor(MapColor.WATER).replaceable().pushReaction(PushReaction.DESTROY).liquid().air()); this.color = FluidHelper.getColorMinLuminance(color); } diff --git a/src/main/java/aztech/modern_industrialization/fluid/MIFluidType.java b/src/main/java/aztech/modern_industrialization/fluid/MIFluidType.java deleted file mode 100644 index 2738d5378..000000000 --- a/src/main/java/aztech/modern_industrialization/fluid/MIFluidType.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.fluid; - -import aztech.modern_industrialization.MI; -import java.util.function.Consumer; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.material.Fluids; -import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions; -import net.neoforged.neoforge.fluids.FluidType; -import net.neoforged.neoforge.registries.DeferredBlock; -import org.jspecify.annotations.Nullable; - -public class MIFluidType extends FluidType { - private final DeferredBlock fluidBlock; - - public MIFluidType(DeferredBlock fluidBlock, Properties properties) { - super(properties); - this.fluidBlock = fluidBlock; - } - - @Override - public void initializeClient(Consumer consumer) { - consumer.accept(new IClientFluidTypeExtensions() { - private @Nullable ResourceLocation textureLocation; - - @Override - public ResourceLocation getStillTexture() { - if (textureLocation == null) { - textureLocation = MI.id("fluid/%s_still".formatted(fluidBlock.getId().getPath())); - } - return textureLocation; - } - - @Override - public ResourceLocation getFlowingTexture() { - return IClientFluidTypeExtensions.of(Fluids.WATER).getFlowingTexture(); - } - }); - } -} diff --git a/src/main/java/aztech/modern_industrialization/guidebook/GuideBookItem.java b/src/main/java/aztech/modern_industrialization/guidebook/GuideBookItem.java index 15f74320a..ce3686e0b 100644 --- a/src/main/java/aztech/modern_industrialization/guidebook/GuideBookItem.java +++ b/src/main/java/aztech/modern_industrialization/guidebook/GuideBookItem.java @@ -28,13 +28,16 @@ import aztech.modern_industrialization.util.TextHelper; import guideme.GuidesCommon; import java.util.List; +import java.util.function.Consumer; + import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.TooltipDisplay; import net.minecraft.world.level.Level; public class GuideBookItem extends Item { @@ -43,15 +46,15 @@ public GuideBookItem(Properties settings) { } @Override - public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { - if (world.isClientSide) { + public InteractionResult use(Level world, Player user, InteractionHand hand) { + if (world.isClientSide()) { GuidesCommon.openGuide(user, MIGuide.ID); } - return InteractionResultHolder.consume(user.getItemInHand(hand)); + return InteractionResult.CONSUME; } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipFlag flag) { - tooltip.add(MIText.BookSubtitle.text().setStyle(TextHelper.GRAY_TEXT)); + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { + tooltip.accept(MIText.BookSubtitle.text().setStyle(TextHelper.GRAY_TEXT)); } } diff --git a/src/main/java/aztech/modern_industrialization/guidebook/GuidebookEvents.java b/src/main/java/aztech/modern_industrialization/guidebook/GuidebookEvents.java index 15136ca4a..be52848d7 100644 --- a/src/main/java/aztech/modern_industrialization/guidebook/GuidebookEvents.java +++ b/src/main/java/aztech/modern_industrialization/guidebook/GuidebookEvents.java @@ -37,9 +37,9 @@ public static void init() { NeoForge.EVENT_BUS.addListener(PlayerEvent.PlayerLoggedInEvent.class, event -> { var player = event.getEntity(); if (MIServerConfig.INSTANCE.spawnWithGuideBook.getAsBoolean()) { - GuidebookPersistentState state = GuidebookPersistentState.get(player.getServer()); + GuidebookPersistentState state = GuidebookPersistentState.get(((ServerPlayer) player).level().getServer()); if (!state.hasPlayerReceivedGuidebook(player)) { - if (player.getInventory().add(new ItemStack(MIItem.GUIDE_BOOK))) { + if (player.getInventory().add(new ItemStack(MIItem.GUIDEBOOK))) { state.addPlayerReceivedGuidebook(player); } } @@ -50,7 +50,7 @@ public static void init() { NeoForge.EVENT_BUS.addListener(PlayerEvent.PlayerRespawnEvent.class, event -> { if (!event.isEndConquered() && MIServerConfig.INSTANCE.respawnWithGuideBook.getAsBoolean()) { - event.getEntity().getInventory().add(new ItemStack(MIItem.GUIDE_BOOK)); + event.getEntity().getInventory().add(new ItemStack(MIItem.GUIDEBOOK)); } }); } diff --git a/src/main/java/aztech/modern_industrialization/guidebook/GuidebookPersistentState.java b/src/main/java/aztech/modern_industrialization/guidebook/GuidebookPersistentState.java index 9d06a8c91..5a3cf9635 100644 --- a/src/main/java/aztech/modern_industrialization/guidebook/GuidebookPersistentState.java +++ b/src/main/java/aztech/modern_industrialization/guidebook/GuidebookPersistentState.java @@ -24,23 +24,31 @@ package aztech.modern_industrialization.guidebook; -import java.util.*; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.StringTag; -import net.minecraft.nbt.Tag; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import net.minecraft.core.UUIDUtil; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.saveddata.SavedData; +import net.minecraft.world.level.saveddata.SavedDataType; public class GuidebookPersistentState extends SavedData { - private static final Factory FACTORY = new Factory<>(GuidebookPersistentState::new, GuidebookPersistentState::fromNbt); - private static final String NAME = "modern_industrialization_guidebook"; - private final Set receivedPlayers; + private static final Codec CODEC = RecordCodecBuilder.create( + i -> i.group( + UUIDUtil.CODEC_SET.fieldOf("receivedPlayers").forGetter(s -> s.receivedPlayers)) + .apply(i, GuidebookPersistentState::new)); + private static final SavedDataType TYPE = new SavedDataType<>( + "modern_industrialization_guidebook", + GuidebookPersistentState::new, + CODEC); - private GuidebookPersistentState(Set receivedPlayers) { + private final Set receivedPlayers; + + private GuidebookPersistentState(Set receivedPlayers) { this.receivedPlayers = receivedPlayers; } @@ -49,35 +57,16 @@ private GuidebookPersistentState() { } public boolean hasPlayerReceivedGuidebook(Player player) { - return receivedPlayers.contains(player.getStringUUID()); + return receivedPlayers.contains(player.getUUID()); } public void addPlayerReceivedGuidebook(Player player) { - receivedPlayers.add(player.getStringUUID()); + receivedPlayers.add(player.getUUID()); setDirty(); } - public static GuidebookPersistentState fromNbt(CompoundTag tag, HolderLookup.Provider registries) { - Set receivedPlayers = new HashSet<>(); - ListTag list = tag.getList("receivedPlayers", Tag.TAG_STRING); - for (int i = 0; i < list.size(); ++i) { - receivedPlayers.add(list.getString(i)); - } - return new GuidebookPersistentState(receivedPlayers); - } - - @Override - public CompoundTag save(CompoundTag tag, HolderLookup.Provider registries) { - ListTag list = new ListTag(); - for (String receivedPlayer : receivedPlayers) { - list.add(StringTag.valueOf(receivedPlayer)); - } - tag.put("receivedPlayers", list); - return tag; - } - public static GuidebookPersistentState get(MinecraftServer server) { ServerLevel world = server.getLevel(ServerLevel.OVERWORLD); - return world.getDataStorage().computeIfAbsent(FACTORY, NAME); + return world.getDataStorage().computeIfAbsent(TYPE); } } diff --git a/src/main/java/aztech/modern_industrialization/guidebook/MIGuide.java b/src/main/java/aztech/modern_industrialization/guidebook/MIGuide.java index 5d28356b2..593b6fd56 100644 --- a/src/main/java/aztech/modern_industrialization/guidebook/MIGuide.java +++ b/src/main/java/aztech/modern_industrialization/guidebook/MIGuide.java @@ -27,10 +27,10 @@ import aztech.modern_industrialization.MI; import guideme.Guide; import guideme.scene.element.SceneElementTagCompiler; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MIGuide { - public static final ResourceLocation ID = MI.id("book"); + public static final Identifier ID = MI.id("book"); private static Guide guide; public static void init() { diff --git a/src/main/java/aztech/modern_industrialization/inventory/AbstractConfigurableStack.java b/src/main/java/aztech/modern_industrialization/inventory/AbstractConfigurableStack.java index 8df4321ae..9e9a27b45 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/AbstractConfigurableStack.java +++ b/src/main/java/aztech/modern_industrialization/inventory/AbstractConfigurableStack.java @@ -24,12 +24,11 @@ package aztech.modern_industrialization.inventory; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StoragePreconditions; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageView; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.ResourceAmount; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.SnapshotJournal; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; +import aztech.modern_industrialization.transfer.MIPreconditions; +import net.neoforged.neoforge.transfer.resource.DataComponentHolderResource; +import net.neoforged.neoforge.transfer.resource.ResourceStack; +import net.neoforged.neoforge.transfer.transaction.SnapshotJournal; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import aztech.modern_industrialization.util.Simulation; import java.util.IdentityHashMap; import java.util.List; @@ -38,14 +37,14 @@ import net.minecraft.core.HolderLookup; import net.minecraft.core.Registry; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.jspecify.annotations.Nullable; -public abstract class AbstractConfigurableStack> extends SnapshotJournal> - implements StorageView, ConfigurableSlot { +public abstract class AbstractConfigurableStack> extends SnapshotJournal> + implements ConfigurableSlot { private final Map listeners = new IdentityHashMap<>(); protected K key = getBlankVariant(); - protected long amount = 0; + protected int amount = 0; @Nullable protected T lockedInstance = null; protected boolean playerLocked = false; @@ -71,19 +70,17 @@ public AbstractConfigurableStack(AbstractConfigurableStack other) { this.pipesExtract = other.pipesExtract; } - public AbstractConfigurableStack(CompoundTag tag, HolderLookup.Provider registries) { - this.key = readVariantFromNbt(tag.getCompound("key"), registries); - this.amount = tag.getLong("amount"); - if (tag.contains("locked")) { - this.lockedInstance = getRegistry().get(ResourceLocation.parse(tag.getString("locked"))); - } - this.machineLocked = tag.getBoolean("machineLocked"); - this.playerLocked = tag.getBoolean("playerLocked"); - this.playerLockable = tag.getBoolean("playerLockable"); - this.playerInsert = tag.getBoolean("playerInsert"); - this.playerExtract = tag.getBoolean("playerExtract"); - this.pipesInsert = tag.getBoolean("pipesInsert"); - this.pipesExtract = tag.getBoolean("pipesExtract"); + protected AbstractConfigurableStack(K key, int amount, @Nullable T lockedInstance, boolean playerLocked, boolean machineLocked, boolean playerLockable, boolean playerInsert, boolean playerExtract, boolean pipesInsert, boolean pipesExtract) { + this.key = key; + this.amount = amount; + this.lockedInstance = lockedInstance; + this.playerLocked = playerLocked; + this.machineLocked = machineLocked; + this.playerLockable = playerLockable; + this.playerInsert = playerInsert; + this.playerExtract = playerExtract; + this.pipesInsert = pipesInsert; + this.pipesExtract = pipesExtract; } protected void notifyListeners() { @@ -102,13 +99,9 @@ public void removeListener(ChangeListener listener) { protected abstract K getBlankVariant(); - protected abstract Registry getRegistry(); - - protected abstract K readVariantFromNbt(CompoundTag compound, HolderLookup.Provider registries); - - protected abstract long getRemainingCapacityFor(K key); + protected abstract int getRemainingCapacityFor(K key); - public abstract long getTotalCapacityFor(T instance); + public abstract int getTotalCapacityFor(T instance); @Override public SlotConfig getConfig() { @@ -134,7 +127,7 @@ public int hashCode() { pipesExtract); } - public void setAmount(long amount) { + public void setAmount(int amount) { this.amount = amount; if (amount == 0) { this.key = getBlankVariant(); @@ -146,11 +139,11 @@ public void empty() { this.setAmount(0); } - public void increment(long amount) { + public void increment(int amount) { setAmount(this.amount + amount); } - public void decrement(long amount) { + public void decrement(int amount) { increment(-amount); } @@ -164,7 +157,7 @@ public boolean isResourceAllowedByLock(T instance) { } public boolean isResourceAllowedByLock(K key) { - return isResourceAllowedByLock(key.getObject()); + return isResourceAllowedByLock(key.value()); } public boolean canPlayerInsert() { @@ -227,7 +220,7 @@ private void updatedLockedInstance() { if (!machineLocked && !playerLocked) { lockedInstance = null; } else if (lockedInstance == null) { - lockedInstance = key.getObject(); + lockedInstance = key.value(); } notifyListeners(); } @@ -239,14 +232,14 @@ public boolean canPlayerLock() { /** * Lock range of stacks (without overriding existing locks). */ - public static > void playerLockNoOverride(T instance, long requiredAmount, + public static > void playerLockNoOverride(T instance, int requiredAmount, List> stacks) { for (int iter = 0; iter < 2; ++iter) { boolean allowEmptyStacks = iter == 1; for (AbstractConfigurableStack stack : stacks) { if (stack.lockedInstance == null || stack.lockedInstance == stack.getEmptyInstance()) { - if (stack.key.isOf(instance) || (stack.isResourceBlank() && allowEmptyStacks)) { + if (stack.key.is(instance) || (stack.isEmpty() && allowEmptyStacks)) { var capacity = stack.getTotalCapacityFor(instance); if (capacity <= 0) { continue; @@ -268,7 +261,7 @@ public static > void playerLockNoOverride(T inst * Try locking the slot to the given instance, return true if it succeeded */ public boolean playerLock(T instance, Simulation simulation) { - if (key.isBlank() || key.getObject() == instance) { + if (key.isEmpty() || key.is(instance)) { if (simulation.isActing()) { lockedInstance = instance; playerLocked = true; @@ -287,76 +280,33 @@ public boolean canPipesInsert() { return pipesInsert; } - @Override - public long extract(K key, long maxAmount, TransactionContext transaction) { - if (pipesExtract) { - return extractDirect(key, maxAmount, transaction); - } else { - return 0; - } - } - - public long extractDirect(K key, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notBlankNotNegative(key, maxAmount); - if (key.equals(this.key)) { - long extracted = Math.min(amount, maxAmount); - updateSnapshots(transaction); - decrement(extracted); - return extracted; - } - return 0; - } - - @Override - public boolean isResourceBlank() { - return key.isBlank(); - } - public boolean isEmpty() { - return isResourceBlank(); + return key.isEmpty(); } - @Override public K getResource() { return key; } - @Override - public long getAmount() { + public int getAmount() { return amount; } + public abstract int getCapacity(); + @Override - public ResourceAmount createSnapshot() { - return new ResourceAmount<>(key, amount); + public ResourceStack createSnapshot() { + return new ResourceStack<>(key, amount); } @Override - public void revertToSnapshot(ResourceAmount ra) { + public void revertToSnapshot(ResourceStack ra) { this.amount = ra.amount(); this.key = ra.resource(); } @Override - protected void onRootCommit(ResourceAmount originalState) { + protected void onRootCommit(ResourceStack originalState) { notifyListeners(); } - - public CompoundTag toNbt(HolderLookup.Provider registries) { - CompoundTag tag = new CompoundTag(); - tag.put("key", key.toNbt(registries)); - tag.putLong("amount", amount); - if (lockedInstance != null) { - tag.putString("locked", getRegistry().getKey(lockedInstance).toString()); - } - // TODO: more efficient encoding? - tag.putBoolean("machineLocked", machineLocked); - tag.putBoolean("playerLocked", playerLocked); - tag.putBoolean("playerLockable", playerLockable); - tag.putBoolean("playerInsert", playerInsert); - tag.putBoolean("playerExtract", playerExtract); - tag.putBoolean("pipesInsert", pipesInsert); - tag.putBoolean("pipesExtract", pipesExtract); - return tag; - } } diff --git a/src/main/java/aztech/modern_industrialization/inventory/BackgroundRenderedSlot.java b/src/main/java/aztech/modern_industrialization/inventory/BackgroundRenderedSlot.java index 8b6fbcebf..3b084ca87 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/BackgroundRenderedSlot.java +++ b/src/main/java/aztech/modern_industrialization/inventory/BackgroundRenderedSlot.java @@ -25,7 +25,7 @@ package aztech.modern_industrialization.inventory; import aztech.modern_industrialization.MI; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.jspecify.annotations.Nullable; /** @@ -33,10 +33,10 @@ */ public interface BackgroundRenderedSlot { /** - * @return the {@link ResourceLocation} of the slot atlas texture to use for the slot background. Return null to render no background. + * @return the {@link Identifier} of the slot atlas texture to use for the slot background. Return null to render no background. */ @Nullable - default ResourceLocation getBackgroundAtlasLocation() { + default Identifier getBackgroundAtlasLocation() { return MI.id("textures/gui/container/slot_atlas.png"); } diff --git a/src/main/java/aztech/modern_industrialization/inventory/ConfigurableFluidStack.java b/src/main/java/aztech/modern_industrialization/inventory/ConfigurableFluidStack.java index 50b513b33..5f8d8a523 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/ConfigurableFluidStack.java +++ b/src/main/java/aztech/modern_industrialization/inventory/ConfigurableFluidStack.java @@ -26,8 +26,7 @@ import aztech.modern_industrialization.api.machine.component.FluidAccess; import aztech.modern_industrialization.compat.viewer.ReiDraggable; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; +import aztech.modern_industrialization.util.MIExtraCodecs; import aztech.modern_industrialization.util.Simulation; import aztech.modern_industrialization.util.UnsupportedOperationInventory; import com.google.common.base.Preconditions; @@ -35,47 +34,74 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.netty.buffer.ByteBuf; import net.minecraft.core.HolderLookup; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.entity.SlotAccess; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; -import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.fluids.FluidUtil; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; import net.neoforged.neoforge.items.wrapper.PlayerMainInvWrapper; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.jspecify.annotations.Nullable; /** * A fluid stack that can be configured. */ -public class ConfigurableFluidStack extends AbstractConfigurableStack implements FluidAccess { - private long capacity; - - public ConfigurableFluidStack(long capacity) { +public class ConfigurableFluidStack extends AbstractConfigurableStack implements FluidAccess { + // TODO: more efficient encoding? + public static final Codec CODEC = RecordCodecBuilder.create( + i -> i.group( + FluidResource.OPTIONAL_CODEC.fieldOf("key").forGetter(s -> s.key), + ExtraCodecs.NON_NEGATIVE_INT.fieldOf("amount").forGetter(s -> s.amount), + BuiltInRegistries.FLUID.byNameCodec().optionalFieldOf("locked").forGetter(s -> Optional.ofNullable(s.lockedInstance)), + Codec.BOOL.fieldOf("machineLocked").forGetter(s -> s.machineLocked), + Codec.BOOL.fieldOf("playerLocked").forGetter(s -> s.playerLocked), + Codec.BOOL.fieldOf("playerLockable").forGetter(s -> s.playerLockable), + Codec.BOOL.fieldOf("playerInsert").forGetter(s -> s.playerInsert), + Codec.BOOL.fieldOf("playerExtract").forGetter(s -> s.playerExtract), + Codec.BOOL.fieldOf("pipesInsert").forGetter(s -> s.pipesInsert), + Codec.BOOL.fieldOf("pipesExtract").forGetter(s -> s.pipesExtract), + ExtraCodecs.NON_NEGATIVE_INT.fieldOf("capacity").forGetter(s -> s.capacity)) + .apply(i, ConfigurableFluidStack::new)); + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodecTrusted(CODEC); + public static final StreamCodec> LIST_STREAM_CODEC = STREAM_CODEC.apply(ByteBufCodecs.list()); + + private int capacity; + + public ConfigurableFluidStack(int capacity) { super(); this.capacity = capacity; } - public static ConfigurableFluidStack standardInputSlot(long capacity) { + public static ConfigurableFluidStack standardInputSlot(int capacity) { ConfigurableFluidStack stack = new ConfigurableFluidStack(capacity); stack.playerInsert = true; stack.pipesInsert = true; return stack; } - public static ConfigurableFluidStack standardOutputSlot(long capacity) { + public static ConfigurableFluidStack standardOutputSlot(int capacity) { ConfigurableFluidStack stack = new ConfigurableFluidStack(capacity); stack.pipesExtract = true; return stack; } - public static ConfigurableFluidStack standardIOSlot(long capacity, boolean pipeIO) { + public static ConfigurableFluidStack standardIOSlot(int capacity, boolean pipeIO) { ConfigurableFluidStack stack = new ConfigurableFluidStack(capacity); stack.playerInsert = true; if (pipeIO) { @@ -85,9 +111,9 @@ public static ConfigurableFluidStack standardIOSlot(long capacity, boolean pipeI return stack; } - public static ConfigurableFluidStack lockedInputSlot(long capacity, Fluid fluid) { + public static ConfigurableFluidStack lockedInputSlot(int capacity, Fluid fluid) { ConfigurableFluidStack stack = new ConfigurableFluidStack(capacity); - stack.key = FluidVariant.of(fluid); + stack.key = FluidResource.of(fluid); stack.lockedInstance = fluid; stack.playerInsert = true; stack.playerLockable = false; @@ -96,9 +122,9 @@ public static ConfigurableFluidStack lockedInputSlot(long capacity, Fluid fluid) return stack; } - public static ConfigurableFluidStack lockedOutputSlot(long capacity, Fluid fluid) { + public static ConfigurableFluidStack lockedOutputSlot(int capacity, Fluid fluid) { ConfigurableFluidStack stack = new ConfigurableFluidStack(capacity); - stack.key = FluidVariant.of(fluid); + stack.key = FluidResource.of(fluid); stack.lockedInstance = fluid; stack.playerLockable = false; stack.playerLocked = true; @@ -111,9 +137,9 @@ public ConfigurableFluidStack(ConfigurableFluidStack other) { this.capacity = other.capacity; } - public ConfigurableFluidStack(CompoundTag compound, HolderLookup.Provider registries) { - super(compound, registries); - this.capacity = compound.getLong("capacity"); + private ConfigurableFluidStack(FluidResource key, int amount, Optional lockedInstance, boolean playerLocked, boolean machineLocked, boolean playerLockable, boolean playerInsert, boolean playerExtract, boolean pipesInsert, boolean pipesExtract, int capacity) { + super(key, amount, lockedInstance.orElse(null), playerLocked, machineLocked, playerLockable, playerInsert, playerExtract, pipesInsert, pipesExtract); + this.capacity = capacity; } @Override @@ -145,8 +171,8 @@ public static ArrayList copyList(List getRegistry() { - return BuiltInRegistries.FLUID; - } - - @Override - protected FluidVariant readVariantFromNbt(CompoundTag compound, HolderLookup.Provider registries) { - return FluidVariant.fromNbt(compound, registries); - } - - @Override - public long getCapacity() { + public int getCapacity() { return capacity; } @Override - protected long getRemainingCapacityFor(FluidVariant key) { + protected int getRemainingCapacityFor(FluidResource key) { return getRemainingSpace(); } @Override - public long getTotalCapacityFor(Fluid instance) { + public int getTotalCapacityFor(Fluid instance) { return capacity; } - public void setAmount(long amount) { + public void setAmount(int amount) { super.setAmount(amount); if (amount > capacity) throw new IllegalStateException("amount > capacity in the fluid stack"); @@ -187,26 +203,20 @@ public void setAmount(long amount) { throw new IllegalStateException("amount < 0 in the fluid stack"); } - public void setCapacity(long capacity) { + public void setCapacity(int capacity) { Preconditions.checkArgument(capacity >= 0, "Fluid Capacity must be > 0"); this.capacity = capacity; if (amount > capacity) amount = capacity; } - public long getRemainingSpace() { + public int getRemainingSpace() { return capacity - amount; } - public CompoundTag toNbt(HolderLookup.Provider registries) { - CompoundTag tag = super.toNbt(registries); - tag.putLong("capacity", capacity); - return tag; - } - @Override - public FluidVariant getVariant() { - return getResource(); + public FluidResource getVariant() { + return FluidResource.of(getResource().toStack(1)); } public class ConfigurableFluidSlot extends Slot implements ReiDraggable, BackgroundRenderedSlot { @@ -236,12 +246,12 @@ public boolean mayPickup(Player playerEntity) { return false; } - public boolean canInsertFluid(FluidVariant fluid) { - FluidVariant storedFluid = getConfStack().getResource(); - return playerInsert && isResourceAllowedByLock(fluid.getFluid()) && (storedFluid.isBlank() || storedFluid.equals(fluid)); + public boolean canInsertFluid(FluidResource fluid) { + FluidResource storedFluid = getConfStack().getResource(); + return playerInsert && isResourceAllowedByLock(fluid.getFluid()) && (storedFluid.isEmpty() || storedFluid.equals(fluid)); } - public boolean canExtractFluid(FluidVariant fluid) { + public boolean canExtractFluid(FluidResource fluid) { return playerExtract; } @@ -263,12 +273,12 @@ public void setChanged() { } @Override - public boolean dragFluid(FluidVariant fluidKey, Simulation simulation) { - return playerLock(fluidKey.getFluid(), simulation); + public boolean dragFluid(FluidResource fluidResource, Simulation simulation) { + return playerLock(fluidResource.getFluid(), simulation); } @Override - public boolean dragItem(ItemVariant itemKey, Simulation simulation) { + public boolean dragItem(ItemResource itemResource, Simulation simulation) { return false; } @@ -278,13 +288,13 @@ public int getBackgroundU() { } public boolean playerInteract(SlotAccess slot, Player player, boolean allowSlotExtract) { - var fluidHandlerItem = slot.get().getCapability(Capabilities.FluidHandler.ITEM); + var fluidHandlerItem = FluidUtil.getFluidHandler(slot.get()).orElse(null); if (fluidHandlerItem == null) { return false; } // Copy contents into temporary IFluidHandler - var slotTank = new FluidTank(Ints.saturatedCast(getCapacity()), fs -> canInsertFluid(FluidVariant.of(fs))); + var slotTank = new FluidTank(Ints.saturatedCast(getCapacity()), fs -> canInsertFluid(FluidResource.of(fs))); slotTank.setFluid(getVariant().toStack(Ints.saturatedCast(getAmount()))); // Extract first @@ -297,13 +307,13 @@ public boolean playerInteract(SlotAccess slot, Player player, boolean allowSlotE true); if (extractResult.isSuccess()) { slot.set(extractResult.getResult()); - setKey(FluidVariant.of(slotTank.getFluid())); + setKey(FluidResource.of(slotTank.getFluid())); setAmount(slotTank.getFluidAmount()); return true; } // Otherwise insert - if (!allowSlotExtract || isEmpty() || !canExtractFluid(getVariant())) { + if (!allowSlotExtract || isEmpty() || !canExtractFluid(getResource())) { return false; } @@ -316,7 +326,7 @@ public boolean playerInteract(SlotAccess slot, Player player, boolean allowSlotE true); if (insertResult.isSuccess()) { slot.set(insertResult.getResult()); - setKey(FluidVariant.of(slotTank.getFluid())); + setKey(FluidResource.of(slotTank.getFluid())); setAmount(slotTank.getFluidAmount()); return true; } diff --git a/src/main/java/aztech/modern_industrialization/inventory/ConfigurableItemStack.java b/src/main/java/aztech/modern_industrialization/inventory/ConfigurableItemStack.java index 7e7a0e273..5499f0227 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/ConfigurableItemStack.java +++ b/src/main/java/aztech/modern_industrialization/inventory/ConfigurableItemStack.java @@ -26,42 +26,62 @@ import aztech.modern_industrialization.api.machine.component.ItemAccess; import aztech.modern_industrialization.compat.viewer.ReiDraggable; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; +import aztech.modern_industrialization.util.MIExtraCodecs; import aztech.modern_industrialization.util.Simulation; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.function.Predicate; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import io.netty.buffer.ByteBuf; import net.minecraft.core.HolderLookup; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.util.ExtraCodecs; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.jspecify.annotations.Nullable; /** * An item stack that can be configured. */ -public class ConfigurableItemStack extends AbstractConfigurableStack implements ItemAccess { +public class ConfigurableItemStack extends AbstractConfigurableStack implements ItemAccess { + // TODO: more efficient encoding? + public static final Codec CODEC = RecordCodecBuilder.create( + i -> i.group( + ItemResource.OPTIONAL_CODEC.fieldOf("key").forGetter(s -> s.key), + ExtraCodecs.NON_NEGATIVE_INT.fieldOf("amount").forGetter(s -> s.amount), + BuiltInRegistries.ITEM.byNameCodec().optionalFieldOf("locked").forGetter(s -> Optional.ofNullable(s.lockedInstance)), + Codec.BOOL.fieldOf("machineLocked").forGetter(s -> s.machineLocked), + Codec.BOOL.fieldOf("playerLocked").forGetter(s -> s.playerLocked), + Codec.BOOL.fieldOf("playerLockable").forGetter(s -> s.playerLockable), + Codec.BOOL.fieldOf("playerInsert").forGetter(s -> s.playerInsert), + Codec.BOOL.fieldOf("playerExtract").forGetter(s -> s.playerExtract), + Codec.BOOL.fieldOf("pipesInsert").forGetter(s -> s.pipesInsert), + Codec.BOOL.fieldOf("pipesExtract").forGetter(s -> s.pipesExtract), + ExtraCodecs.NON_NEGATIVE_INT.fieldOf("adjCap").forGetter(s -> s.adjustedCapacity)) + .apply(i, ConfigurableItemStack::new)); + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodecTrusted(CODEC); + public static final StreamCodec> LIST_STREAM_CODEC = STREAM_CODEC.apply(ByteBufCodecs.list()); + private int adjustedCapacity = 64; public ConfigurableItemStack() {} - public ConfigurableItemStack(CompoundTag compound, HolderLookup.Provider registries) { - super(compound, registries); - this.adjustedCapacity = compound.getInt("adjCap"); - } - - @Override - public CompoundTag toNbt(HolderLookup.Provider registries) { - CompoundTag nbt = super.toNbt(registries); - nbt.putInt("adjCap", this.adjustedCapacity); - return nbt; + private ConfigurableItemStack(ItemResource key, int amount, Optional lockedInstance, boolean playerLocked, boolean machineLocked, boolean playerLockable, boolean playerInsert, boolean playerExtract, boolean pipesInsert, boolean pipesExtract, int adjustedCapacity) { + super(key, amount, lockedInstance.orElse(null), playerLocked, machineLocked, playerLockable, playerInsert, playerExtract, pipesInsert, pipesExtract); + this.adjustedCapacity = adjustedCapacity; } public static ConfigurableItemStack standardInputSlot() { @@ -89,7 +109,7 @@ public static ConfigurableItemStack standardIOSlot(boolean pipeIO) { public static ConfigurableItemStack lockedInputSlot(Item item) { ConfigurableItemStack stack = new ConfigurableItemStack(); - stack.key = ItemVariant.of(item); + stack.key = ItemResource.of(item); stack.lockedInstance = item; stack.playerInsert = true; stack.playerLockable = false; @@ -121,8 +141,8 @@ public int hashCode() { } @Override - protected ItemVariant getBlankVariant() { - return ItemVariant.blank(); + protected ItemResource getBlankVariant() { + return ItemResource.EMPTY; } @Override @@ -131,22 +151,12 @@ protected Item getEmptyInstance() { } @Override - protected Registry getRegistry() { - return BuiltInRegistries.ITEM; - } - - @Override - protected ItemVariant readVariantFromNbt(CompoundTag compound, HolderLookup.Provider registries) { - return ItemVariant.fromNbt(compound, registries); - } - - @Override - public long getCapacity() { - return key.isBlank() ? adjustedCapacity : Math.min(adjustedCapacity, key.getMaxStackSize()); + public int getCapacity() { + return key.isEmpty() ? adjustedCapacity : Math.min(adjustedCapacity, key.getMaxStackSize()); } @Override - public long getRemainingCapacityFor(ItemVariant key) { + public int getRemainingCapacityFor(ItemResource key) { if (adjustedCapacity < amount) { return 0; // Make sure we don't get negative counts if this happens! } @@ -154,8 +164,9 @@ public long getRemainingCapacityFor(ItemVariant key) { } @Override - public long getTotalCapacityFor(Item instance) { - return Math.min(ItemVariant.of(instance).getMaxStackSize(), adjustedCapacity); + public int getTotalCapacityFor(Item instance) { + // TODO: should be made stack-aware + return Math.min(instance.getDefaultMaxStackSize(), adjustedCapacity); } /** @@ -187,7 +198,7 @@ public int getAdjustedCapacity() { } @Override - public ItemVariant getVariant() { + public ItemResource getVariant() { return getResource(); } @@ -229,7 +240,7 @@ protected ItemStack getRealStack() { @Override protected void setRealStack(ItemStack stack) { - key = ItemVariant.of(stack); + key = ItemResource.of(stack); amount = stack.getCount(); notifyListeners(); markDirty.run(); @@ -241,13 +252,13 @@ public int getMaxStackSize() { } @Override - public boolean dragFluid(FluidVariant fluidKey, Simulation simulation) { + public boolean dragFluid(FluidResource fluidResource, Simulation simulation) { return false; } @Override - public boolean dragItem(ItemVariant itemKey, Simulation simulation) { - return playerLock(itemKey.getItem(), simulation); + public boolean dragItem(ItemResource itemResource, Simulation simulation) { + return playerLock(itemResource.getItem(), simulation); } @Override diff --git a/src/main/java/aztech/modern_industrialization/inventory/ConfigurableScreenHandler.java b/src/main/java/aztech/modern_industrialization/inventory/ConfigurableScreenHandler.java index 2fd9fbe21..c9f67faf2 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/ConfigurableScreenHandler.java +++ b/src/main/java/aztech/modern_industrialization/inventory/ConfigurableScreenHandler.java @@ -34,11 +34,10 @@ import java.util.Set; import java.util.function.Predicate; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.SlotAccess; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.ClickType; +import net.minecraft.world.inventory.ContainerInput; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; @@ -107,11 +106,11 @@ public void broadcastChanges() { } @Override - public void clicked(int i, int j, ClickType actionType, Player player) { + public void clicked(int i, int j, ContainerInput actionType, Player player) { if (i >= 0) { Slot slot = this.slots.get(i); if (slot instanceof ConfigurableFluidStack.ConfigurableFluidSlot fluidSlot) { - if (actionType != ClickType.PICKUP) { + if (actionType != ContainerInput.PICKUP) { return; } ConfigurableFluidStack fluidStack = fluidSlot.getConfStack(); @@ -156,7 +155,7 @@ protected void handleShiftClick(Player player, int slotIndex) { if (slot.hasItem() && slot.mayPickup(player)) { if (slotIndex < PLAYER_SLOTS) { // from player to container inventory // try to shift-click fluid first - var ctx = SlotAccess.forContainer(player.getInventory(), slot.getContainerSlot()); + var ctx = player.getInventory().getSlot(slot.getContainerSlot()); for (var maybeFluidSlot : slots) { if (maybeFluidSlot instanceof ConfigurableFluidStack.ConfigurableFluidSlot fluidSlot && fluidSlot.playerInteract(ctx, player, false)) { diff --git a/src/main/java/aztech/modern_industrialization/inventory/MIFluidStorage.java b/src/main/java/aztech/modern_industrialization/inventory/MIFluidStorage.java index e48b79bab..1c3c9d80e 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/MIFluidStorage.java +++ b/src/main/java/aztech/modern_industrialization/inventory/MIFluidStorage.java @@ -24,89 +24,12 @@ package aztech.modern_industrialization.inventory; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageUtil; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import com.google.common.primitives.Ints; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import java.util.List; import net.minecraft.world.level.material.Fluid; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; - -public class MIFluidStorage extends MIStorage { - public final IFluidHandler fluidHandler = new FluidHandler(); +public class MIFluidStorage extends MIStorage { public MIFluidStorage(List stacks) { super(stacks, true); } - - public class FluidHandler implements IFluidHandler { - @Override - public int getTanks() { - return stacks.size(); - } - - @Override - public FluidStack getFluidInTank(int tank) { - var stack = stacks.get(tank); - return stack.getVariant().toStack(Ints.saturatedCast(stack.getAmount())); - } - - @Override - public int getTankCapacity(int tank) { - return Ints.saturatedCast(stacks.get(tank).getCapacity()); - } - - @Override - public boolean isFluidValid(int tank, FluidStack stack) { - return stacks.get(tank).isResourceAllowedByLock(stack.getFluid()); - } - - @Override - public int fill(FluidStack resource, FluidAction action) { - if (resource.isEmpty()) { - return 0; - } - try (var tx = Transaction.hackyOpen()) { - long result = insert(FluidVariant.of(resource), resource.getAmount(), tx); - if (result > 0 && action.execute()) { - tx.commit(); - } - return (int) result; - } - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - if (resource.isEmpty()) { - return FluidStack.EMPTY; - } - try (var tx = Transaction.hackyOpen()) { - long result = extract(FluidVariant.of(resource), resource.getAmount(), tx); - if (result > 0 && action.execute()) { - tx.commit(); - } - var ret = resource.copy(); - ret.setAmount((int) result); - return ret; - } - } - - @Override - public FluidStack drain(int maxDrain, FluidAction action) { - if (maxDrain <= 0) { - return FluidStack.EMPTY; - } - try (var tx = Transaction.hackyOpen()) { - var result = StorageUtil.extractAny(MIFluidStorage.this, maxDrain, tx); - if (result == null) { - return FluidStack.EMPTY; - } - if (action.execute()) { - tx.commit(); - } - return result.resource().toStack((int) result.amount()); - } - } - } } diff --git a/src/main/java/aztech/modern_industrialization/inventory/MIInventory.java b/src/main/java/aztech/modern_industrialization/inventory/MIInventory.java index 4814f4ee0..8eacb6f54 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/MIInventory.java +++ b/src/main/java/aztech/modern_industrialization/inventory/MIInventory.java @@ -32,10 +32,10 @@ import java.util.List; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.capabilities.BlockCapabilityCache; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.fluids.capability.IFluidHandler; @@ -87,55 +87,59 @@ public List getFluidStacks() { } public void autoExtractItems(Level world, BlockPos pos, Direction direction) { - // The second check is needed in case we change the output side... - boolean updateCache = outputCache == null || outputCache.context() != direction.getOpposite(); - - if (updateCache) { - outputCache = BlockCapabilityCache.create(Capabilities.ItemHandler.BLOCK, (ServerLevel) world, pos.relative(direction), - direction.getOpposite()); - } - - var target = outputCache.getCapability(); - if (target != null) { - TransferHelper.moveAll(itemStorage.itemHandler, target, true); - } + // TODO 26.1 +// // The second check is needed in case we change the output side... +// boolean updateCache = outputCache == null || outputCache.context() != direction.getOpposite(); +// +// if (updateCache) { +// outputCache = BlockCapabilityCache.create(Capabilities.ItemHandler.BLOCK, (ServerLevel) world, pos.relative(direction), +// direction.getOpposite()); +// } +// +// var target = outputCache.getCapability(); +// if (target != null) { +// TransferHelper.moveAll(itemStorage.itemHandler, target, true); +// } } public void autoExtractFluids(Level world, BlockPos pos, Direction direction) { - IFluidHandler target = world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite()); - - if (target != null) { - TransferHelper.tryFluidTransfer(target, fluidStorage.fluidHandler, Integer.MAX_VALUE, true); - } + // TODO 26.1 +// IFluidHandler target = world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite()); +// +// if (target != null) { +// TransferHelper.tryFluidTransfer(target, fluidStorage.fluidHandler, Integer.MAX_VALUE, true); +// } } public void autoInsertItems(Level world, BlockPos pos, Direction direction) { - IItemHandler target = world.getCapability(Capabilities.ItemHandler.BLOCK, pos.relative(direction), direction.getOpposite()); - - if (target != null) { - TransferHelper.moveAll(target, itemStorage.itemHandler, false); - } + // TODO 26.1 +// IItemHandler target = world.getCapability(Capabilities.ItemHandler.BLOCK, pos.relative(direction), direction.getOpposite()); +// +// if (target != null) { +// TransferHelper.moveAll(target, itemStorage.itemHandler, false); +// } } public void autoInsertFluids(Level world, BlockPos pos, Direction direction) { - IFluidHandler target = world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite()); - - if (target != null) { - TransferHelper.tryFluidTransfer(fluidStorage.fluidHandler, target, Integer.MAX_VALUE, true); - } + // TODO 26.1 +// IFluidHandler target = world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite()); +// +// if (target != null) { +// TransferHelper.tryFluidTransfer(fluidStorage.fluidHandler, target, Integer.MAX_VALUE, true); +// } } - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - NbtHelper.putList(tag, "items", itemStorage.stacks, configurableItemStack -> configurableItemStack.toNbt(registries)); - NbtHelper.putList(tag, "fluids", fluidStorage.stacks, configurableFluidStack -> configurableFluidStack.toNbt(registries)); + public void writeNbt(ValueOutput output) { + NbtHelper.putList(output, "items", itemStorage.stacks, ConfigurableItemStack.CODEC); + NbtHelper.putList(output, "fluids", fluidStorage.stacks, ConfigurableFluidStack.CODEC); } - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { + public void readNbt(ValueInput input, boolean isUpgradingMachine) { List newItemStacks = new ArrayList<>(); List newFluidStacks = new ArrayList<>(); - NbtHelper.getList(tag, "items", newItemStacks, t -> new ConfigurableItemStack(t, registries)); - NbtHelper.getList(tag, "fluids", newFluidStacks, t -> new ConfigurableFluidStack(t, registries)); + NbtHelper.getList(input, "items", newItemStacks, ConfigurableItemStack.CODEC); + NbtHelper.getList(input, "fluids", newFluidStacks, ConfigurableFluidStack.CODEC); if (isUpgradingMachine) { // Increase fluid slot capacities if upgrading diff --git a/src/main/java/aztech/modern_industrialization/inventory/MIItemStorage.java b/src/main/java/aztech/modern_industrialization/inventory/MIItemStorage.java index 02aad8399..9ad8f8297 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/MIItemStorage.java +++ b/src/main/java/aztech/modern_industrialization/inventory/MIItemStorage.java @@ -24,117 +24,33 @@ package aztech.modern_industrialization.inventory; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import com.google.common.primitives.Ints; +import net.neoforged.neoforge.transfer.item.ItemResource; import java.util.List; import java.util.Set; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.neoforged.neoforge.items.IItemHandler; - -public class MIItemStorage extends MIStorage { - public final IItemHandler itemHandler = new ItemHandler(); +public class MIItemStorage extends MIStorage implements WhitelistedItemStorage { public MIItemStorage(List stacks) { super(stacks, false); } - public class ItemHandler implements IItemHandler, WhitelistedItemStorage { - @Override - public int getSlots() { - return stacks.size(); - } - - @Override - public ItemStack getStackInSlot(int slot) { - return stacks.get(slot).getVariant().toStack(Ints.saturatedCast(stacks.get(slot).getAmount())); - } - - @Override - public ItemStack insertItem(int slot, ItemStack item, boolean simulate) { - if (item.isEmpty()) { - return ItemStack.EMPTY; - } - - var stack = stacks.get(slot); - if (!stack.pipesInsert) { - return item; - } - - ItemVariant resource = ItemVariant.of(item); - - boolean canInsert; - - if (stack.getAmount() == 0) { - // If the amount is 0, we check if the lock allows it. - canInsert = stack.isResourceAllowedByLock(resource); - } else { - // Otherwise we check that the resources match exactly. - canInsert = stack.getResource().equals(resource); - } - - if (canInsert) { - long inserted = Math.min(item.getCount(), stack.getRemainingCapacityFor(resource)); - - if (inserted > 0 && !simulate) { - stack.setKey(resource); - stack.increment(inserted); - } - - return inserted == item.getCount() ? ItemStack.EMPTY : resource.toStack((int) (item.getCount() - inserted)); + @Override + public boolean currentlyWhitelisted() { + // Only whitelisted if everything is locked. + for (ConfigurableItemStack stack : stacks) { + if (stack.pipesInsert && stack.getLockedInstance() == null) { + return false; } - - return item; - } - - @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - if (amount <= 0) { - return ItemStack.EMPTY; - } - try (var tx = Transaction.hackyOpen()) { - var variant = stacks.get(slot).getVariant(); - if (variant.isBlank()) { - return ItemStack.EMPTY; - } - - long result = stacks.get(slot).extract(variant, amount, tx); - if (result > 0 && !simulate) { - tx.commit(); - } - return result == 0 ? ItemStack.EMPTY : variant.toStack((int) result); - } - } - - @Override - public int getSlotLimit(int slot) { - return (int) stacks.get(slot).getCapacity(); - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - return stacks.get(slot).isResourceAllowedByLock(stack.getItem()); - } - - @Override - public boolean currentlyWhitelisted() { - // Only whitelisted if everything is locked. - for (ConfigurableItemStack stack : stacks) { - if (stack.pipesInsert && stack.getLockedInstance() == null) { - return false; - } - } - return true; } + return true; + } - @Override - public void getWhitelistedItems(Set whitelist) { - for (ConfigurableItemStack stack : stacks) { - if (stack.pipesInsert && stack.getLockedInstance() != Items.AIR) { - whitelist.add(stack.getLockedInstance()); - } + @Override + public void getWhitelistedItems(Set whitelist) { + for (ConfigurableItemStack stack : stacks) { + if (stack.pipesInsert && stack.getLockedInstance() != Items.AIR) { + whitelist.add(stack.getLockedInstance()); } } } diff --git a/src/main/java/aztech/modern_industrialization/inventory/MIStorage.java b/src/main/java/aztech/modern_industrialization/inventory/MIStorage.java index f31801869..9e6b16b80 100644 --- a/src/main/java/aztech/modern_industrialization/inventory/MIStorage.java +++ b/src/main/java/aztech/modern_industrialization/inventory/MIStorage.java @@ -24,16 +24,15 @@ package aztech.modern_industrialization.inventory; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.Storage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StoragePreconditions; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageView; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; -import java.util.Iterator; +import aztech.modern_industrialization.transfer.MIPreconditions; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.resource.DataComponentHolderResource; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import java.util.List; import java.util.function.Predicate; -public class MIStorage, S extends AbstractConfigurableStack> implements Storage { +public class MIStorage, S extends AbstractConfigurableStack> implements ResourceHandler { final List stacks; private final boolean oneSlotPerResource; // true for fluids, false for items @@ -42,14 +41,65 @@ protected MIStorage(List stacks, boolean oneSlotPerResource) { this.oneSlotPerResource = oneSlotPerResource; } + @Override + public int size() { + return stacks.size(); + } + + @Override + public K getResource(int index) { + return stacks.get(index).getResource(); + } + + @Override + public long getAmountAsLong(int index) { + return stacks.get(index).getAmount(); + } + + @Override + public long getCapacityAsLong(int index, K resource) { + return stacks.get(index).getTotalCapacityFor(resource.value()); + } + + @Override + public boolean isValid(int index, K resource) { + return stacks.get(index).isResourceAllowedByLock(resource); + } + + private int insertDirect(S stack, K resource, int amount, TransactionContext transaction) { + if ((stack.getAmount() == 0 && stack.isResourceAllowedByLock(resource)) || stack.getResource().equals(resource)) { + int inserted = Math.min(amount, stack.getRemainingCapacityFor(resource)); + + if (inserted > 0) { + stack.updateSnapshots(transaction); + stack.setKey(resource); + stack.increment(inserted); + } + + return inserted; + } + + return 0; + } + + @Override + public int insert(int index, K resource, int amount, TransactionContext transaction) { + TransferPreconditions.checkNonEmptyNonNegative(resource, amount); + S stack = stacks.get(index); + if (!stack.canPipesInsert()) { + return 0; + } + return insertDirect(stack, resource, amount, transaction); + } + /** * @param filter Return false to skip some configurable stacks. * @param lockSlots Whether to lock slots or not. */ - public long insert(K resource, long maxAmount, TransactionContext tx, Predicate filter, boolean lockSlots) { - StoragePreconditions.notBlankNotNegative(resource, maxAmount); + public int insert(K resource, int maxAmount, TransactionContext tx, Predicate filter, boolean lockSlots) { + MIPreconditions.checkNonEmptyNonNegative(resource, maxAmount); boolean containsResourceAlready = false; - long totalInserted = 0; + int totalInserted = 0; outer: for (int iter = 0; iter < 2; ++iter) { @@ -67,25 +117,15 @@ public long insert(K resource, long maxAmount, TransactionContext tx, Predicate< } else { canInsert = iter == 1; } - } else if (stack.getAmount() == 0) { - // If the amount is 0, we check if the lock allows it. - canInsert = stack.isResourceAllowedByLock(resource); } else { - // Otherwise we check that the resources match exactly. - canInsert = stack.getResource().equals(resource); + canInsert = true; } if (canInsert) { - long inserted = Math.min(maxAmount - totalInserted, stack.getRemainingCapacityFor(resource)); - - if (inserted > 0) { - stack.updateSnapshots(tx); - stack.setKey(resource); - stack.increment(inserted); + int inserted = insertDirect(stack, resource, Math.min(maxAmount - totalInserted, stack.getRemainingCapacityFor(resource)), tx); - if (lockSlots) { - stack.enableMachineLock(resource.getObject()); - } + if (inserted > 0 && lockSlots) { + stack.enableMachineLock(resource.value()); } totalInserted += inserted; @@ -98,54 +138,61 @@ public long insert(K resource, long maxAmount, TransactionContext tx, Predicate< return totalInserted; } - public long insertAllSlot(K resource, long maxAmount, TransactionContext tx) { - return insert(resource, maxAmount, tx, (slot) -> true, false); + public int insertAllSlot(K resource, int maxAmount, TransactionContext tx) { + return insert(resource, maxAmount, tx, s -> true, false); } @Override - public long insert(K resource, long maxAmount, TransactionContext transaction) { + public int insert(K resource, int maxAmount, TransactionContext transaction) { return insert(resource, maxAmount, transaction, AbstractConfigurableStack::canPipesInsert, false); } - public long extract(K resource, long maxAmount, TransactionContext transaction, Predicate filter) { - StoragePreconditions.notBlankNotNegative(resource, maxAmount); - long amount = 0; - for (int i = 0; i < stacks.size() && amount < maxAmount; ++i) { - if (!filter.test(stacks.get(i))) { - continue; - } - amount += stacks.get(i).extract(resource, maxAmount - amount, transaction); + private int extractDirect(S stack, K key, int maxAmount, TransactionContext transaction) { + if (key.equals(stack.getResource())) { + int extracted = Math.min(stack.getAmount(), maxAmount); + stack.updateSnapshots(transaction); + stack.decrement(extracted); + return extracted; } - return amount; + return 0; } @Override - public long extract(K resource, long maxAmount, TransactionContext transaction) { - return extract(resource, maxAmount, transaction, (slot) -> true); + public int extract(int index, K resource, int amount, TransactionContext transaction) { + TransferPreconditions.checkNonEmptyNonNegative(resource, amount); + S stack = stacks.get(index); + if (!stack.canPipesExtract()) { + return 0; + } + return extractDirect(stack, resource, amount, transaction); } - /* - * Ignore requirement for slot to have pipeExtract = true - */ - public long extractAllSlot(K resource, long maxAmount, TransactionContext transaction, Predicate filter) { - StoragePreconditions.notBlankNotNegative(resource, maxAmount); - long amount = 0; + public int extract(K resource, int maxAmount, TransactionContext transaction, Predicate filter) { + MIPreconditions.checkNonEmptyNonNegative(resource, maxAmount); + int amount = 0; for (int i = 0; i < stacks.size() && amount < maxAmount; ++i) { - if (!filter.test(stacks.get(i))) { + S stack = stacks.get(i); + if (!filter.test(stack)) { continue; } - amount += stacks.get(i).extractDirect(resource, maxAmount - amount, transaction); + amount += extractDirect(stack, resource, maxAmount - amount, transaction); } return amount; } - public long extractAllSlot(K resource, long maxAmount, TransactionContext transaction) { - return extractAllSlot(resource, maxAmount, transaction, (slot) -> true); + @Override + public int extract(K resource, int maxAmount, TransactionContext transaction) { + return extract(resource, maxAmount, transaction, AbstractConfigurableStack::canPipesExtract); } - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public Iterator> iterator() { - return (Iterator) stacks.iterator(); + /* + * Ignore requirement for slot to have pipeExtract = true + */ + public int extractAllSlot(K resource, int maxAmount, TransactionContext transaction, Predicate filter) { + return extract(resource, maxAmount, transaction, filter); + } + + public int extractAllSlot(K resource, int maxAmount, TransactionContext transaction) { + return extractAllSlot(resource, maxAmount, transaction, s -> true); } } diff --git a/src/main/java/aztech/modern_industrialization/inventory/TransactionLegacy.java b/src/main/java/aztech/modern_industrialization/inventory/TransactionLegacy.java new file mode 100644 index 000000000..45c81cf33 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/inventory/TransactionLegacy.java @@ -0,0 +1,10 @@ +package aztech.modern_industrialization.inventory; + +import net.neoforged.neoforge.transfer.transaction.Transaction; + +@Deprecated(forRemoval = true) +public class TransactionLegacy { + public static Transaction hackyOpen() { + return Transaction.open(Transaction.getCurrentOpenedTransaction()); + } +} diff --git a/src/main/java/aztech/modern_industrialization/items/ConfigCardItem.java b/src/main/java/aztech/modern_industrialization/items/ConfigCardItem.java index 758a462cc..8be5b0f70 100644 --- a/src/main/java/aztech/modern_industrialization/items/ConfigCardItem.java +++ b/src/main/java/aztech/modern_industrialization/items/ConfigCardItem.java @@ -31,17 +31,19 @@ import aztech.modern_industrialization.pipes.impl.PipeBlock; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; + import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.component.TooltipDisplay; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; @@ -66,13 +68,13 @@ public InteractionResult useOn(UseOnContext c) { var pipeUseResult = pipe.useItemOn(c.getItemInHand(), c.getLevel().getBlockState(c.getClickedPos()), c.getLevel(), c.getClickedPos(), c.getPlayer(), c.getHand(), new BlockHitResult(c.getClickLocation(), c.getClickedFace(), c.getClickedPos(), c.isInside())); if (pipeUseResult.consumesAction()) { - return pipeUseResult.result(); + return pipeUseResult; } } // Try to save block for pipe facade if (setCamouflage(player, usedHand, hitState)) { - return InteractionResult.sidedSuccess(c.getLevel().isClientSide); + return InteractionResult.SUCCESS; } } return InteractionResult.PASS; @@ -90,18 +92,18 @@ public static boolean setCamouflage(Player player, InteractionHand usedHand, Blo } @Override - public InteractionResultHolder use(Level level, Player player, InteractionHand usedHand) { + public InteractionResult use(Level level, Player player, InteractionHand usedHand) { if (player.isShiftKeyDown()) { player.getItemInHand(usedHand).remove(MIComponents.SAVED_CONFIG); player.getItemInHand(usedHand).remove(MIComponents.CAMOUFLAGE); player.displayClientMessage(MIText.ConfigCardCleared.text(), true); - return InteractionResultHolder.sidedSuccess(player.getItemInHand(usedHand), level.isClientSide()); + return InteractionResult.SUCCESS; } return super.use(level, player, usedHand); } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltipComponents, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { var savedConfig = stack.get(MIComponents.SAVED_CONFIG); if (savedConfig != null) { var filterSize = savedConfig.filter().size(); @@ -111,13 +113,13 @@ public void appendHoverText(ItemStack stack, Item.TooltipContext context, List> { +public interface ContainerItem { default T getResource(ItemStack stack) { return stack.getOrDefault(getComponentType(), getDefaultComponent()).resource(); } @@ -75,7 +73,7 @@ default void setLocked(ItemStack stack, boolean locked) { default long getAmount(ItemStack stack) { var component = stack.getOrDefault(getComponentType(), getDefaultComponent()); - if (component.resource().isBlank()) { + if (component.resource().isEmpty()) { return 0; } if (getBehaviour().isCreative()) { @@ -99,7 +97,7 @@ default void setAmount(ItemStack stack, long amount) { default void clean(ItemStack stack) { var component = stack.get(getComponentType()); - if (component != null && !component.locked() && (component.resource().isBlank() || component.amount() == 0)) { + if (component != null && !component.locked() && (component.resource().isEmpty() || component.amount() == 0)) { stack.remove(getComponentType()); } } @@ -116,7 +114,7 @@ default void onChange(ItemStack stack) {} ResourceStorage getDefaultComponent(); - class BaseHandler> { + class BaseHandler { protected final ItemStack stack; protected final ContainerItem containerItem; @@ -126,7 +124,7 @@ public BaseHandler(ItemStack stack, ContainerItem containerItem) { } public boolean isResourceBlank() { - return getResource().isBlank(); + return getResource().isEmpty(); } public T getResource() { @@ -152,174 +150,175 @@ protected void update(T newResource, long newAmount) { } } - class ItemHandler extends BaseHandler implements IItemHandler { - public ItemHandler(ItemStack stack, ContainerItem containerItem) { - super(stack, containerItem); - } - - @Override - public int getSlots() { - return 1; - } - - @Override - public ItemStack getStackInSlot(int slot) { - return getResource().toStack(Ints.saturatedCast(getAmount())); - } - - @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - return insertItem(slot, stack, simulate, false, false); - } - - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate, boolean ignoreFilter, boolean ignoreLock) { - if (stack.isEmpty() || slot != 0) { - return stack; - } - - if (containerItem.getBehaviour().isCreative()) { - return stack; - } - - var resource = ItemVariant.of(stack); - if (containerItem.getBehaviour().canInsert(resource) || ignoreFilter) { - - if ((isResourceBlank() && (ignoreLock || containerItem.isUnlocked(this.stack))) - || getResource().equals(resource)) { - long amount = getAmount(); - int inserted = (int) Math.min(stack.getCount(), containerItem.getBehaviour().getCapacityForResource(resource) - amount); - if (inserted > 0 && !simulate) { - update(resource, amount + inserted); - } - return stack.copyWithCount(stack.getCount() - inserted); - } - } - return stack; - } - - @Override - public ItemStack extractItem(int slot, int maxAmount, boolean simulate) { - if (slot != 0 || maxAmount <= 0 || isResourceBlank()) { - return ItemStack.EMPTY; - } - - var resource = getResource(); - if (containerItem.getBehaviour().canExtract(resource)) { - if (containerItem.getBehaviour().isCreative()) { - return resource.toStack(maxAmount); - } else { - long amount = getAmount(); - int extracted = (int) Math.min(maxAmount, amount); - - if (extracted > 0 && !simulate) { - update(resource, amount - extracted); - } - return resource.toStack(extracted); - } - } - return ItemStack.EMPTY; - } - - @Override - public int getSlotLimit(int slot) { - return Ints.saturatedCast(containerItem.getBehaviour().getCapacityForResource(ItemVariant.blank())); - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - return containerItem.getBehaviour().canInsert(ItemVariant.of(stack)); - } - } - - class FluidHandler extends BaseHandler implements IFluidHandlerItem { - public FluidHandler(ItemStack stack, ContainerItem containerItem) { - super(stack, containerItem); - } - - @Override - public ItemStack getContainer() { - return stack; - } - - @Override - public int getTanks() { - return 1; - } - - @Override - public FluidStack getFluidInTank(int slot) { - return getResource().toStack(Ints.saturatedCast(getAmount())); - } - - @Override - public int fill(FluidStack resource, FluidAction action) { - return fill(resource, action, false, false); - } - - public int fill(FluidStack stack, FluidAction action, boolean ignoreFilter, boolean ignoreLock) { - if (stack.isEmpty()) { - return 0; - } - - if (containerItem.getBehaviour().isCreative()) { - return 0; - } - - var resource = FluidVariant.of(stack); - if (containerItem.getBehaviour().canInsert(resource) || ignoreFilter) { - - if ((isResourceBlank() && (ignoreLock || containerItem.isUnlocked(this.stack))) - || getResource().equals(resource)) { - long amount = getAmount(); - int inserted = (int) Math.min(stack.getAmount(), containerItem.getBehaviour().getCapacityForResource(resource) - amount); - if (inserted > 0 && action.execute()) { - update(resource, amount + inserted); - } - return inserted; - } - } - return 0; - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - if (resource.isEmpty() || isResourceBlank() || !getResource().matches(resource)) { - return FluidStack.EMPTY; - } - return drain(resource.getAmount(), action); - } - - @Override - public FluidStack drain(int maxAmount, FluidAction action) { - if (maxAmount <= 0 || isResourceBlank()) { - return FluidStack.EMPTY; - } - - var resource = getResource(); - if (containerItem.getBehaviour().canExtract(resource)) { - if (containerItem.getBehaviour().isCreative()) { - return resource.toStack(maxAmount); - } else { - long amount = getAmount(); - int extracted = (int) Math.min(maxAmount, amount); - - if (extracted > 0 && action.execute()) { - update(resource, amount - extracted); - } - return resource.toStack(extracted); - } - } - return FluidStack.EMPTY; - } - - @Override - public int getTankCapacity(int slot) { - return Ints.saturatedCast(containerItem.getBehaviour().getCapacityForResource(FluidVariant.blank())); - } - - @Override - public boolean isFluidValid(int slot, FluidStack stack) { - return containerItem.getBehaviour().canInsert(FluidVariant.of(stack)); - } - } + // TODO 26.1 +// class ItemHandler extends BaseHandler implements IItemHandler { +// public ItemHandler(ItemStack stack, ContainerItem containerItem) { +// super(stack, containerItem); +// } +// +// @Override +// public int getSlots() { +// return 1; +// } +// +// @Override +// public ItemStack getStackInSlot(int slot) { +// return getResource().toStack(Ints.saturatedCast(getAmount())); +// } +// +// @Override +// public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { +// return insertItem(slot, stack, simulate, false, false); +// } +// +// public ItemStack insertItem(int slot, ItemStack stack, boolean simulate, boolean ignoreFilter, boolean ignoreLock) { +// if (stack.isEmpty() || slot != 0) { +// return stack; +// } +// +// if (containerItem.getBehaviour().isCreative()) { +// return stack; +// } +// +// var resource = ItemVariant.of(stack); +// if (containerItem.getBehaviour().canInsert(resource) || ignoreFilter) { +// +// if ((isResourceBlank() && (ignoreLock || containerItem.isUnlocked(this.stack))) +// || getResource().equals(resource)) { +// long amount = getAmount(); +// int inserted = (int) Math.min(stack.getCount(), containerItem.getBehaviour().getCapacityForResource(resource) - amount); +// if (inserted > 0 && !simulate) { +// update(resource, amount + inserted); +// } +// return stack.copyWithCount(stack.getCount() - inserted); +// } +// } +// return stack; +// } +// +// @Override +// public ItemStack extractItem(int slot, int maxAmount, boolean simulate) { +// if (slot != 0 || maxAmount <= 0 || isResourceBlank()) { +// return ItemStack.EMPTY; +// } +// +// var resource = getResource(); +// if (containerItem.getBehaviour().canExtract(resource)) { +// if (containerItem.getBehaviour().isCreative()) { +// return resource.toStack(maxAmount); +// } else { +// long amount = getAmount(); +// int extracted = (int) Math.min(maxAmount, amount); +// +// if (extracted > 0 && !simulate) { +// update(resource, amount - extracted); +// } +// return resource.toStack(extracted); +// } +// } +// return ItemStack.EMPTY; +// } +// +// @Override +// public int getSlotLimit(int slot) { +// return Ints.saturatedCast(containerItem.getBehaviour().getCapacityForResource(ItemVariant.blank())); +// } +// +// @Override +// public boolean isItemValid(int slot, ItemStack stack) { +// return containerItem.getBehaviour().canInsert(ItemVariant.of(stack)); +// } +// } +// +// class FluidHandler extends BaseHandler implements IFluidHandlerItem { +// public FluidHandler(ItemStack stack, ContainerItem containerItem) { +// super(stack, containerItem); +// } +// +// @Override +// public ItemStack getContainer() { +// return stack; +// } +// +// @Override +// public int getTanks() { +// return 1; +// } +// +// @Override +// public FluidStack getFluidInTank(int slot) { +// return getResource().toStack(Ints.saturatedCast(getAmount())); +// } +// +// @Override +// public int fill(FluidStack resource, FluidAction action) { +// return fill(resource, action, false, false); +// } +// +// public int fill(FluidStack stack, FluidAction action, boolean ignoreFilter, boolean ignoreLock) { +// if (stack.isEmpty()) { +// return 0; +// } +// +// if (containerItem.getBehaviour().isCreative()) { +// return 0; +// } +// +// var resource = FluidVariant.of(stack); +// if (containerItem.getBehaviour().canInsert(resource) || ignoreFilter) { +// +// if ((isResourceBlank() && (ignoreLock || containerItem.isUnlocked(this.stack))) +// || getResource().equals(resource)) { +// long amount = getAmount(); +// int inserted = (int) Math.min(stack.getAmount(), containerItem.getBehaviour().getCapacityForResource(resource) - amount); +// if (inserted > 0 && action.execute()) { +// update(resource, amount + inserted); +// } +// return inserted; +// } +// } +// return 0; +// } +// +// @Override +// public FluidStack drain(FluidStack resource, FluidAction action) { +// if (resource.isEmpty() || isResourceBlank() || !getResource().matches(resource)) { +// return FluidStack.EMPTY; +// } +// return drain(resource.getAmount(), action); +// } +// +// @Override +// public FluidStack drain(int maxAmount, FluidAction action) { +// if (maxAmount <= 0 || isResourceBlank()) { +// return FluidStack.EMPTY; +// } +// +// var resource = getResource(); +// if (containerItem.getBehaviour().canExtract(resource)) { +// if (containerItem.getBehaviour().isCreative()) { +// return resource.toStack(maxAmount); +// } else { +// long amount = getAmount(); +// int extracted = (int) Math.min(maxAmount, amount); +// +// if (extracted > 0 && action.execute()) { +// update(resource, amount - extracted); +// } +// return resource.toStack(extracted); +// } +// } +// return FluidStack.EMPTY; +// } +// +// @Override +// public int getTankCapacity(int slot) { +// return Ints.saturatedCast(containerItem.getBehaviour().getCapacityForResource(FluidVariant.blank())); +// } +// +// @Override +// public boolean isFluidValid(int slot, FluidStack stack) { +// return containerItem.getBehaviour().canInsert(FluidVariant.of(stack)); +// } +// } } diff --git a/src/main/java/aztech/modern_industrialization/items/DynamicToolItem.java b/src/main/java/aztech/modern_industrialization/items/DynamicToolItem.java index b196b97b8..5183e8e2f 100644 --- a/src/main/java/aztech/modern_industrialization/items/DynamicToolItem.java +++ b/src/main/java/aztech/modern_industrialization/items/DynamicToolItem.java @@ -32,8 +32,6 @@ import org.jetbrains.annotations.ApiStatus; public interface DynamicToolItem { - ItemStack SHEAR_STACK = new ItemStack(Items.SHEARS, 1); - @ApiStatus.NonExtendable default boolean isSupportedBlock(ItemStack stack, BlockState state) { return stack.is(ItemTags.AXES) && state.is(BlockTags.MINEABLE_WITH_AXE) diff --git a/src/main/java/aztech/modern_industrialization/items/FluidFuelItemHelper.java b/src/main/java/aztech/modern_industrialization/items/FluidFuelItemHelper.java index b830177e8..30282aac8 100644 --- a/src/main/java/aztech/modern_industrialization/items/FluidFuelItemHelper.java +++ b/src/main/java/aztech/modern_industrialization/items/FluidFuelItemHelper.java @@ -26,9 +26,10 @@ import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.api.datamaps.MIDataMaps; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.FluidHelper; import java.util.List; +import java.util.function.Consumer; + import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextColor; @@ -36,13 +37,14 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidHandlerItemStack; +import net.neoforged.neoforge.transfer.fluid.FluidResource; /** * Helper class for fluid items that can only contain FluidFuels */ public interface FluidFuelItemHelper { - static FluidVariant getFluid(ItemStack stack) { - return FluidVariant.of(new ItemStorage(stack, 0).getFluid()); + static FluidResource getFluid(ItemStack stack) { + return FluidResource.of(new ItemStorage(stack, 0).getFluid()); } static int getAmount(ItemStack stack) { @@ -60,7 +62,7 @@ public ItemStorage(ItemStack container, int capacity) { @Override public boolean canFillFluidType(FluidStack fluid) { - return fluid.getFluidHolder().getData(MIDataMaps.FLUID_FUELS) != null; + return fluid.typeHolder().getData(MIDataMaps.FLUID_FUELS) != null; } @Override @@ -73,12 +75,12 @@ protected void setFluid(FluidStack fluid) { } } - static void appendTooltip(ItemStack stack, List tooltip, long capacity) { + static void appendTooltip(ItemStack stack, Consumer tooltip, long capacity) { Style style = Style.EMPTY.withColor(TextColor.fromRgb(0xa9a9a9)).withItalic(true); - FluidVariant fluid = getFluid(stack); - tooltip.add(FluidHelper.getFluidName(fluid, true)); - if (!fluid.isBlank()) { - tooltip.add(FluidHelper.getFluidAmount(getAmount(stack), capacity).setStyle(style)); + var fluid = getFluid(stack); + tooltip.accept(FluidHelper.getFluidName(fluid, true)); + if (!fluid.isEmpty()) { + tooltip.accept(FluidHelper.getFluidAmount(getAmount(stack), capacity).setStyle(style)); } } } diff --git a/src/main/java/aztech/modern_industrialization/items/ForgeTool.java b/src/main/java/aztech/modern_industrialization/items/ForgeTool.java index 6b8ad7e56..bf88786db 100644 --- a/src/main/java/aztech/modern_industrialization/items/ForgeTool.java +++ b/src/main/java/aztech/modern_industrialization/items/ForgeTool.java @@ -26,102 +26,21 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.datagen.tag.TagsToGenerate; -import java.util.Locale; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Tier; -import net.minecraft.world.item.TieredItem; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.block.Block; -public class ForgeTool extends TieredItem { +public class ForgeTool extends Item { public static final TagKey TAG = TagKey.create(BuiltInRegistries.ITEM.key(), MI.id("forge_hammer_tools")); - public ForgeTool(Tier material, Properties p) { - super(forgeHammerMaterial(material), p.stacksTo(1)); + public ForgeTool(Properties p, int baseMaterialDurability, int enchantmentValue) { + super(applyForgeHammerProperties(p, baseMaterialDurability, enchantmentValue)); TagsToGenerate.generateTag(TAG, this, "Forge Hammer Tools"); } - public boolean isValidRepairItem(ItemStack stack, ItemStack repairCandidate) { - return false; + private static Properties applyForgeHammerProperties(Properties properties, int baseMaterialDurability, int enchantmentValue) { + return properties + .durability((baseMaterialDurability * 20) / 3) + .enchantable(enchantmentValue); } - - private static Tier forgeHammerMaterial(Tier normalTier) { - return new Tier() { - @Override - public int getUses() { - return (normalTier.getUses() * 20) / 3; - } - - @Override - public float getSpeed() { - return normalTier.getSpeed(); - } - - @Override - public float getAttackDamageBonus() { - return normalTier.getAttackDamageBonus(); - } - - @Override - public TagKey getIncorrectBlocksForDrops() { - return normalTier.getIncorrectBlocksForDrops(); - } - - @Override - public int getEnchantmentValue() { - return normalTier.getEnchantmentValue(); - } - - @Override - public Ingredient getRepairIngredient() { - return normalTier.getRepairIngredient(); - } - - @Override - public String toString() { - return normalTier.toString().toLowerCase(Locale.ROOT) + "_forge_tool"; - } - }; - } - - public static Tier STEEL = new Tier() { - @Override - public int getUses() { - return 650; - } - - @Override - public float getSpeed() { - return 7.0F; - } - - @Override - public float getAttackDamageBonus() { - return 2.5F; - } - - @Override - public TagKey getIncorrectBlocksForDrops() { - return BlockTags.create(MI.id("incorrect_for_steel_tool")); // this probably doesn't matter... - } - - @Override - public int getEnchantmentValue() { - return 16; - } - - @Override - public Ingredient getRepairIngredient() { - return Ingredient.of(TAG); - } - - @Override - public String toString() { - return "modern_industrialization:steel"; - } - }; } diff --git a/src/main/java/aztech/modern_industrialization/items/ItemContainingItemHelper.java b/src/main/java/aztech/modern_industrialization/items/ItemContainingItemHelper.java index 0a30d04ec..156f36008 100644 --- a/src/main/java/aztech/modern_industrialization/items/ItemContainingItemHelper.java +++ b/src/main/java/aztech/modern_industrialization/items/ItemContainingItemHelper.java @@ -26,17 +26,18 @@ import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.blocks.storage.ResourceStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import net.minecraft.core.component.DataComponentType; import net.minecraft.world.entity.SlotAccess; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickAction; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; -public interface ItemContainingItemHelper extends ContainerItem { +public interface ItemContainingItemHelper extends ContainerItem { default boolean handleStackedOnOther(ItemStack stackBarrel, Slot slot, ClickAction clickType, Player player) { if (clickType == ClickAction.SECONDARY && slot.allowModification(player)) { Mutable ref = new MutableObject<>(slot.getItem()); @@ -66,7 +67,8 @@ default boolean handleClick(Player player, ItemStack barrelLike, Mutable> getComponentType() { + default DataComponentType> getComponentType() { return MIComponents.ITEM_STORAGE.get(); } @Override - default ResourceStorage getDefaultComponent() { + default ResourceStorage getDefaultComponent() { return ResourceStorage.ITEM_EMPTY; } } diff --git a/src/main/java/aztech/modern_industrialization/items/ItemEnergyHandler.java b/src/main/java/aztech/modern_industrialization/items/ItemEnergyHandler.java new file mode 100644 index 000000000..c99a5d7cb --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/items/ItemEnergyHandler.java @@ -0,0 +1,141 @@ +package aztech.modern_industrialization.items; + +import com.google.common.math.LongMath; +import com.google.common.primitives.Longs; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.world.item.Item; +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.access.ItemAccess; +import net.neoforged.neoforge.transfer.energy.EnergyHandler; +import net.neoforged.neoforge.transfer.energy.ItemAccessEnergyHandler; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; + +/** + * Copied from {@link ItemAccessEnergyHandler} and modified to support {@code long} energy amounts, + * and stack-dependent capacities. + */ +public abstract class ItemEnergyHandler implements EnergyHandler { + protected final ItemAccess itemAccess; + protected final Item validItem; + protected final DataComponentType energyComponent; + protected final int maxInsert; + protected final int maxExtract; + + public ItemEnergyHandler(ItemAccess itemAccess, DataComponentType energyComponent, int maxTransfer) { + this(itemAccess, energyComponent, maxTransfer, maxTransfer); + } + + public ItemEnergyHandler(ItemAccess itemAccess, DataComponentType energyComponent, int maxInsert, int maxExtract) { + TransferPreconditions.checkNonNegative(maxInsert); + TransferPreconditions.checkNonNegative(maxExtract); + + this.itemAccess = itemAccess; + // Store the current item, such that if the item changes later we don't return any stored content from it. + this.validItem = itemAccess.getResource().getItem(); + this.energyComponent = energyComponent; + this.maxInsert = maxInsert; + this.maxExtract = maxExtract; + } + + protected abstract long getCapacity(ItemResource accessResource); + + /** + * Retrieves the amount stored in the {@linkplain ItemAccess#getResource() current contents} of the item access. + */ + protected long getAmountFrom(ItemResource accessResource) { + if (!accessResource.is(validItem)) { + return 0; + } + return accessResource.getOrDefault(energyComponent, 0L); + } + + /** + * Returns a resource with updated amount. + * + * @param accessResource current resource, before the update + * @param newAmount the new amount + * @return {@code accessResource} updated with the new amount, + * or {@link ItemResource#EMPTY} if the new amount cannot be stored + * @implNote This function should not mutate the {@linkplain #itemAccess item access}, + * that will be done by the calling code based on the results of this function. + */ + protected ItemResource update(ItemResource accessResource, long newAmount) { + return accessResource.with(energyComponent, newAmount); + } + + @Override + public long getAmountAsLong() { + return LongMath.saturatedMultiply(itemAccess.getAmount(), getAmountFrom(itemAccess.getResource())); + } + + @Override + public long getCapacityAsLong() { + var accessResource = itemAccess.getResource(); + if (!accessResource.is(validItem)) { + return 0; + } + + return LongMath.saturatedMultiply(itemAccess.getAmount(), getCapacity(accessResource)); + } + + @Override + public int insert(int amount, TransactionContext transaction) { + TransferPreconditions.checkNonNegative(amount); + + int accessAmount = itemAccess.getAmount(); + if (accessAmount == 0) { + return 0; + } + int amountPerItem = Math.min(maxInsert, amount / accessAmount); + if (amountPerItem == 0) { + return 0; + } + + ItemResource accessResource = itemAccess.getResource(); + if (!accessResource.is(validItem)) { + return 0; + } + long currentAmountPerItem = getAmountFrom(accessResource); + + int insertedPerItem = (int) Math.min(amountPerItem, getCapacity(accessResource) - currentAmountPerItem); + if (insertedPerItem > 0) { + ItemResource filledResource = update(accessResource, currentAmountPerItem + insertedPerItem); + + if (!filledResource.isEmpty()) { + return insertedPerItem * itemAccess.exchange(filledResource, accessAmount, transaction); + } + } + + return 0; + } + + @Override + public int extract(int amount, TransactionContext transaction) { + TransferPreconditions.checkNonNegative(amount); + + int accessAmount = itemAccess.getAmount(); + if (accessAmount == 0) { + return 0; + } + int amountPerItem = Math.min(maxExtract, amount / accessAmount); + if (amountPerItem == 0) { + return 0; + } + + ItemResource accessResource = itemAccess.getResource(); + // If the resource is not validItem this will return 0 and avoid extraction + long currentAmountPerItem = getAmountFrom(accessResource); + + int extractedPerItem = (int) Math.min(amountPerItem, currentAmountPerItem); + if (extractedPerItem > 0) { + ItemResource emptiedResource = update(accessResource, currentAmountPerItem - extractedPerItem); + + if (!emptiedResource.isEmpty()) { + return extractedPerItem * itemAccess.exchange(emptiedResource, accessAmount, transaction); + } + } + + return 0; + } +} diff --git a/src/main/java/aztech/modern_industrialization/items/MIEnergyItem.java b/src/main/java/aztech/modern_industrialization/items/MIEnergyItem.java new file mode 100644 index 000000000..3ea08c74b --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/items/MIEnergyItem.java @@ -0,0 +1,25 @@ +package aztech.modern_industrialization.items; + +import aztech.modern_industrialization.MIComponents; +import net.minecraft.world.item.ItemStack; + +public interface MIEnergyItem { + /** + * @return The energy stored in the stack. Count is ignored. + */ + default long getEnergy(ItemStack stack) { + return stack.getOrDefault(MIComponents.ENERGY, 0L); + } + + /** + * Directly set the energy stored in the stack. Count is ignored. + * It's up to callers to ensure that the new amount is >= 0 and <= capacity. + */ + default void setEnergy(ItemStack stack, long newAmount) { + if (newAmount == 0) { + stack.remove(MIComponents.ENERGY); + } else { + stack.set(MIComponents.ENERGY, newAmount); + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/items/PortableStorageUnit.java b/src/main/java/aztech/modern_industrialization/items/PortableStorageUnit.java index 1c753a4e6..718f80af4 100644 --- a/src/main/java/aztech/modern_industrialization/items/PortableStorageUnit.java +++ b/src/main/java/aztech/modern_industrialization/items/PortableStorageUnit.java @@ -24,11 +24,8 @@ package aztech.modern_industrialization.items; -import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.blocks.storage.StorageBehaviour; import aztech.modern_industrialization.blocks.storage.barrel.BarrelTooltipData; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import dev.technici4n.grandpower.api.ISimpleEnergyItem; import it.unimi.dsi.fastutil.objects.Reference2LongMap; import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap; import java.util.Optional; @@ -39,8 +36,9 @@ import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.transfer.item.ItemResource; -public class PortableStorageUnit extends Item implements ItemContainingItemHelper { +public class PortableStorageUnit extends Item implements ItemContainingItemHelper, MIEnergyItem { public static final Reference2LongMap CAPACITY_PER_BATTERY = new Reference2LongOpenHashMap<>(); private final static int MAX_BATTERY_COUNT = 10000; @@ -50,7 +48,7 @@ public PortableStorageUnit(Properties properties) { @Override public void onChange(ItemStack stack) { - this.setStoredEnergy(stack, Math.min(this.getEnergyCapacity(stack), this.getStoredEnergy(stack))); + this.setEnergy(stack, Math.min(this.getEnergyCapacity(stack), this.getEnergy(stack))); } public long getEnergyCapacity(ItemStack stack) { @@ -61,23 +59,16 @@ public long getEnergyCapacity(ItemStack stack) { } } - public long getEnergyMaxInput(ItemStack stack) { - return Long.MAX_VALUE; - } - - public long getEnergyMaxOutput(ItemStack stack) { - return Long.MAX_VALUE; - } - @Override - public StorageBehaviour getBehaviour() { + public StorageBehaviour getBehaviour() { return new StorageBehaviour<>() { @Override - public long getCapacityForResource(ItemVariant resource) { + public long getCapacityForResource(ItemResource resource) { return MAX_BATTERY_COUNT; } - public boolean canInsert(ItemVariant maybeBattery) { + @Override + public boolean canInsert(ItemResource maybeBattery) { return CAPACITY_PER_BATTERY.containsKey(maybeBattery.getItem()); } }; @@ -111,24 +102,9 @@ public boolean isBarVisible(ItemStack stack) { @Override public int getBarWidth(ItemStack stack) { if (getEnergyCapacity(stack) > 0) { - return (int) Math.round(getStoredEnergy(stack) / (double) getEnergyCapacity(stack) * 13); + return (int) Math.round(getEnergy(stack) / (double) getEnergyCapacity(stack) * 13); } else { return 0; } } - - /** - * @return The energy stored in the stack. Count is ignored. - */ - public long getStoredEnergy(ItemStack stack) { - return ISimpleEnergyItem.getStoredEnergyUnchecked(stack, MIComponents.ENERGY.get()); - } - - /** - * Directly set the energy stored in the stack. Count is ignored. - * It's up to callers to ensure that the new amount is >= 0 and <= capacity. - */ - public void setStoredEnergy(ItemStack stack, long newAmount) { - ISimpleEnergyItem.setStoredEnergyUnchecked(stack, MIComponents.ENERGY.get(), newAmount); - } } diff --git a/src/main/java/aztech/modern_industrialization/items/RedstoneControlModuleItem.java b/src/main/java/aztech/modern_industrialization/items/RedstoneControlModuleItem.java index e59f8d846..e8b7433d4 100644 --- a/src/main/java/aztech/modern_industrialization/items/RedstoneControlModuleItem.java +++ b/src/main/java/aztech/modern_industrialization/items/RedstoneControlModuleItem.java @@ -26,7 +26,7 @@ import aztech.modern_industrialization.MIComponents; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -38,10 +38,10 @@ public RedstoneControlModuleItem(Properties properties) { } @Override - public InteractionResultHolder use(Level level, Player player, InteractionHand usedHand) { + public InteractionResult use(Level level, Player player, InteractionHand usedHand) { var stack = player.getItemInHand(usedHand); setRequiresLowSignal(stack, !isRequiresLowSignal(stack)); - return InteractionResultHolder.sidedSuccess(stack, level.isClientSide()); + return InteractionResult.SUCCESS; } public static boolean isRequiresLowSignal(ItemStack stack) { diff --git a/src/main/java/aztech/modern_industrialization/items/SteamDrillItem.java b/src/main/java/aztech/modern_industrialization/items/SteamDrillItem.java index f7f0ef461..824deebbb 100644 --- a/src/main/java/aztech/modern_industrialization/items/SteamDrillItem.java +++ b/src/main/java/aztech/modern_industrialization/items/SteamDrillItem.java @@ -28,7 +28,6 @@ import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.MIText; import aztech.modern_industrialization.blocks.storage.StorageBehaviour; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.GeometryHelper; import aztech.modern_industrialization.util.Simulation; import aztech.modern_industrialization.util.TextHelper; @@ -37,6 +36,8 @@ import java.util.Optional; import java.util.WeakHashMap; import java.util.function.BiConsumer; +import java.util.function.Consumer; + import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; @@ -44,13 +45,15 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextColor; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.tags.BlockTags; import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.ExperienceOrb; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.SlotAccess; @@ -62,9 +65,10 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.ToolMaterial; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.item.component.TooltipDisplay; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.item.enchantment.ItemEnchantments; @@ -85,7 +89,9 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; import net.neoforged.neoforge.event.level.BlockDropsEvent; import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.fluids.FluidUtil; import net.neoforged.neoforge.items.ItemHandlerHelper; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.apache.commons.lang3.mutable.Mutable; import org.jspecify.annotations.Nullable; @@ -98,15 +104,18 @@ public class SteamDrillItem extends Item implements DynamicToolItem, ItemContainingItemHelper, ActivatableItem { - public static final StorageBehaviour DRILL_BEHAVIOUR = new StorageBehaviour<>() { + public static final StorageBehaviour DRILL_BEHAVIOUR = new StorageBehaviour<>() { @Override - public long getCapacityForResource(ItemVariant resource) { + public long getCapacityForResource(ItemResource resource) { return resource.getMaxStackSize(); } - public boolean canInsert(ItemVariant item) { - int burnTicks = item.toStack().getBurnTime(null); - return burnTicks > 0; + @Override + public boolean canInsert(ItemResource item) { + // TODO 26.1 +// int burnTicks = item.toStack().getBurnTime(null); +// return burnTicks > 0; + return false; } }; @@ -151,7 +160,7 @@ public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack @Override public boolean isCorrectToolForDrops(ItemStack stack, BlockState state) { - if (isSupportedBlock(stack, state) && canUse(stack) && !state.is(Tiers.NETHERITE.getIncorrectBlocksForDrops())) { + if (isSupportedBlock(stack, state) && canUse(stack) && !state.is(ToolMaterial.NETHERITE.incorrectBlocksForDrops())) { return true; } return super.isCorrectToolForDrops(stack, state); @@ -364,9 +373,8 @@ public boolean mineBlock(ItemStack stack, Level world, BlockState state, BlockPo } @Override - public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) { + public void hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) { useFuel(stack, attacker); - return true; } private void useFuel(ItemStack stack, @Nullable LivingEntity entity) { @@ -385,27 +393,27 @@ private void useFuel(ItemStack stack, @Nullable LivingEntity entity) { } @Override - public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { + public InteractionResult use(Level world, Player user, InteractionHand hand) { // Enable or disable silk touch if (hand == InteractionHand.MAIN_HAND && user.isShiftKeyDown()) { ItemStack stack = user.getItemInHand(hand); setSilkTouch(stack, isNotSilkTouch(stack)); - if (!world.isClientSide) { + if (!world.isClientSide()) { user.displayClientMessage( isNotSilkTouch(stack) ? MIText.ToolSwitchedNoSilkTouch.text() : MIText.ToolSwitchedSilkTouch.text(), true); } - return InteractionResultHolder.sidedSuccess(stack, world.isClientSide); + return InteractionResult.SUCCESS; } // Refill water ItemStack itemStack = user.getItemInHand(hand); BlockHitResult hitResult = getPlayerPOVHitResult(world, user, ClipContext.Fluid.ANY); if (hitResult.getType() != HitResult.Type.BLOCK) - return InteractionResultHolder.pass(itemStack); + return InteractionResult.PASS; FluidState fluidState = world.getFluidState(hitResult.getBlockPos()); if (fluidState.getType() == Fluids.WATER || fluidState.getType() == Fluids.FLOWING_WATER) { fillWater(user, itemStack); - return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide()); + return InteractionResult.SUCCESS; } return super.use(world, user, hand); @@ -414,25 +422,25 @@ public InteractionResultHolder use(Level world, Player user, Interact private void fillWater(Player player, ItemStack stack) { if (stack.getOrDefault(MIComponents.WATER, 0) != FULL_WATER) { stack.set(MIComponents.WATER, FULL_WATER); - player.playNotifySound(SoundEvents.BUCKET_FILL, SoundSource.PLAYERS, 1, 1); + player.playSound(SoundEvents.BUCKET_FILL, 1, 1); } } @Override - public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { - var fuel = stack.getOrDefault(MIComponents.STEAM_DRILL_FUEL, SteamDrillFuel.EMPTY); + public void inventoryTick(ItemStack itemStack, ServerLevel level, Entity owner, @Nullable EquipmentSlot slot) { + var fuel = itemStack.getOrDefault(MIComponents.STEAM_DRILL_FUEL, SteamDrillFuel.EMPTY); if (fuel.burnTicks() > 0) { - stack.set(MIComponents.STEAM_DRILL_FUEL, new SteamDrillFuel(Math.max(0, fuel.burnTicks() - 5), fuel.maxBurnTicks())); - stack.update(MIComponents.WATER, 0, w -> Math.max(0, w - 5)); + itemStack.set(MIComponents.STEAM_DRILL_FUEL, new SteamDrillFuel(Math.max(0, fuel.burnTicks() - 5), fuel.maxBurnTicks())); + itemStack.update(MIComponents.WATER, 0, w -> Math.max(0, w - 5)); } if (fuel.burnTicks() == 0) { - stack.set(MIComponents.STEAM_DRILL_FUEL, SteamDrillFuel.EMPTY); + itemStack.set(MIComponents.STEAM_DRILL_FUEL, SteamDrillFuel.EMPTY); } - if (stack.getOrDefault(MIComponents.WATER.get(), 0) == 0) { - if (entity instanceof Player player) { + if (itemStack.getOrDefault(MIComponents.WATER.get(), 0) == 0) { + if (owner instanceof Player player) { var inv = player.getInventory(); for (int i = 0; i < inv.getContainerSize(); ++i) { - if (tryFillWater(player, stack, inv.getItem(i))) { + if (tryFillWater(player, itemStack, inv.getItem(i))) { break; } } @@ -448,15 +456,19 @@ public boolean canUse(ItemStack stack) { } private int consumeFuel(ItemStack stack, Simulation simulation) { - int burnTicks = getResource(stack).toStack().getBurnTime(null); + // TODO 26.1 +// int burnTicks = getResource(stack).toStack().getBurnTime(null); + int burnTicks = 0; if (burnTicks > 0) { if (simulation.isActing()) { var burnt = getResource(stack).toStack(); setAmount(stack, getAmount(stack) - 1); - if (burnt.hasCraftingRemainingItem()) { - new ItemHandler(stack, this) - .insertItem(0, burnt.getCraftingRemainingItem(), false, true, true); + var remainder = burnt.getCraftingRemainder(); + if (remainder != null) { + // TODO 26.1 +// new ItemHandler(stack, this) +// .insertItem(0, remainder.create(), false, true, true); } } return burnTicks; @@ -515,7 +527,7 @@ public boolean handleClick(Player player, ItemStack barrelLike, Mutable tooltip, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { var data = (SteamDrillTooltipData) getTooltipImage(stack).get(); // Water % - tooltip.add(MIText.WaterPercent.text(data.waterLevel).setStyle(TextHelper.WATER_TEXT)); + tooltip.accept(MIText.WaterPercent.text(data.waterLevel).setStyle(TextHelper.WATER_TEXT)); int barWater = (int) Math.ceil(data.waterLevel / 5d); int barVoid = 20 - barWater; // Water bar - tooltip.add(Component.literal("|".repeat(barWater)).setStyle(TextHelper.WATER_TEXT) + tooltip.accept(Component.literal("|".repeat(barWater)).setStyle(TextHelper.WATER_TEXT) .append(Component.literal("|".repeat(barVoid)).setStyle(Style.EMPTY.withColor(TextColor.fromRgb(0x6b6b6b))))); // Fuel left if (data.burnTicks > 0) { - tooltip.add(MIText.SecondsLeft.text(data.burnTicks / 100).setStyle(TextHelper.GRAY_TEXT)); + tooltip.accept(MIText.SecondsLeft.text(data.burnTicks / 100).setStyle(TextHelper.GRAY_TEXT)); } // 3x3 state - tooltip.add(MIText.MiningArea + tooltip.accept(MIText.MiningArea .text((this.isActivated(stack) ? MIText.MiningArea3x3 : MIText.MiningArea1x1).text().setStyle(TextHelper.NUMBER_TEXT)) .setStyle(TextHelper.GRAY_TEXT.withItalic(false))); // Silk touch - tooltip.add(MIText.SilkTouchState + tooltip.accept(MIText.SilkTouchState .text((isNotSilkTouch(stack) ? MIText.Deactivated.text().setStyle(TextHelper.RED) : MIText.Activated.text().setStyle(TextHelper.GREEN))) .setStyle(TextHelper.GRAY_TEXT.withItalic(false))); } @Override - public StorageBehaviour getBehaviour() { + public StorageBehaviour getBehaviour() { return DRILL_BEHAVIOUR; } - public record SteamDrillTooltipData(int waterLevel, int burnTicks, int maxBurnTicks, ItemVariant variant, long amount) + public record SteamDrillTooltipData(int waterLevel, int burnTicks, int maxBurnTicks, ItemResource variant, long amount) implements TooltipComponent {} } diff --git a/src/main/java/aztech/modern_industrialization/items/SteelUpgradeItem.java b/src/main/java/aztech/modern_industrialization/items/SteelUpgradeItem.java index 9878c59c7..a336251db 100644 --- a/src/main/java/aztech/modern_industrialization/items/SteelUpgradeItem.java +++ b/src/main/java/aztech/modern_industrialization/items/SteelUpgradeItem.java @@ -30,18 +30,26 @@ import aztech.modern_industrialization.machines.blockentities.SteamCraftingMachineBlockEntity; import aztech.modern_industrialization.machines.blockentities.SteamWaterPumpBlockEntity; import aztech.modern_industrialization.machines.init.MachineTier; +import com.mojang.logging.LogUtils; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundSource; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.Item; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.TagValueInput; +import net.minecraft.world.level.storage.TagValueOutput; +import net.minecraft.world.level.storage.ValueInput; +import org.slf4j.Logger; public class SteelUpgradeItem extends Item { + private static final Logger LOGGER = LogUtils.getLogger(); + public SteelUpgradeItem(Properties properties) { super(properties); } @@ -63,13 +71,13 @@ public InteractionResult useOn(UseOnContext context) { // Find new block Block block = context.getLevel().getBlockState(context.getClickedPos()).getBlock(); - ResourceLocation blockKey = BuiltInRegistries.BLOCK.getKey(block); - ResourceLocation newBlock = blockKey.withPath(p -> p.replace("bronze_", "steel_")); + Identifier blockKey = BuiltInRegistries.BLOCK.getKey(block); + Identifier newBlock = blockKey.withPath(p -> p.replace("bronze_", "steel_")); if (!BuiltInRegistries.BLOCK.containsKey(newBlock)) { return super.useOn(context); } - BlockState newState = BuiltInRegistries.BLOCK.get(newBlock).defaultBlockState(); + BlockState newState = BuiltInRegistries.BLOCK.getValue(newBlock).defaultBlockState(); // Do the upgrade if (context.getLevel().isClientSide()) { @@ -86,7 +94,10 @@ public InteractionResult useOn(UseOnContext context) { throw new RuntimeException("Upgraded machine should be a MachineBlockEntity, found " + newBe); } - newMachine.load(bronzeData, context.getLevel().registryAccess(), true); + try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(newBe.problemPath(), LOGGER)) { + ValueInput input = TagValueInput.create(reporter, context.getLevel().registryAccess(), bronzeData); + newMachine.load(input, true); + } // Give out the advancement if (context.getPlayer() instanceof ServerPlayer sp) { @@ -102,6 +113,6 @@ public InteractionResult useOn(UseOnContext context) { context.getItemInHand().shrink(1); } - return InteractionResult.sidedSuccess(context.getLevel().isClientSide()); + return InteractionResult.SUCCESS; } } diff --git a/src/main/java/aztech/modern_industrialization/items/WaxItem.java b/src/main/java/aztech/modern_industrialization/items/WaxItem.java index 481348d19..cc300ac30 100644 --- a/src/main/java/aztech/modern_industrialization/items/WaxItem.java +++ b/src/main/java/aztech/modern_industrialization/items/WaxItem.java @@ -24,7 +24,7 @@ package aztech.modern_industrialization.items; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.HoneycombItem; @@ -41,7 +41,7 @@ public WaxItem(Properties properties) { @Override public InteractionResult useOn(UseOnContext context) { var ret = super.useOn(context); - if (ret.indicateItemUse()) { + if (ret.consumesAction()) { if (context.getPlayer() instanceof ServerPlayer serverPlayer) { grantWaxOn(serverPlayer); } @@ -49,7 +49,7 @@ public InteractionResult useOn(UseOnContext context) { return ret; } - private static final ResourceLocation WAX_ON = ResourceLocation.withDefaultNamespace("husbandry/wax_on"); + private static final Identifier WAX_ON = Identifier.withDefaultNamespace("husbandry/wax_on"); private static void grantWaxOn(ServerPlayer serverPlayer) { var advancement = serverPlayer.server.getAdvancements().get(WAX_ON); diff --git a/src/main/java/aztech/modern_industrialization/items/armor/GraviChestPlateItem.java b/src/main/java/aztech/modern_industrialization/items/armor/GraviChestPlateItem.java index 758a075ae..b32bc808b 100644 --- a/src/main/java/aztech/modern_industrialization/items/armor/GraviChestPlateItem.java +++ b/src/main/java/aztech/modern_industrialization/items/armor/GraviChestPlateItem.java @@ -27,29 +27,33 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIComponents; import aztech.modern_industrialization.items.ActivatableItem; -import dev.technici4n.grandpower.api.ISimpleEnergyItem; -import net.minecraft.core.component.DataComponentType; +import aztech.modern_industrialization.items.MIEnergyItem; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.component.ItemAttributeModifiers; -import net.minecraft.world.level.Level; import net.neoforged.neoforge.common.NeoForgeMod; +import org.jspecify.annotations.Nullable; -public class GraviChestPlateItem extends ArmorItem implements ActivatableItem, ISimpleEnergyItem { - public GraviChestPlateItem(Properties settings) { - super(MIArmorMaterials.GRAVICHESTPLATE, Type.CHESTPLATE, - settings.stacksTo(1).rarity(Rarity.EPIC).component(MIComponents.ACTIVATED.get(), false)); +public class GraviChestPlateItem extends Item implements ActivatableItem, MIEnergyItem { + public GraviChestPlateItem(Properties properties) { + super(properties + // TODO 1.21.11 - do I need to set the assetId? + .equippable(EquipmentSlot.CHEST) + .stacksTo(1) + .rarity(Rarity.EPIC) + .component(MIComponents.ACTIVATED.get(), false)); } @Override public ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { - if (this.getStoredEnergy(stack) > 0 && this.isActivated(stack)) { + if (this.getEnergy(stack) > 0 && this.isActivated(stack)) { return ItemAttributeModifiers.builder() .add( NeoForgeMod.CREATIVE_FLIGHT, @@ -60,27 +64,12 @@ public ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { return ItemAttributeModifiers.EMPTY; } - @Override - public DataComponentType getEnergyComponent() { - return MIComponents.ENERGY.get(); - } - - public long getEnergy(ItemStack stack) { - return getStoredEnergy(stack); - } - - public void setEnergy(ItemStack stack, long energy) { - setStoredEnergy(stack, energy); - } - public static final long FLIGHT_COST = 1024; public static final long ENERGY_CAPACITY = 1 << 24; @Override - public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) { - if (level.isClientSide()) - return; - if (entity instanceof Player player && stack == player.getItemBySlot(EquipmentSlot.CHEST)) { + public void inventoryTick(ItemStack stack, ServerLevel level, Entity entity, @Nullable EquipmentSlot slot) { + if (entity instanceof Player player && slot == EquipmentSlot.CHEST) { if (player.getAbilities().flying) { setEnergy(stack, Math.max(0, getEnergy(stack) - FLIGHT_COST)); } @@ -96,19 +85,4 @@ public boolean isBarVisible(ItemStack stack) { public int getBarWidth(ItemStack stack) { return (int) Math.round(getEnergy(stack) / (double) ENERGY_CAPACITY * 13); } - - @Override - public long getEnergyCapacity(ItemStack stack) { - return ENERGY_CAPACITY; - } - - @Override - public long getEnergyMaxInput(ItemStack stack) { - return ENERGY_CAPACITY; - } - - @Override - public long getEnergyMaxOutput(ItemStack stack) { - return 0; - } } diff --git a/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java b/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java index a85bd615b..9ab6b910d 100644 --- a/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java +++ b/src/main/java/aztech/modern_industrialization/items/armor/JetpackItem.java @@ -29,9 +29,11 @@ import aztech.modern_industrialization.fluid.MIFluid; import aztech.modern_industrialization.items.ActivatableItem; import aztech.modern_industrialization.items.FluidFuelItemHelper; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import java.util.List; +import java.util.function.Consumer; + import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.world.entity.Entity; @@ -41,47 +43,53 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickAction; import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.item.component.TooltipDisplay; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.Vec3; import net.neoforged.fml.util.ObfuscationReflectionHelper; import net.neoforged.neoforge.fluids.FluidType; +import org.jspecify.annotations.Nullable; -public class JetpackItem extends ArmorItem implements ActivatableItem { +public class JetpackItem extends Item implements ActivatableItem { public static final int CAPACITY = 8 * FluidType.BUCKET_VOLUME; - public JetpackItem(Properties settings) { - super(MIArmorMaterials.DIESEL_JETPACK, Type.CHESTPLATE, - settings.stacksTo(1).rarity(Rarity.UNCOMMON).component(MIComponents.ACTIVATED.get(), false)); - } - - @Override - public boolean canElytraFly(ItemStack stack, LivingEntity entity) { - return isActivated(stack) && FluidFuelItemHelper.getAmount(stack) > 0; + public JetpackItem(Properties properties) { + super(properties + // TODO 1.21.11 - do I need to set the assetId? + .equippable(EquipmentSlot.CHEST) + .stacksTo(1) + .rarity(Rarity.UNCOMMON) + .component(MIComponents.ACTIVATED.get(), false)); } - @Override - public boolean elytraFlightTick(ItemStack stack, LivingEntity entity, int flightTicks) { - // Fluid consumption is handled in the armor tick. - return true; - } + // TODO 1.21.11 - need to be converted into a Glider component; which must probably be added/removed dynamically +// @Override +// public boolean canElytraFly(ItemStack stack, LivingEntity entity) { +// return isActivated(stack) && FluidFuelItemHelper.getAmount(stack) > 0; +// } +// +// @Override +// public boolean elytraFlightTick(ItemStack stack, LivingEntity entity, int flightTicks) { +// // Fluid consumption is handled in the armor tick. +// return true; +// } @Override - public void inventoryTick(ItemStack stack, Level level, Entity entity, int slotId, boolean isSelected) { - if (entity instanceof Player player && stack == player.getItemBySlot(EquipmentSlot.CHEST)) { + public void inventoryTick(ItemStack stack, ServerLevel level, Entity entity, @Nullable EquipmentSlot slot) { + if (entity instanceof Player player && slot == EquipmentSlot.CHEST) { tickArmor(stack, player); } } private void tickArmor(ItemStack stack, Player player) { if (isActivated(stack) && !player.onGround()) { - FluidVariant fluid = FluidFuelItemHelper.getFluid(stack); + var fluid = FluidFuelItemHelper.getFluid(stack); long amount = FluidFuelItemHelper.getAmount(stack); if (amount > 0) { // Always consume one mb of fuel @@ -148,15 +156,10 @@ public int getBarColor(ItemStack stack) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { FluidFuelItemHelper.appendTooltip(stack, tooltip, CAPACITY); } - @Override - public ItemAttributeModifiers getDefaultAttributeModifiers() { - return ItemAttributeModifiers.EMPTY; - } - @Override public boolean overrideOtherStackedOnMe(ItemStack stack, ItemStack otherStack, Slot slot, ClickAction clickType, Player player, SlotAccess cursorStackReference) { diff --git a/src/main/java/aztech/modern_industrialization/items/armor/MIArmorMaterials.java b/src/main/java/aztech/modern_industrialization/items/armor/MIArmorMaterials.java index 42dba2cd9..4d86bbc27 100644 --- a/src/main/java/aztech/modern_industrialization/items/armor/MIArmorMaterials.java +++ b/src/main/java/aztech/modern_industrialization/items/armor/MIArmorMaterials.java @@ -26,68 +26,28 @@ import aztech.modern_industrialization.MI; import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import net.minecraft.Util; -import net.minecraft.core.Holder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; +import aztech.modern_industrialization.MITags; +import net.minecraft.resources.ResourceKey; +import net.minecraft.util.Util; import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; -import net.minecraft.world.item.crafting.Ingredient; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredRegister; +import net.minecraft.world.item.equipment.ArmorMaterial; +import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.item.equipment.EquipmentAssets; public final class MIArmorMaterials { - private static final DeferredRegister DR = DeferredRegister.create(Registries.ARMOR_MATERIAL, MI.ID); - - public static final Holder DIESEL_JETPACK = DR.register("diesel_jetpack", location -> new ArmorMaterial( - Map.of(), - 0, - SoundEvents.ARMOR_EQUIP_GENERIC, - () -> { - throw new UnsupportedOperationException("Cannot repair Diesel Jetpack"); - }, - List.of(new ArmorMaterial.Layer(location)), - 0, - 0)); - public static final Holder GRAVICHESTPLATE = DR.register("gravichestplate", location -> new ArmorMaterial( - Map.of(), - 0, - SoundEvents.ARMOR_EQUIP_GENERIC, - () -> { - throw new UnsupportedOperationException("Cannot repair GraviChestPlate"); - }, - List.of(new ArmorMaterial.Layer(location)), - 0, - 0)); - public static final Holder RUBBER = DR.register("rubber", location -> new ArmorMaterial( - Util.make(new EnumMap<>(ArmorItem.Type.class), map -> { - for (var value : ArmorItem.Type.values()) { + public static final ArmorMaterial RUBBER = new ArmorMaterial( + 40, + Util.make(new EnumMap<>(ArmorType.class), map -> { + for (var value : ArmorType.values()) { map.put(value, 1); } }), 10, SoundEvents.ARMOR_EQUIP_GENERIC, - () -> Ingredient.of(BuiltInRegistries.ITEM.get(MI.id("rubber_sheet"))), - List.of(new ArmorMaterial.Layer(location)), 0, - 0)); - public static final Holder QUANTUM = DR.register("quantum", location -> new ArmorMaterial( - Map.of(), 0, - SoundEvents.ARMOR_EQUIP_GENERIC, - () -> { - throw new UnsupportedOperationException("Cannot repair quantum armor"); - }, - List.of(new ArmorMaterial.Layer(location)), - 0, - 0)); - - public static void init(IEventBus modEventBus) { - DR.register(modEventBus); - } + MITags.REPAIRS_RUBBER_ARMOR, + ResourceKey.create(EquipmentAssets.ROOT_ID, MI.id("rubber"))); private MIArmorMaterials() {} } diff --git a/src/main/java/aztech/modern_industrialization/items/armor/QuantumArmorItem.java b/src/main/java/aztech/modern_industrialization/items/armor/QuantumArmorItem.java index ecdd01435..0633a3d14 100644 --- a/src/main/java/aztech/modern_industrialization/items/armor/QuantumArmorItem.java +++ b/src/main/java/aztech/modern_industrialization/items/armor/QuantumArmorItem.java @@ -28,23 +28,30 @@ import aztech.modern_industrialization.MIRegistries; import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.entity.ai.attributes.AttributeModifier; -import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Rarity; import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.item.equipment.ArmorType; import net.neoforged.neoforge.common.NeoForgeMod; -public class QuantumArmorItem extends ArmorItem { - public QuantumArmorItem(ArmorItem.Type type, Properties settings) { - super(MIArmorMaterials.QUANTUM, type, settings.stacksTo(1).attributes(buildModifiers(type))); +public class QuantumArmorItem extends Item { + public QuantumArmorItem(ArmorType type, Properties properties) { + super(properties + // TODO 26.1 - do we need to set an asset as well? + .equippable(type.getSlot()) + .stacksTo(1) + .rarity(Rarity.EPIC) + .attributes(buildModifiers(type))); } - private static ItemAttributeModifiers buildModifiers(ArmorItem.Type type) { + private static ItemAttributeModifiers buildModifiers(ArmorType type) { var builder = ItemAttributeModifiers.builder() .add( MIRegistries.QUANTUM_ARMOR, // This needs a unique name for each armor piece or else the value of one piece will override the others new AttributeModifier(MI.id("quantum_armor_%s".formatted(type.getName())), 1, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.bySlot(type.getSlot())); - if (type == Type.CHESTPLATE) { + if (type == ArmorType.CHESTPLATE) { builder.add( NeoForgeMod.CREATIVE_FLIGHT, new AttributeModifier(MI.id("quantum_flight"), 1, AttributeModifier.Operation.ADD_VALUE), diff --git a/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java b/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java index 2604ac788..77630a0cd 100644 --- a/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java +++ b/src/main/java/aztech/modern_industrialization/items/diesel_tools/DieselToolItem.java @@ -31,21 +31,23 @@ import aztech.modern_industrialization.items.DynamicToolItem; import aztech.modern_industrialization.items.FluidFuelItemHelper; import aztech.modern_industrialization.items.ItemHelper; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.TextHelper; import java.util.List; import java.util.Map; +import java.util.function.Consumer; + import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Shearable; import net.minecraft.world.entity.player.Player; @@ -54,10 +56,10 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; import net.minecraft.world.item.ShovelItem; -import net.minecraft.world.item.Tier; -import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.ToolMaterial; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.ItemAttributeModifiers; +import net.minecraft.world.item.component.TooltipDisplay; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.enchantment.Enchantments; @@ -80,11 +82,6 @@ public DieselToolItem(Properties settings, double damage) { this.damage = damage; } - @Override - public boolean isEnchantable(ItemStack stack) { - return false; - } - @Override public boolean mineBlock(ItemStack stack, Level world, BlockState state, BlockPos pos, LivingEntity miner) { if (state.getDestroySpeed(world, pos) != 0.0f) { @@ -94,15 +91,14 @@ public boolean mineBlock(ItemStack stack, Level world, BlockState state, BlockPo } @Override - public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) { + public void hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity attacker) { FluidFuelItemHelper.decrement(stack); - return true; } @Override public boolean isCorrectToolForDrops(ItemStack stack, BlockState state) { if (isSupportedBlock(stack, state) && FluidFuelItemHelper.getAmount(stack) > 0 - && !state.is(Tiers.NETHERITE.getIncorrectBlocksForDrops())) { + && !state.is(BlockTags.INCORRECT_FOR_NETHERITE_TOOL)) { return true; } return super.isCorrectToolForDrops(stack, state); @@ -119,7 +115,7 @@ public float getDestroySpeed(ItemStack stack, BlockState state) { private float getMiningSpeedMultiplier(ItemStack stack) { long amount = FluidFuelItemHelper.getAmount(stack); if (amount > 0) { - FluidVariant fluid = FluidFuelItemHelper.getFluid(stack); + var fluid = FluidFuelItemHelper.getFluid(stack); int burnTicks = FluidFuel.getEu(fluid.getFluid()); if (burnTicks > 0) { return 1.0f + burnTicks / 8.0f; @@ -137,13 +133,13 @@ public ItemAttributeModifiers getDefaultAttributeModifiers(ItemStack stack) { } @Override - public void appendHoverText(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipFlag flag) { + public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay tooltipDisplay, Consumer tooltip, TooltipFlag flag) { FluidFuelItemHelper.appendTooltip(stack, tooltip, CAPACITY); if (context.registries() != null) { var enchantmentRegistry = context.registries().lookupOrThrow(Registries.ENCHANTMENT); - tooltip.add(MIText.MiningMode.text(enchantmentRegistry.get(isFortune(stack) ? Enchantments.FORTUNE : Enchantments.SILK_TOUCH) + tooltip.accept(MIText.MiningMode.text(enchantmentRegistry.get(isFortune(stack) ? Enchantments.FORTUNE : Enchantments.SILK_TOUCH) .orElseThrow().value().description().copy().setStyle(TextHelper.NUMBER_TEXT)).setStyle(TextHelper.GRAY_TEXT.withItalic(false))); } } @@ -182,17 +178,17 @@ private static void setFortune(ItemStack stack, boolean fortune) { } @Override - public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { + public InteractionResult use(Level world, Player user, InteractionHand hand) { // Toggle between silk touch and fortune if (hand == InteractionHand.MAIN_HAND && user.isShiftKeyDown()) { ItemStack stack = user.getItemInHand(hand); setFortune(stack, !isFortune(stack)); - if (!world.isClientSide) { + if (!world.isClientSide()) { user.displayClientMessage( isFortune(stack) ? MIText.ToolSwitchedFortune.text() : MIText.ToolSwitchedSilkTouch.text(), true); } - return InteractionResultHolder.sidedSuccess(stack, world.isClientSide); + return InteractionResult.SUCCESS; } return super.use(world, user, hand); } @@ -211,22 +207,22 @@ public InteractionResult useOn(UseOnContext context) { Block newBlock = StrippingAccess.getStrippedBlocks().get(state.getBlock()); if (newBlock != null) { w.playSound(player, pos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1, 1); - if (!w.isClientSide) { + if (!w.isClientSide()) { w.setBlock(pos, newBlock.defaultBlockState().setValue(RotatedPillarBlock.AXIS, state.getValue(RotatedPillarBlock.AXIS)), 11); FluidFuelItemHelper.decrement(stack); } - return InteractionResult.sidedSuccess(w.isClientSide); + return InteractionResult.SUCCESS; } } if (stack.is(ItemTags.SHOVELS)) { BlockState newState = PathingAccess.getPathStates().get(state.getBlock()); if (newState != null) { w.playSound(player, pos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1, 1); - if (!w.isClientSide) { + if (!w.isClientSide()) { w.setBlock(pos, newState, 11); FluidFuelItemHelper.decrement(stack); } - return InteractionResult.sidedSuccess(w.isClientSide); + return InteractionResult.SUCCESS; } } if (stack.is(ItemTags.HOES)) { @@ -237,14 +233,14 @@ public InteractionResult useOn(UseOnContext context) { // Consumer consumer = pair.getSecond(); // if (predicate.test(context)) { // w.playSound(player, pos, SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0F, 1.0F); -// if (!w.isClientSide) { +// if (!w.isClientSide()) { // consumer.accept(context); // if (player != null) { // FluidFuelItemHelper.decrement(stack); // } // } // -// return InteractionResult.sidedSuccess(w.isClientSide); +// return InteractionResult.sidedSuccess(w.isClientSide()); // } // } } @@ -276,9 +272,10 @@ public boolean isFoil(ItemStack pStack) { return FluidFuelItemHelper.getAmount(pStack) > 0; } + // TODO: use data map instead private static class StrippingAccess extends AxeItem { - private StrippingAccess(Tier material, Properties settings) { - super(material, settings); + private StrippingAccess(ToolMaterial material, float attackDamageBaseline, float attackSpeedBaseline, Item.Properties properties) { + super(material, attackDamageBaseline, attackSpeedBaseline, properties); } public static Map getStrippedBlocks() { @@ -287,8 +284,8 @@ public static Map getStrippedBlocks() { } private static class PathingAccess extends ShovelItem { - private PathingAccess(Tier material, Properties settings) { - super(material, settings); + private PathingAccess(ToolMaterial material, float attackDamageBaseline, float attackSpeedBaseline, Item.Properties properties) { + super(material, attackDamageBaseline, attackSpeedBaseline, properties); } public static Map getPathStates() { @@ -302,9 +299,10 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li int costMb = (int) (defaultMb / speedMultiplier); if (FluidFuelItemHelper.getAmount(stack) >= costMb) { + // TODO: use IShearable instead if (stack.is(Tags.Items.TOOLS_SHEAR) && interactionTarget instanceof Shearable shearable) { - if (!interactionTarget.level().isClientSide && shearable.readyForShearing()) { - shearable.shear(SoundSource.PLAYERS); + if (interactionTarget.level() instanceof ServerLevel serverLevel && shearable.readyForShearing()) { + shearable.shear(serverLevel, SoundSource.PLAYERS, stack); interactionTarget.gameEvent(GameEvent.SHEAR, player); return InteractionResult.SUCCESS; } else { diff --git a/src/main/java/aztech/modern_industrialization/items/tools/QuantumSword.java b/src/main/java/aztech/modern_industrialization/items/tools/QuantumSword.java index 3d9503a03..e5c6b0ed1 100644 --- a/src/main/java/aztech/modern_industrialization/items/tools/QuantumSword.java +++ b/src/main/java/aztech/modern_industrialization/items/tools/QuantumSword.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIRegistries; import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeModifier; @@ -39,7 +39,7 @@ import net.minecraft.world.level.block.state.BlockState; public class QuantumSword extends Item { - public static final ResourceLocation BASE_INFINITE_DAMAGE = MI.id("base_infinite_damage"); + public static final Identifier BASE_INFINITE_DAMAGE = MI.id("base_infinite_damage"); public QuantumSword(Properties settings) { super(settings.attributes(ItemAttributeModifiers.builder() @@ -51,15 +51,14 @@ public QuantumSword(Properties settings) { } @Override - public boolean hurtEnemy(ItemStack pStack, LivingEntity pTarget, LivingEntity pAttacker) { + public void hurtEnemy(ItemStack pStack, LivingEntity pTarget, LivingEntity pAttacker) { // TODO: if lama was hit, kill the wander trader (and the opposite) and give an // advancement // TODO: same for phantoms - return true; } @Override - public boolean canAttackBlock(BlockState state, Level level, BlockPos pos, Player player) { - return !player.isCreative(); + public boolean canDestroyBlock(ItemStack itemStack, BlockState state, Level level, BlockPos pos, LivingEntity user) { + return !(user instanceof Player player && player.isCreative()); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/MachineBlock.java b/src/main/java/aztech/modern_industrialization/machines/MachineBlock.java index 4afc65079..4a8e133f0 100644 --- a/src/main/java/aztech/modern_industrialization/machines/MachineBlock.java +++ b/src/main/java/aztech/modern_industrialization/machines/MachineBlock.java @@ -36,7 +36,6 @@ import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.ItemInteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -46,6 +45,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.redstone.Orientation; import net.minecraft.world.phys.BlockHitResult; import org.jspecify.annotations.Nullable; @@ -65,20 +65,20 @@ public MachineBlockEntity newBlockEntity(BlockPos pos, BlockState state) { } @Override - protected ItemInteractionResult useItemOn(ItemStack handStack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, + protected InteractionResult useItemOn(ItemStack handStack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (world.isClientSide) { - return ItemInteractionResult.SUCCESS; + if (world.isClientSide()) { + return InteractionResult.SUCCESS; } else { BlockEntity be = world.getBlockEntity(pos); if (be instanceof MachineBlockEntity machine) { var beResult = machine.useItemOn(player, hand, MachineOverlay.findHitSide(hit)); if (beResult.consumesAction()) { - world.blockUpdated(pos, Blocks.AIR); + world.updateNeighborsAt(pos, Blocks.AIR); return beResult; } } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } } @@ -88,7 +88,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP if (be instanceof MachineBlockEntity machine) { machine.openMenu((ServerPlayer) player); } - return InteractionResult.sidedSuccess(level.isClientSide); + return InteractionResult.SUCCESS; } @SuppressWarnings("ConstantConditions") @@ -99,24 +99,20 @@ public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable L } @Override - protected void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) { - if (!state.is(newState.getBlock())) { - // Drop items - BlockEntity be = world.getBlockEntity(pos); - - if (be instanceof MachineBlockEntity machine) { - List dropExtra = machine.dropExtra(); - for (ConfigurableItemStack stack : machine.getInventory().getItemStacks()) { - Containers.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), stack.getResource().toStack((int) stack.getAmount())); - stack.setAmount(0); - } + protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) { + // Drop items + if (level.getBlockEntity(pos) instanceof MachineBlockEntity machine) { + List dropExtra = machine.dropExtra(); + for (ConfigurableItemStack stack : machine.getInventory().getItemStacks()) { + Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), stack.getResource().toStack((int) stack.getAmount())); + stack.setAmount(0); + } - for (ItemStack extra : dropExtra) { - Containers.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), extra); - } + for (ItemStack extra : dropExtra) { + Containers.dropItemStack(level, pos.getX(), pos.getY(), pos.getZ(), extra); } } - super.onRemove(state, world, pos, newState, moved); + super.affectNeighborsAfterRemoval(state, level, pos, movedByPiston); } public MachineBlockEntity getBlockEntityInstance() { @@ -127,12 +123,12 @@ public MachineBlockEntity getBlockEntityInstance() { } @Override - public boolean hasAnalogOutputSignal(BlockState state) { + protected boolean hasAnalogOutputSignal(BlockState state) { return getBlockEntityInstance().hasComparatorOutput(); } @Override - public int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos) { + protected int getAnalogOutputSignal(BlockState state, Level level, BlockPos pos, Direction direction) { if (level.getBlockEntity(pos) instanceof MachineBlockEntity machine) { return machine.getComparatorOutput(); } @@ -147,7 +143,7 @@ public void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldS } @Override - public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { + protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, @Nullable Orientation orientation, boolean movedByPiston) { if (level.getBlockEntity(pos) instanceof MachineBlockEntity machine) { machine.refreshRedstoneStatus(); } diff --git a/src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java index 8addfe679..493adf813 100644 --- a/src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/MachineBlockEntity.java @@ -27,6 +27,8 @@ import aztech.modern_industrialization.MICapabilities; import aztech.modern_industrialization.blocks.FastBlockEntity; import aztech.modern_industrialization.blocks.WrenchableBlockEntity; +import aztech.modern_industrialization.inventory.ConfigurableFluidStack; +import aztech.modern_industrialization.inventory.ConfigurableItemStack; import aztech.modern_industrialization.inventory.MIInventory; import aztech.modern_industrialization.machines.components.DropableComponent; import aztech.modern_industrialization.machines.components.OrientationComponent; @@ -39,7 +41,10 @@ import aztech.modern_industrialization.util.WorldHelper; import java.util.ArrayList; import java.util.List; -import net.minecraft.Util; +import com.mojang.logging.LogUtils; +import com.mojang.serialization.Codec; +import net.minecraft.util.ProblemReporter; +import net.minecraft.util.Util; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; @@ -50,7 +55,7 @@ import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Inventory; @@ -59,11 +64,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.storage.TagValueOutput; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.minecraft.world.phys.BlockHitResult; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.client.model.data.ModelData; +import net.neoforged.neoforge.model.data.ModelData; import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jspecify.annotations.Nullable; +import org.slf4j.Logger; /** * The base block entity for the machine system. Contains components, and an @@ -72,6 +81,7 @@ @SuppressWarnings("rawtypes") public abstract class MachineBlockEntity extends FastBlockEntity implements MenuProvider, WrenchableBlockEntity { + private static final Logger LOGGER = LogUtils.getLogger(); public final ComponentStorage.GuiServer guiComponents = new ComponentStorage.GuiServer(); public final ComponentStorage.Server components = new ComponentStorage.Server(); public final MachineGuiParameters guiParams; @@ -124,10 +134,8 @@ public final AbstractContainerMenu createMenu(int syncId, Inventory inv, Player public final void writeScreenOpeningData(RegistryFriendlyByteBuf buf) { // Write inventory MIInventory inv = getInventory(); - CompoundTag tag = new CompoundTag(); - NbtHelper.putList(tag, "items", inv.getItemStacks(), configurableItemStack -> configurableItemStack.toNbt(buf.registryAccess())); - NbtHelper.putList(tag, "fluids", inv.getFluidStacks(), configurableFluidStack -> configurableFluidStack.toNbt(buf.registryAccess())); - buf.writeNbt(tag); + ConfigurableItemStack.LIST_STREAM_CODEC.encode(buf, inv.getItemStacks()); + ConfigurableFluidStack.LIST_STREAM_CODEC.encode(buf, inv.getFluidStacks()); // Write slot positions inv.itemPositions.write(buf); inv.fluidPositions.write(buf); @@ -142,7 +150,7 @@ public final void writeScreenOpeningData(RegistryFriendlyByteBuf buf) { private static void writeInitialGuiComponent(RegistryFriendlyByteBuf buf, GuiComponentServer component) { var type = component.getType(); - buf.writeResourceLocation(type.id()); + buf.writeIdentifier(type.id()); type.paramsCodec().encode(buf, component.getParams()); type.dataCodec().encode(buf, component.extractData()); } @@ -150,8 +158,8 @@ private static void writeInitialGuiComponent(RegistryFriendlyByteBuf buf, /** * @param face The face that was targeted, taking the overlay into account. */ - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + return InteractionResult.TRY_WITH_EMPTY_HAND; } public void openMenu(ServerPlayer player) { @@ -169,7 +177,7 @@ public void onPlaced(@Nullable LivingEntity placer, ItemStack itemStack) { @Override public boolean useWrench(Player player, InteractionHand hand, BlockHitResult hitResult) { if (orientation.useWrench(player, hand, MachineOverlay.findHitSide(hitResult))) { - getLevel().blockUpdated(getBlockPos(), Blocks.AIR); + getLevel().updateNeighborsAt(getBlockPos(), Blocks.AIR); setChanged(); if (!getLevel().isClientSide()) { sync(); @@ -198,36 +206,39 @@ public void sync(boolean forceRemesh) { @Override public CompoundTag getUpdateTag(HolderLookup.Provider registries) { - CompoundTag tag = new CompoundTag(); - tag.putBoolean("remesh", syncCausesRemesh); - syncCausesRemesh = false; - for (MachineComponent component : components) { - component.writeClientNbt(tag, registries); + try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(this.problemPath(), LOGGER)) { + TagValueOutput output = TagValueOutput.createWithContext(reporter, registries); + output.putBoolean("remesh", syncCausesRemesh); + syncCausesRemesh = false; + for (MachineComponent component : components) { + component.writeClientNbt(output); + } + return output.buildResult(); } - return tag; } @Override - public final void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + public final void saveAdditional(ValueOutput output) { for (MachineComponent component : components) { - component.writeNbt(tag, registries); + component.writeNbt(output); } } @Override - public final void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { - load(tag, registries, false); + public final void loadAdditional(ValueInput input) { + load(input, false); } - public final void load(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - if (!tag.contains("remesh")) { + public final void load(ValueInput input, boolean isUpgradingMachine) { + var remesh = input.read("remesh", Codec.BOOL); + if (remesh.isEmpty()) { for (MachineComponent component : components) { - component.readNbt(tag, registries, isUpgradingMachine); + component.readNbt(input, isUpgradingMachine); } } else { - boolean forceChunkRemesh = tag.getBoolean("remesh"); + boolean forceChunkRemesh = remesh.get(); for (MachineComponent component : components) { - component.readClientNbt(tag, registries); + component.readClientNbt(input); } if (forceChunkRemesh) { WorldHelper.forceChunkRemesh(level, worldPosition); @@ -249,15 +260,17 @@ public Packet getUpdatePacket() { public static void registerItemApi(BlockEntityType bet) { MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, bet, - (be, direction) -> ((MachineBlockEntity) be).getInventory().itemStorage.itemHandler); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, bet, +// (be, direction) -> ((MachineBlockEntity) be).getInventory().itemStorage.itemHandler); }); } public static void registerFluidApi(BlockEntityType bet) { MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, - (be, direction) -> ((MachineBlockEntity) be).getInventory().fluidStorage.fluidHandler); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, +// (be, direction) -> ((MachineBlockEntity) be).getInventory().fluidStorage.fluidHandler); }); } diff --git a/src/main/java/aztech/modern_industrialization/machines/MachineComponent.java b/src/main/java/aztech/modern_industrialization/machines/MachineComponent.java index 016234a7a..ebd974433 100644 --- a/src/main/java/aztech/modern_industrialization/machines/MachineComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/MachineComponent.java @@ -24,41 +24,41 @@ package aztech.modern_industrialization.machines; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public interface MachineComponent { - void writeNbt(CompoundTag tag, HolderLookup.Provider registries); + void writeNbt(ValueOutput output); - void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine); + void readNbt(ValueInput input, boolean isUpgradingMachine); - default void writeClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - writeNbt(tag, registries); + default void writeClientNbt(ValueOutput output) { + writeNbt(output); } - default void readClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - readNbt(tag, registries, false); + default void readClientNbt(ValueInput input) { + readNbt(input, false); } interface ClientOnly extends MachineComponent { @Override - default void writeNbt(CompoundTag tag, HolderLookup.Provider registries) {} + default void writeNbt(ValueOutput output) {} @Override - default void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) {} + default void readNbt(ValueInput input, boolean isUpgradingMachine) {} @Override - void writeClientNbt(CompoundTag tag, HolderLookup.Provider registries); + void writeClientNbt(ValueOutput output); @Override - void readClientNbt(CompoundTag tag, HolderLookup.Provider registries); + void readClientNbt(ValueInput input); } interface ServerOnly extends MachineComponent { @Override - default void writeClientNbt(CompoundTag tag, HolderLookup.Provider registries) {} + default void writeClientNbt(ValueOutput output) {} @Override - default void readClientNbt(CompoundTag tag, HolderLookup.Provider registries) {} + default void readClientNbt(ValueInput input) {} } } diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractCraftingMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractCraftingMachineBlockEntity.java index 211ed168c..5c6587572 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractCraftingMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractCraftingMachineBlockEntity.java @@ -88,7 +88,7 @@ public long getMaxRecipeEu() { @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { boolean newActive = crafter.tickRecipe(); isActiveComponent.updateActive(newActive, this); if (orientation.extractItems) { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractStorageMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractStorageMachineBlockEntity.java index 9bb0f4c57..b191a2371 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractStorageMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractStorageMachineBlockEntity.java @@ -41,14 +41,16 @@ import aztech.modern_industrialization.machines.helper.EnergyHelper; import aztech.modern_industrialization.machines.models.MachineCasing; import aztech.modern_industrialization.machines.models.MachineModelClientData; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; import aztech.modern_industrialization.util.Simulation; import aztech.modern_industrialization.util.Tickable; +import com.google.common.primitives.Ints; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.neoforged.neoforge.transfer.access.ItemAccess; +import net.neoforged.neoforge.transfer.transaction.Transaction; public abstract class AbstractStorageMachineBlockEntity extends MachineBlockEntity implements Tickable, EnergyComponentHolder { protected final EnergyComponent energy; @@ -132,8 +134,8 @@ public EnergyComponent getEnergyComponent() { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { - var energyItem = player.getItemInHand(hand).getCapability(EnergyApi.ITEM); + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + var energyItem = ItemAccess.forPlayerInteraction(player, hand).getCapability(EnergyApi.ITEM); int stackSize = player.getItemInHand(hand).getCount(); if (energyItem != null) { if (!player.level().isClientSide()) { @@ -141,7 +143,7 @@ protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, D for (int i = 0; i < 10000; ++i) { // Try up to 10000 times to bypass I/O limits try (Transaction transaction = Transaction.openRoot()) { - long inserted = energyItem.receive(energy.getEu() / stackSize, false); + long inserted = energyItem.insert(Ints.saturatedCast(energy.getEu()), transaction); if (inserted == 0) { break; @@ -157,7 +159,7 @@ protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, D if (!insertedSomething) { for (int i = 0; i < 10000; ++i) { // Try up to 10000 times to bypass I/O limits try (Transaction transaction = Transaction.openRoot()) { - long extracted = energyItem.extract(energy.getRemainingCapacity() / stackSize, false); + long extracted = energyItem.extract(Ints.saturatedCast(energy.getRemainingCapacity()), transaction); if (extracted == 0) { break; @@ -169,7 +171,7 @@ protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, D } } } - return ItemInteractionResult.sidedSuccess(player.level().isClientSide()); + return InteractionResult.SUCCESS; } return super.useItemOn(player, hand, face); } diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractWaterPumpBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractWaterPumpBlockEntity.java index f81d6f9ac..219472515 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractWaterPumpBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/AbstractWaterPumpBlockEntity.java @@ -32,15 +32,15 @@ import aztech.modern_industrialization.machines.components.OrientationComponent; import aztech.modern_industrialization.machines.gui.MachineGuiParameters; import aztech.modern_industrialization.machines.guicomponents.ProgressBar; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import aztech.modern_industrialization.util.Tickable; import java.util.List; import net.minecraft.core.BlockPos; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public abstract class AbstractWaterPumpBlockEntity extends MachineBlockEntity implements Tickable { protected static final int OUTPUT_SLOT_X = 110; @@ -55,13 +55,13 @@ public AbstractWaterPumpBlockEntity(BEP bep, String blockName) { registerGuiComponent(new ProgressBar(PROGRESS_BAR, () -> (float) pumpingTicks / OPERATION_TICKS)); this.registerComponents(isActiveComponent, new MachineComponent() { @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putInt("pumpingTicks", pumpingTicks); + public void writeNbt(ValueOutput output) { + output.putInt("pumpingTicks", pumpingTicks); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - pumpingTicks = tag.getInt("pumpingTicks"); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + pumpingTicks = input.getIntOr("pumpingTicks", 0); } }); } @@ -75,7 +75,7 @@ public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean i @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { List fluidStacks = getInventory().getFluidStacks(); ConfigurableFluidStack waterStack = fluidStacks.get(fluidStacks.size() - 1); if (waterStack.getRemainingSpace() < FluidType.BUCKET_VOLUME / 8) { @@ -86,8 +86,8 @@ public void tick() { updateActive(eu > 0); if (pumpingTicks == OPERATION_TICKS) { - waterStack.setKey(FluidVariant.of(Fluids.WATER)); - waterStack.increment(Math.min((long) getWaterMultiplier() * getWaterSourceCount() * FluidType.BUCKET_VOLUME / 8, + waterStack.setKey(FluidResource.of(Fluids.WATER)); + waterStack.increment(Math.min(getWaterMultiplier() * getWaterSourceCount() * FluidType.BUCKET_VOLUME / 8, waterStack.getRemainingSpace())); pumpingTicks = 0; } diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/BoilerMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/BoilerMachineBlockEntity.java index 13c42a02c..5333c5c50 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/BoilerMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/BoilerMachineBlockEntity.java @@ -45,11 +45,12 @@ import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.material.Fluids; import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.fluids.FluidUtil; +import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.items.wrapper.PlayerInvWrapper; public class BoilerMachineBlockEntity extends MachineBlockEntity implements Tickable { @@ -112,7 +113,7 @@ public MachineModelClientData getMachineModelData() { @Override public void tick() { - if (level.isClientSide) + if (level.isClientSide()) return; steamHeater.tick(Collections.singletonList(inventory.getFluidStacks().get(0)), Collections.singletonList(inventory.getFluidStacks().get(1))); @@ -133,15 +134,15 @@ public List getTooltips() { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { var heldItem = player.getItemInHand(hand); if (!heldItem.isEmpty()) { - var waterSlotHandler = new MIFluidStorage(inventory.getFluidStacks().subList(0, 1)).fluidHandler; + var waterSlotHandler = IFluidHandler.of(new MIFluidStorage(inventory.getFluidStacks().subList(0, 1))); var result = FluidUtil.tryEmptyContainerAndStow(heldItem, waterSlotHandler, new PlayerInvWrapper(player.getInventory()), Integer.MAX_VALUE, player, true); if (result.isSuccess()) { player.setItemInHand(hand, result.getResult()); - return ItemInteractionResult.sidedSuccess(player.level().isClientSide); + return InteractionResult.SUCCESS; } } return super.useItemOn(player, hand, face); diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricCraftingMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricCraftingMachineBlockEntity.java index 79c78d730..ffe862d6e 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricCraftingMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricCraftingMachineBlockEntity.java @@ -43,7 +43,7 @@ import aztech.modern_industrialization.util.Simulation; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -100,7 +100,7 @@ public static void registerEnergyApi(BlockEntityType bet) { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { var result = super.useItemOn(player, hand, face); if (!result.consumesAction()) { result = redstoneControl.onUse(this, player, hand); diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java index 1570eed44..9e4555d5c 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/ElectricWaterPumpBlockEntity.java @@ -44,7 +44,7 @@ import java.util.Collections; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.material.Fluids; @@ -54,7 +54,7 @@ public class ElectricWaterPumpBlockEntity extends AbstractWaterPumpBlockEntity i public ElectricWaterPumpBlockEntity(BEP bep) { super(bep, "electric_water_pump"); - long capacity = FluidType.BUCKET_VOLUME * 32; + int capacity = FluidType.BUCKET_VOLUME * 32; this.inventory = new MIInventory(Collections.emptyList(), Collections.singletonList(ConfigurableFluidStack.lockedOutputSlot(capacity, Fluids.WATER)), SlotPositions.empty(), new SlotPositions.Builder().addSlot(OUTPUT_SLOT_X, OUTPUT_SLOT_Y).build()); @@ -117,7 +117,7 @@ public static void registerEnergyApi(BlockEntityType bet) { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { var result = super.useItemOn(player, hand, face); if (!result.consumesAction()) { result = redstoneControl.onUse(this, player, hand); diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/GeneratorMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/GeneratorMachineBlockEntity.java index 77254febf..66f8b451d 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/GeneratorMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/GeneratorMachineBlockEntity.java @@ -68,7 +68,7 @@ public GeneratorMachineBlockEntity(BEP bep, boolean hasFacing, CableTier outputTier, long energyCapacity, - long fluidCapacity, + int fluidCapacity, FluidItemConsumerComponent fluidItemConsumer) { super(bep, new MachineGuiParameters.Builder(name, fluidItemConsumer.doAllowMoreThanOne()).build(), hasFacing ? new OrientationComponent.Params(true, false, false) : OrientationComponent.Params.noFacing(false, false)); @@ -147,7 +147,7 @@ public GeneratorMachineBlockEntity(BEP bep, boolean hasFacing, CableTier outputTier, long energyCapacity, - long fluidCapacity, + int fluidCapacity, long maxEnergyOutput, FluidDefinition acceptedFluid, long fluidEUperMb) { @@ -173,7 +173,7 @@ public MachineModelClientData getMachineModelData() { @Override public void tick() { - if (level == null || level.isClientSide) + if (level == null || level.isClientSide()) return; if (!redstoneControl.doAllowNormalOperation(this)) { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/ReplicatorMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/ReplicatorMachineBlockEntity.java index 26c1e776a..0b630a335 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/ReplicatorMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/ReplicatorMachineBlockEntity.java @@ -39,21 +39,24 @@ import aztech.modern_industrialization.machines.guicomponents.ProgressBar; import aztech.modern_industrialization.machines.guicomponents.SlotPanel; import aztech.modern_industrialization.machines.models.MachineModelClientData; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; import aztech.modern_industrialization.util.Tickable; import java.util.Collections; import java.util.List; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; + import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.access.ItemAccess; public class ReplicatorMachineBlockEntity extends MachineBlockEntity implements Tickable { private final IsActiveComponent isActiveComponent; @@ -72,7 +75,7 @@ public ReplicatorMachineBlockEntity(BEP bep) { this.redstoneControl = new RedstoneControlComponent(); ProgressBar.Params progressBarParams = new ProgressBar.Params(85, 34, "arrow"); - long capacity = FluidType.BUCKET_VOLUME * 256; + int capacity = FluidType.BUCKET_VOLUME * 256; List fluidInput = Collections .singletonList(ConfigurableFluidStack.lockedInputSlot(capacity, MIFluids.UU_MATTER.asFluid())); @@ -87,13 +90,13 @@ public ReplicatorMachineBlockEntity(BEP bep) { this.registerComponents(isActiveComponent, inventoryComponent, redstoneControl, new MachineComponent() { @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putInt("progressTick", progressTick); + public void writeNbt(ValueOutput output) { + output.putInt("progressTick", progressTick); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - progressTick = tag.getInt("progressTick"); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + progressTick = input.getIntOr("progressTick", 0); } }); @@ -121,21 +124,19 @@ private static boolean canReplicate(ItemStack stack) { } // Containers are only allowed if they are empty. - var itemHandler = stack.getCapability(Capabilities.ItemHandler.ITEM); + var itemAccess = ItemAccess.forStack(stack); + var itemHandler = itemAccess.getCapability(Capabilities.Item.ITEM); if (itemHandler != null) { - int slots = itemHandler.getSlots(); - for (int i = 0; i < slots; ++i) { - if (!itemHandler.getStackInSlot(i).isEmpty()) { - return false; - } + if (!ResourceHandlerUtil.isEmpty(itemHandler)) { + return false; } } // Disallow anything that contains disallowed fluids - var fluidItem = stack.getCapability(Capabilities.FluidHandler.ITEM); + var fluidItem = itemAccess.getCapability(Capabilities.Fluid.ITEM); if (fluidItem != null) { - for (int tank = 0; tank < fluidItem.getTanks(); ++tank) { - if (fluidItem.getFluidInTank(tank).is(BLACKLISTED_FLUIDS)) { + for (int tank = 0; tank < fluidItem.size(); ++tank) { + if (fluidItem.getResource(tank).is(BLACKLISTED_FLUIDS)) { return false; } } @@ -145,9 +146,9 @@ private static boolean canReplicate(ItemStack stack) { } public boolean replicationStep(boolean simulate) { - ItemVariant itemVariant = inventoryComponent.getItemInputs().get(0).getResource(); + ItemResource itemVariant = inventoryComponent.getItemInputs().get(0).getResource(); - if (!itemVariant.isBlank()) { + if (!itemVariant.isEmpty()) { if (!canReplicate(itemVariant.toStack())) { return false; } @@ -157,7 +158,7 @@ public boolean replicationStep(boolean simulate) { MIFluidStorage fluidStorage = new MIFluidStorage(inventoryComponent.getFluidInputs()); long inserted = itemStorage.insertAllSlot(itemVariant, 1, tx); - long uuMatterExtraced = fluidStorage.extractAllSlot(MIFluids.UU_MATTER.variant(), FluidType.BUCKET_VOLUME / 10, tx); + long uuMatterExtraced = fluidStorage.extractAllSlot(MIFluids.UU_MATTER.resource(), FluidType.BUCKET_VOLUME / 10, tx); if (inserted == 1 && uuMatterExtraced == FluidType.BUCKET_VOLUME / 10) { if (!simulate) { @@ -173,7 +174,7 @@ public boolean replicationStep(boolean simulate) { @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { if (!redstoneControl.doAllowNormalOperation(this)) { isActiveComponent.updateActive(false, this); } else { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamCraftingMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamCraftingMachineBlockEntity.java index eb7faec4d..36155a30d 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamCraftingMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamCraftingMachineBlockEntity.java @@ -39,7 +39,7 @@ import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; public class SteamCraftingMachineBlockEntity extends AbstractCraftingMachineBlockEntity { @@ -70,7 +70,7 @@ public MachineModelClientData getMachineModelData() { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { var result = super.useItemOn(player, hand, face); if (!result.consumesAction()) { return overclockComponent.onUse(this, player, hand); diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamWaterPumpBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamWaterPumpBlockEntity.java index a95e34dac..e994eea1c 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamWaterPumpBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/SteamWaterPumpBlockEntity.java @@ -43,7 +43,7 @@ public SteamWaterPumpBlockEntity(BEP bep, boolean bronze) { super(bep, bronze ? "bronze_water_pump" : "steel_water_pump"); this.bronze = bronze; - long capacity = FluidType.BUCKET_VOLUME * (bronze ? 8 : 16); + int capacity = FluidType.BUCKET_VOLUME * (bronze ? 8 : 16); List fluidStacks = Arrays.asList(ConfigurableFluidStack.lockedInputSlot(capacity, MIFluids.STEAM.asFluid()), ConfigurableFluidStack.lockedOutputSlot(capacity, Fluids.WATER)); SlotPositions fluidPositions = new SlotPositions.Builder().addSlot(21, 30).addSlot(OUTPUT_SLOT_X, OUTPUT_SLOT_Y).build(); diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/LargeTankHatch.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/LargeTankHatch.java index 9f1535c2d..ae0584233 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/LargeTankHatch.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/LargeTankHatch.java @@ -42,8 +42,9 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.entity.BlockEntityType; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import net.neoforged.neoforge.fluids.capability.templates.EmptyFluidHandler; +import net.neoforged.neoforge.transfer.EmptyResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jspecify.annotations.Nullable; public class LargeTankHatch extends HatchBlockEntity implements FluidStorageComponentHolder { @@ -99,13 +100,14 @@ public void setController(LargeTankMultiblockBlockEntity controller) { invalidateCapabilities(); } - private IFluidHandler getStorage() { - return controller == null ? EmptyFluidHandler.INSTANCE : controller.getExposedFluidHandler(); + private ResourceHandler getStorage() { + return controller == null ? EmptyResourceHandler.instance() : controller.getExposedFluidHandler(); } public static void registerFluidApi(BlockEntityType bet) { MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, (be, direction) -> ((LargeTankHatch) be).getStorage()); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, (be, direction) -> ((LargeTankHatch) be).getStorage()); }); } diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/NuclearHatch.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/NuclearHatch.java index 3eefeab0f..e83360b97 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/NuclearHatch.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/hatches/NuclearHatch.java @@ -42,10 +42,10 @@ import aztech.modern_industrialization.machines.multiblocks.HatchType; import aztech.modern_industrialization.machines.multiblocks.HatchTypes; import aztech.modern_industrialization.nuclear.*; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.transaction.Transaction; import com.google.common.base.Preconditions; import java.util.*; import java.util.stream.Collectors; @@ -65,7 +65,7 @@ public class NuclearHatch extends HatchBlockEntity implements NuclearTile { public final NeutronHistoryComponent neutronHistory; public final TemperatureComponent nuclearReactorComponent; public final boolean isFluid; - public static final long capacity = 64 * FluidType.BUCKET_VOLUME; + public static final int capacity = 64 * FluidType.BUCKET_VOLUME; public NuclearHatch(BEP bep, boolean isFluid) { super(bep, new MachineGuiParameters.Builder(isFluid ? "nuclear_fluid_hatch" : "nuclear_item_hatch", true).build(), @@ -143,8 +143,8 @@ public final void tick() { this.inventory.autoExtractItems(level, worldPosition, Direction.UP); } - ItemVariant itemVariant = (ItemVariant) this.getVariant(); - if (!itemVariant.isBlank() && itemVariant.getItem() instanceof NuclearAbsorbable abs) { + ItemResource itemVariant = (ItemResource) this.getVariant(); + if (!itemVariant.isEmpty() && itemVariant.getItem() instanceof NuclearAbsorbable abs) { if (abs.getNeutronProduct() != null) { try (Transaction tx = Transaction.openRoot()) { this.inventory.itemStorage.insert(abs.getNeutronProduct(), abs.getNeutronProductAmount(), tx, @@ -189,7 +189,7 @@ public double getMeanEuGeneration() { } @Override - public TransferVariant getVariant() { + public Resource getVariant() { if (isFluid) { return this.inventory.getFluidStacks().get(0).getResource(); } else { @@ -229,9 +229,9 @@ public int neutronGenerationTick(NuclearEfficiencyHistoryComponent efficiencyHis int neutronsProduced = 0; if (!isFluid) { - ItemVariant itemVariant = (ItemVariant) this.getVariant(); + ItemResource itemVariant = (ItemResource) this.getVariant(); - if (!itemVariant.isBlank() && itemVariant.getItem() instanceof NuclearAbsorbable abs) { + if (!itemVariant.isEmpty() && itemVariant.getItem() instanceof NuclearAbsorbable abs) { if (itemVariant.getItem() instanceof NuclearFuel) { meanNeutron += NuclearConstant.BASE_NEUTRON; @@ -253,7 +253,7 @@ public int neutronGenerationTick(NuclearEfficiencyHistoryComponent efficiencyHis ConfigurableItemStack absStack = this.inventory.getItemStacks().get(0); absStack.updateSnapshots(tx); absStack.setAmount(0); - absStack.setKey(ItemVariant.blank()); + absStack.setKey(ItemResource.EMPTY); if (abs.getNeutronProduct() != null) { long inserted = this.inventory.itemStorage.insert(abs.getNeutronProduct(), abs.getNeutronProductAmount(), tx, @@ -267,7 +267,7 @@ public int neutronGenerationTick(NuclearEfficiencyHistoryComponent efficiencyHis } } } else { - this.getInventory().getItemStacks().get(0).setKey(ItemVariant.of(stack)); + this.getInventory().getItemStacks().get(0).setKey(ItemResource.of(stack)); } } @@ -285,8 +285,7 @@ private static int randIntFromDouble(double value, RandomSource rand) { public void fluidNeutronProductTick(int neutron, boolean simul) { if (isFluid) { - @Nullable - NuclearComponent component = (NuclearComponent) this.getComponent(); + NuclearComponent component = (NuclearComponent) this.getComponent(); if (component == null) { return; @@ -303,7 +302,7 @@ public void fluidNeutronProductTick(int neutron, boolean simul) { if (simul || actualRecipe > 0) { try (Transaction tx = Transaction.openRoot()) { - long extracted = this.inventory.fluidStorage.extractAllSlot(component.getVariant(), actualRecipe, tx, + int extracted = this.inventory.fluidStorage.extractAllSlot(component.getVariant(), actualRecipe, tx, AbstractConfigurableStack::canPipesInsert); this.inventory.fluidStorage.insert(component.getNeutronProduct(), extracted * component.getNeutronProductAmount(), tx, AbstractConfigurableStack::canPipesExtract, true); @@ -365,15 +364,17 @@ public void addNeutronsToFlux(int neutronNumber, NeutronType type) { public static void registerItemApi(BlockEntityType bet) { MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, bet, - (be, direction) -> direction == UP ? ((NuclearHatch) be).getInventory().itemStorage.itemHandler : null); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, bet, +// (be, direction) -> direction == UP ? ((NuclearHatch) be).getInventory().itemStorage.itemHandler : null); }); } public static void registerFluidApi(BlockEntityType bet) { MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, - (be, direction) -> direction == UP ? ((NuclearHatch) be).getInventory().fluidStorage.fluidHandler : null); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, +// (be, direction) -> direction == UP ? ((NuclearHatch) be).getInventory().fluidStorage.fluidHandler : null); }); } diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractCraftingMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractCraftingMultiblockBlockEntity.java index 285f35f1a..388d9bee6 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractCraftingMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractCraftingMultiblockBlockEntity.java @@ -37,11 +37,11 @@ import aztech.modern_industrialization.machines.multiblocks.ShapeMatcher; import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate; import aztech.modern_industrialization.util.Tickable; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public abstract class AbstractCraftingMultiblockBlockEntity extends MultiblockMachineBlockEntity implements Tickable, MultiblockInventoryComponentHolder, CrafterComponentHolder { - public AbstractCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, OrientationComponent.Params orientationParams, + public AbstractCraftingMultiblockBlockEntity(BEP bep, Identifier blockId, OrientationComponent.Params orientationParams, ShapeTemplate[] shapeTemplates) { super(bep, new MachineGuiParameters.Builder(blockId, false).backgroundHeight(200).build(), orientationParams); @@ -96,7 +96,7 @@ public final MachineModelClientData getMachineModelData() { @Override public final void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { link(); boolean newActive = false; diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractElectricCraftingMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractElectricCraftingMultiblockBlockEntity.java index 865d139c8..9a8ef49af 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractElectricCraftingMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/AbstractElectricCraftingMultiblockBlockEntity.java @@ -37,16 +37,16 @@ import java.util.List; import java.util.UUID; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import org.jspecify.annotations.Nullable; public abstract class AbstractElectricCraftingMultiblockBlockEntity extends AbstractCraftingMultiblockBlockEntity implements EnergyListComponentHolder, CrafterComponent.Behavior { - public AbstractElectricCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, + public AbstractElectricCraftingMultiblockBlockEntity(BEP bep, Identifier blockId, OrientationComponent.Params orientationParams, ShapeTemplate[] shapeTemplates) { super(bep, blockId, orientationParams, shapeTemplates); @@ -81,7 +81,7 @@ protected void onRematch(ShapeMatcher shapeMatcher) { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { var result = super.useItemOn(player, hand, face); if (!result.consumesAction()) { result = LubricantHelper.onUse(this.crafter, player, hand); diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricBlastFurnaceBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricBlastFurnaceBlockEntity.java index b574d7b50..5eb409b5f 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricBlastFurnaceBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricBlastFurnaceBlockEntity.java @@ -45,10 +45,10 @@ import java.util.*; import java.util.stream.Collectors; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class ElectricBlastFurnaceBlockEntity extends AbstractElectricCraftingMultiblockBlockEntity implements EnergyListComponentHolder { - public record Tier(ResourceLocation coilBlockId, long maxBaseEu, String englishName) { + public record Tier(Identifier coilBlockId, long maxBaseEu, String englishName) { public String getTranslationKey() { return "ebf_tier.modern_industrialization." + coilBlockId.getPath(); } @@ -59,7 +59,7 @@ public Component getDisplayName() { } public static final List tiers; - public static final Map tiersByCoil; + public static final Map tiersByCoil; private static final ShapeTemplate[] shapeTemplates; static { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricCraftingMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricCraftingMultiblockBlockEntity.java index a5387e2e5..3d22cd443 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricCraftingMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/ElectricCraftingMultiblockBlockEntity.java @@ -32,10 +32,10 @@ import aztech.modern_industrialization.machines.init.MachineTier; import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate; import aztech.modern_industrialization.machines.recipe.MachineRecipeType; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class ElectricCraftingMultiblockBlockEntity extends AbstractElectricCraftingMultiblockBlockEntity implements EnergyListComponentHolder { - public ElectricCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, ShapeTemplate shapeTemplate, + public ElectricCraftingMultiblockBlockEntity(BEP bep, Identifier blockId, ShapeTemplate shapeTemplate, MachineRecipeType recipeType) { super(bep, blockId, new OrientationComponent.Params(false, false, false), new ShapeTemplate[] { shapeTemplate }); this.recipeType = recipeType; diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/GeneratorMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/GeneratorMultiblockBlockEntity.java index c815ca811..ed4788d3c 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/GeneratorMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/GeneratorMultiblockBlockEntity.java @@ -100,7 +100,7 @@ public final MachineModelClientData getMachineModelData() { @Override public final void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { link(); lastEuProduction = 0; if (allowNormalOperation) { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/LargeTankMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/LargeTankMultiblockBlockEntity.java index 19ea8235e..5ba6125de 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/LargeTankMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/LargeTankMultiblockBlockEntity.java @@ -42,8 +42,6 @@ import aztech.modern_industrialization.machines.models.MachineCasings; import aztech.modern_industrialization.machines.models.MachineModelClientData; import aztech.modern_industrialization.machines.multiblocks.*; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageUtil; import aztech.modern_industrialization.util.Tickable; import java.util.List; import java.util.stream.IntStream; @@ -54,8 +52,10 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.fluids.FluidType; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import net.neoforged.neoforge.fluids.capability.templates.EmptyFluidHandler; +import net.neoforged.neoforge.transfer.EmptyResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class LargeTankMultiblockBlockEntity extends MultiblockMachineBlockEntity implements Tickable, FluidStorageComponentHolder { @@ -63,7 +63,7 @@ public class LargeTankMultiblockBlockEntity extends MultiblockMachineBlockEntity private static final int[] Y_SIZES = new int[] { 3, 4, 5, 6, 7 }; private static final int[] Z_SIZES = new int[] { 3, 4, 5, 6, 7 }; - public static final long BUCKET_PER_STRUCTURE_BLOCK = 64; + public static final int BUCKET_PER_STRUCTURE_BLOCK = 64; private static int getXComponent(int shapeIndex) { return shapeIndex / 25; @@ -95,9 +95,10 @@ private static ShapeSelection.LineInfo createLineInfo(int[] sizes, MIText baseTe public static void registerFluidAPI(BlockEntityType bet) { MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, (be, direction) -> { - return ((LargeTankMultiblockBlockEntity) be).getExposedFluidHandler(); - }); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet, (be, direction) -> { +// return ((LargeTankMultiblockBlockEntity) be).getExposedFluidHandler(); +// }); }); } @@ -193,7 +194,9 @@ public int getCurrentIndex(int line) { } public LargeTankFluidDisplay.Data getFluidData() { - return new LargeTankFluidDisplay.Data(fluidStorage.getFluid(), fluidStorage.getAmount(), fluidStorage.getCapacity()); + // TODO 26.1 + var resource = FluidResource.of(fluidStorage.getFluid().toStack(1)); + return new LargeTankFluidDisplay.Data(resource, fluidStorage.getAmount(), fluidStorage.getCapacity()); } public MIInventory getInventory() { @@ -223,7 +226,7 @@ public MachineModelClientData getMachineModelData() { @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { link(); if (!this.getFluidData().equals(oldFluidData)) { oldFluidData = this.getFluidData(); @@ -232,7 +235,7 @@ public void tick() { } } - public static long getCapacityFromComponents(int xIndex, int yIndex, int zIndex) { + public static int getCapacityFromComponents(int xIndex, int yIndex, int zIndex) { int sizeX = X_SIZES[xIndex]; int sizeY = Y_SIZES[yIndex]; int sizeZ = Z_SIZES[zIndex]; @@ -244,7 +247,7 @@ public static long getCapacityFromComponents(int xIndex, int yIndex, int zIndex) protected void onRematch(ShapeMatcher shapeMatcher) { if (shapeMatcher.isMatchSuccessful()) { int index = activeShape.getActiveShapeIndex(); - long capacity = getCapacityFromComponents(getXComponent(index), getYComponent(index), getZComponent(index)); + int capacity = getCapacityFromComponents(getXComponent(index), getYComponent(index), getZComponent(index)); fluidStorage.setCapacity(capacity); // Already set it here such that the setController and setChanged calls below @@ -262,15 +265,15 @@ protected void onRematch(ShapeMatcher shapeMatcher) { invalidateCapabilities(); } - public IFluidHandler getExposedFluidHandler() { + public ResourceHandler getExposedFluidHandler() { if (isShapeValid()) { - return fluidStorage.getFluidHandler(); + return fluidStorage.getExposedFluidHandler(); } else { - return EmptyFluidHandler.INSTANCE; + return EmptyResourceHandler.instance(); } } - public FluidVariant getFluid() { + public FluidResource getFluid() { return fluidStorage.getFluid(); } @@ -319,7 +322,7 @@ protected boolean hasComparatorOutput() { @Override public int getComparatorOutput() { if (isShapeValid()) { - return StorageUtil.calculateComparatorOutput(fluidStorage.getFluidStorage()); + return ResourceHandlerUtil.getRedstoneSignalFromResourceHandler(fluidStorage.getFluidHandler()); } else { return 0; } diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/NuclearReactorMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/NuclearReactorMultiblockBlockEntity.java index 03f9d7928..50d120c82 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/NuclearReactorMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/NuclearReactorMultiblockBlockEntity.java @@ -109,7 +109,7 @@ public final MachineModelClientData getMachineModelData() { @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { link(); if (shapeValid.shapeValid) { if (redstoneControl.doAllowNormalOperation(this)) { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamBoilerMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamBoilerMultiblockBlockEntity.java index bd53b70f5..fa4838579 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamBoilerMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamBoilerMultiblockBlockEntity.java @@ -103,7 +103,7 @@ public MachineModelClientData getMachineModelData() { @Override public void tick() { - if (!level.isClientSide) { + if (!level.isClientSide()) { link(); if (shapeValid.shapeValid) { diff --git a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamCraftingMultiblockBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamCraftingMultiblockBlockEntity.java index 4e027ce60..0eb22e032 100644 --- a/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamCraftingMultiblockBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamCraftingMultiblockBlockEntity.java @@ -40,17 +40,17 @@ import java.util.UUID; import net.minecraft.core.Direction; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import org.jspecify.annotations.Nullable; public class SteamCraftingMultiblockBlockEntity extends AbstractCraftingMultiblockBlockEntity { private final OverclockComponent overclockComponent; - public SteamCraftingMultiblockBlockEntity(BEP bep, ResourceLocation blockId, ShapeTemplate shapeTemplate, + public SteamCraftingMultiblockBlockEntity(BEP bep, Identifier blockId, ShapeTemplate shapeTemplate, MachineRecipeType recipeType, List overclockCatalysts) { super(bep, blockId, new OrientationComponent.Params(false, false, false), new ShapeTemplate[] { shapeTemplate }); @@ -132,7 +132,7 @@ public final void tickExtra() { } @Override - protected ItemInteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { + protected InteractionResult useItemOn(Player player, InteractionHand hand, Direction face) { var result = super.useItemOn(player, hand, face); if (!result.consumesAction()) { return overclockComponent.onUse(this, player, hand); diff --git a/src/main/java/aztech/modern_industrialization/machines/components/ActiveShapeComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/ActiveShapeComponent.java index 63652700a..f713b83f4 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/ActiveShapeComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/ActiveShapeComponent.java @@ -27,9 +27,9 @@ import aztech.modern_industrialization.machines.MachineComponent; import aztech.modern_industrialization.machines.multiblocks.MultiblockMachineBlockEntity; import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class ActiveShapeComponent implements MachineComponent { public final ShapeTemplate[] shapeTemplates; @@ -61,12 +61,12 @@ public int getActiveShapeIndex() { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putInt("activeShape", activeShape); + public void writeNbt(ValueOutput output) { + output.putInt("activeShape", activeShape); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - activeShape = tag.getInt("activeShape"); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + activeShape = input.getIntOr("activeShape", 0); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/CasingComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/CasingComponent.java index ac9589a6f..6bac0e39a 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/CasingComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/CasingComponent.java @@ -29,18 +29,18 @@ import aztech.modern_industrialization.machines.MachineComponent; import aztech.modern_industrialization.machines.models.MachineCasing; import net.minecraft.core.BlockPos; -import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; import net.minecraft.sounds.SoundSource; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import org.jspecify.annotations.Nullable; public class CasingComponent implements MachineComponent, DropableComponent { @@ -77,23 +77,23 @@ private void setCasingStack(ItemStack stack) { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.put("casing", casingStack.saveOptional(registries)); + public void writeNbt(ValueOutput output) { + output.store("casing", ItemStack.OPTIONAL_CODEC, casingStack); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - setCasingStack(ItemStack.parseOptional(registries, tag.getCompound("casing"))); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + setCasingStack(input.read("casing", ItemStack.OPTIONAL_CODEC).orElse(ItemStack.EMPTY)); } @Override - public void writeClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putString("casing", currentTier.name); + public void writeClientNbt(ValueOutput output) { + output.putString("casing", currentTier.name); } @Override - public void readClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - currentTier = CableTier.getTier(tag.getString("casing")); + public void readClientNbt(ValueInput input) { + currentTier = CableTier.getTier(input.getString("casing").orElseThrow()); } public CableTier getCableTier() { @@ -104,7 +104,7 @@ public void dropCasing(Level world, BlockPos pos) { Containers.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), casingStack); } - public ItemInteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { + public InteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { ItemStack stackInHand = player.getItemInHand(hand); if (stackInHand.getCount() >= 1) { var previousTier = currentTier; @@ -125,10 +125,10 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac if (callback != null) { callback.onUpdated(previousTier, currentTier); } - return ItemInteractionResult.sidedSuccess(be.getLevel().isClientSide); + return InteractionResult.SUCCESS; } } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } private void playCasingPlaceSound(MachineBlockEntity be) { diff --git a/src/main/java/aztech/modern_industrialization/machines/components/CrafterComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/CrafterComponent.java index 89e9121de..75311baf8 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/CrafterComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/CrafterComponent.java @@ -41,9 +41,6 @@ import aztech.modern_industrialization.machines.recipe.condition.MachineProcessCondition; import aztech.modern_industrialization.stats.PlayerStatistics; import aztech.modern_industrialization.stats.PlayerStatisticsData; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import aztech.modern_industrialization.util.Simulation; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; @@ -54,18 +51,24 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; -import net.minecraft.core.HolderLookup; + import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidUtil; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.DataComponentHolderResource; import org.jspecify.annotations.Nullable; public class CrafterComponent implements MachineComponent.ServerOnly, CrafterAccess { @@ -146,7 +149,7 @@ default boolean oneFluidInputPerStack() { @Nullable private RecipeHolder activeRecipe = null; @Nullable - private ResourceLocation delayedActiveRecipe; + private Identifier delayedActiveRecipe; private long usedEnergy; private long recipeEnergy; @@ -418,30 +421,30 @@ private int getRecipeMaxEfficiencyTicks(MachineRecipe recipe) { } } - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putLong("usedEnergy", this.usedEnergy); - tag.putLong("recipeEnergy", this.recipeEnergy); - tag.putLong("recipeMaxEu", this.recipeMaxEu); + public void writeNbt(ValueOutput output) { + output.putLong("usedEnergy", this.usedEnergy); + output.putLong("recipeEnergy", this.recipeEnergy); + output.putLong("recipeMaxEu", this.recipeMaxEu); if (activeRecipe != null) { - tag.putString("activeRecipe", this.activeRecipe.id().toString()); + output.putString("activeRecipe", this.activeRecipe.id().toString()); } else if (delayedActiveRecipe != null) { - tag.putString("activeRecipe", this.delayedActiveRecipe.toString()); + output.putString("activeRecipe", this.delayedActiveRecipe.toString()); } - tag.putInt("efficiencyTicks", this.efficiencyTicks); - tag.putInt("maxEfficiencyTicks", this.maxEfficiencyTicks); + output.putInt("efficiencyTicks", this.efficiencyTicks); + output.putInt("maxEfficiencyTicks", this.maxEfficiencyTicks); } - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - this.usedEnergy = tag.getInt("usedEnergy"); - this.recipeEnergy = tag.getInt("recipeEnergy"); - this.recipeMaxEu = tag.getInt("recipeMaxEu"); - this.delayedActiveRecipe = tag.contains("activeRecipe") ? ResourceLocation.parse(tag.getString("activeRecipe")) : null; + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + this.usedEnergy = input.getIntOr("usedEnergy", 0); + this.recipeEnergy = input.getIntOr("recipeEnergy", 0); + this.recipeMaxEu = input.getIntOr("recipeMaxEu", 0); + this.delayedActiveRecipe = input.getString("activeRecipe").map(Identifier::parse).orElse(null); if (delayedActiveRecipe == null && usedEnergy > 0) { usedEnergy = 0; MI.LOGGER.error("Had to set the usedEnergy of CrafterComponent to 0, but that should never happen!"); } - this.efficiencyTicks = tag.getInt("efficiencyTicks"); - this.maxEfficiencyTicks = tag.getInt("maxEfficiencyTicks"); + this.efficiencyTicks = input.getIntOr("efficiencyTicks", 0); + this.maxEfficiencyTicks = input.getIntOr("maxEfficiencyTicks", 0); } public static boolean doInputsMatch(List itemInputs, List fluidInputs, MachineRecipe recipe) { @@ -498,14 +501,14 @@ protected static boolean takeFluidInputs(List baseList, continue; } } - long remainingAmount = input.amount(); + int remainingAmount = input.amount(); for (int istack = 0; istack < stacks.size(); ++istack) { if (oneInputPerStack && usedStacks[istack]) { continue; } ConfigurableFluidStack stack = stacks.get(istack); if (fluidIngredientMatch(stack.getResource(), input.fluid())) { - long taken = Math.min(remainingAmount, stack.getAmount()); + int taken = Math.min(remainingAmount, stack.getAmount()); if (taken > 0) { if (oneInputPerStack) { usedStacks[istack] = true; @@ -526,10 +529,10 @@ protected static boolean takeFluidInputs(List baseList, return ok; } - private static boolean fluidIngredientMatch(FluidVariant resource, FluidIngredient ingredient) { + private static boolean fluidIngredientMatch(FluidResource resource, FluidIngredient ingredient) { if (ingredient.isSimple()) { - for (var stack : ingredient.getStacks()) { - if (resource.equals(FluidVariant.of(stack.getFluid()))) { + for (var fluidHolder : ingredient.fluids()) { + if (resource.equals(FluidResource.of(fluidHolder.value()))) { return true; } } @@ -555,27 +558,28 @@ protected boolean putItemOutputs(MachineRecipe recipe, boolean simulate, boolean if (randFloat > output.probability()) continue; } - int remainingAmount = output.amount(); + int remainingAmount = output.template().count(); // Try to insert in non-empty stacks or locked first, then also allow insertion // in empty stacks. for (int loopRun = 0; loopRun < 2; loopRun++) { int stackId = 0; for (ConfigurableItemStack stack : stacks) { stackId++; - ItemVariant key = stack.getResource(); - if (key.equals(output.variant()) || key.isBlank()) { + ItemResource key = stack.getResource(); + if (key.matches(output.template()) || key.isEmpty()) { + var outputVariant = ItemResource.of(new ItemStack(output.template().item(), 1, output.template().components())); // If simulating or chanced output, respect the adjusted capacity. // If putting the output, don't respect the adjusted capacity in case it was // reduced during the processing. int remainingCapacity = simulate || output.probability() < 1 - ? (int) stack.getRemainingCapacityFor(output.variant()) - : output.variant().getMaxStackSize() - (int) stack.getAmount(); + ? (int) stack.getRemainingCapacityFor(outputVariant) + : outputVariant.getMaxStackSize() - (int) stack.getAmount(); int ins = Math.min(remainingAmount, remainingCapacity); if (ins > 0) { - if (key.isBlank()) { + if (key.isEmpty()) { if ((stack.isMachineLocked() || stack.isPlayerLocked() || loopRun == 1) && stack.isValid(output.getStack())) { stack.setAmount(ins); - stack.setKey(output.variant()); + stack.setKey(outputVariant); } else { ins = 0; } @@ -587,9 +591,9 @@ protected boolean putItemOutputs(MachineRecipe recipe, boolean simulate, boolean // ins changed inside of previous if, need to check again! if (ins > 0) { locksToToggle.add(stackId - 1); - lockItems.add(output.variant().getItem()); + lockItems.add(outputVariant.getItem()); if (!simulate) { - behavior.getStatsOrDummy().addProducedItems(behavior.getCrafterWorld(), output.variant().getItem(), ins); + behavior.getStatsOrDummy().addProducedItems(behavior.getCrafterWorld(), outputVariant.getItem(), ins); } } if (remainingAmount == 0) @@ -632,10 +636,10 @@ protected boolean putFluidOutputs(MachineRecipe recipe, boolean simulate, boolea for (int tries = 0; tries < 2; ++tries) { for (int j = 0; j < stacks.size(); j++) { ConfigurableFluidStack stack = stacks.get(j); - FluidVariant outputKey = FluidVariant.of(output.fluid()); + FluidResource outputKey = FluidResource.of(output.fluid()); if (stack.isResourceAllowedByLock(outputKey) - && ((tries == 1 && stack.isResourceBlank()) || stack.getResource().equals(outputKey))) { - long inserted = Math.min(output.amount(), stack.getRemainingSpace()); + && ((tries == 1 && stack.isEmpty()) || stack.getResource().equals(outputKey))) { + int inserted = Math.min(output.amount(), stack.getRemainingSpace()); if (inserted > 0) { stack.setKey(outputKey); stack.increment(inserted); @@ -676,10 +680,10 @@ protected void clearLocks() { } } - private static , S extends AbstractConfigurableStack> void handleLocking( + private static , S extends AbstractConfigurableStack> void handleLocking( List stacks, Predicate matchesRecipe, - long requiredAmount, + int requiredAmount, Supplier<@Nullable T> lockTarget) { for (S stack : stacks) { if (stack.getLockedInstance() != null && matchesRecipe.apply(stack.getLockedInstance())) { @@ -698,7 +702,7 @@ private static , S extends AbstractConfigurableS AbstractConfigurableStack.playerLockNoOverride(newLockedInstance, requiredAmount, stacks); } - public void lockRecipe(ResourceLocation recipeId, net.minecraft.world.entity.player.Inventory inventory) { + public void lockRecipe(ResourceKey> recipeId, net.minecraft.world.entity.player.Inventory inventory) { // Find MachineRecipe Optional> optionalMachineRecipe = behavior.recipeType().getRecipesWithCache(behavior.getCrafterWorld()).stream() .filter(recipe -> recipe.id().equals(recipeId)).findFirst(); @@ -729,7 +733,7 @@ public void lockRecipe(ResourceLocation recipeId, net.minecraft.world.entity.pla } // Find the first match that is an item from MI (useful for ingots for example) for (Item item : inputItems) { - ResourceLocation id = BuiltInRegistries.ITEM.getKey(item); + Identifier id = BuiltInRegistries.ITEM.getKey(item); if (id.getNamespace().equals(MI.ID)) { return item; } @@ -745,9 +749,9 @@ public void lockRecipe(ResourceLocation recipeId, net.minecraft.world.entity.pla for (MachineRecipe.ItemOutput output : recipe.value().itemOutputs) { handleLocking( this.inventory.getItemOutputs(), - item -> output.variant().isOf(item), - output.amount(), - output.variant()::getItem); + item -> output.template().is(item), + output.template().count(), + () -> output.template().item().value()); } // FLUID INPUTS @@ -767,7 +771,7 @@ public void lockRecipe(ResourceLocation recipeId, net.minecraft.world.entity.pla List inputFluids = input.getInputFluids(); // Find the first match that is an item from MI for (Fluid fluid : inputFluids) { - ResourceLocation id = BuiltInRegistries.FLUID.getKey(fluid); + Identifier id = BuiltInRegistries.FLUID.getKey(fluid); if (id.getNamespace().equals(MI.ID)) { return fluid; } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/EnergyComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/EnergyComponent.java index dc772a031..749b4edfb 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/EnergyComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/EnergyComponent.java @@ -32,15 +32,35 @@ import com.google.common.base.Preconditions; import java.util.function.Predicate; import java.util.function.Supplier; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; + import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; +import net.neoforged.neoforge.transfer.transaction.SnapshotJournal; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; public class EnergyComponent implements MachineComponent.ServerOnly, EnergyAccess { private long storedEu; private final Supplier capacity; private final BlockEntity blockEntity; // used to call setChanged() + private final SnapshotJournal journal = new SnapshotJournal<>() { + @Override + protected Long createSnapshot() { + return storedEu; + } + + @Override + protected void revertToSnapshot(Long snapshot) { + storedEu = snapshot; + } + + @Override + protected void onRootCommit(Long originalState) { + blockEntity.setChanged(); + } + }; + public EnergyComponent(BlockEntity blockEntity, Supplier capacity) { this.capacity = capacity; this.blockEntity = blockEntity; @@ -65,12 +85,12 @@ public long getRemainingCapacity() { return capacity.get() - getEu(); } - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putLong("storedEu", getEu()); + public void writeNbt(ValueOutput output) { + output.putLong("storedEu", getEu()); } - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - setEu(tag.getLong("storedEu"), false); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + setEu(input.getLongOr("storedEu", 0), false); } private void setEu(long eu, boolean update) { @@ -101,12 +121,12 @@ public long insertEu(long max, Simulation simulation) { private abstract class EnergyStorage implements MIEnergyStorage { @Override - public long getAmount() { + public long getAmountAsLong() { return storedEu; } @Override - public long getCapacity() { + public long getCapacityAsLong() { return capacity.get(); } } @@ -114,22 +134,21 @@ public long getCapacity() { public MIEnergyStorage buildInsertable(Predicate canInsert) { return new EnergyStorage() { @Override - public long receive(long maxReceive, boolean simulate) { - return insertEu(maxReceive, simulate ? Simulation.SIMULATE : Simulation.ACT); + public int insert(int amount, TransactionContext transaction) { + Preconditions.checkArgument(amount >= 0, "May not insert < 0 energy."); + int inserted = (int) Math.min(amount, capacity.get() - getEu()); + journal.updateSnapshots(transaction); + storedEu += inserted; + return inserted; } @Override - public boolean canReceive() { - return true; - } - - @Override - public long extract(long maxExtract, boolean simulate) { + public int extract(int amount, TransactionContext transaction) { return 0; } @Override - public boolean canExtract() { + public boolean supportsExtraction() { return false; } @@ -143,23 +162,22 @@ public boolean canConnect(CableTier cableTier) { public MIEnergyStorage buildExtractable(Predicate canExtract) { return new EnergyStorage() { @Override - public long receive(long maxReceive, boolean simulate) { + public int insert(int amount, TransactionContext transaction) { return 0; } @Override - public boolean canReceive() { + public boolean supportsInsertion() { return false; } @Override - public long extract(long maxExtract, boolean simulate) { - return consumeEu(maxExtract, simulate ? Simulation.SIMULATE : Simulation.ACT); - } - - @Override - public boolean canExtract() { - return true; + public int extract(int amount, TransactionContext transaction) { + Preconditions.checkArgument(amount >= 0, "May not extract < 0 energy."); + int extracted = (int) Math.min(amount, getEu()); + journal.updateSnapshots(transaction); + storedEu -= extracted; + return extracted; } @Override diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java index 4d9ee0f13..ebff7b959 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FluidItemConsumerComponent.java @@ -35,13 +35,13 @@ import java.util.*; import java.util.stream.Collectors; import net.minecraft.core.DefaultedRegistry; -import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; /** * A component that turns fluids and/or item into energy. @@ -89,13 +89,13 @@ public static FluidItemConsumerComponent ofFluid(long maxEuProduction, EUProduct } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putLong("euBuffer", euBuffer); + public void writeNbt(ValueOutput output) { + output.putLong("euBuffer", euBuffer); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - euBuffer = tag.getLong("euBuffer"); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + euBuffer = input.getLongOr("euBuffer", 0); } public long getEuProduction(List fluidInputs, @@ -122,7 +122,7 @@ public long getEuProduction(List fluidInputs, Fluid fluid = stack.getResource().getFluid(); if (fluidEUProductionMap.accept(fluid) && stack.getAmount() > 0) { long fuelEu = fluidEUProductionMap.getEuProduction(fluid); - long usedDroplets = Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); + int usedDroplets = (int) Math.min((maxEuProduced - euProduced + fuelEu - 1) / fuelEu, stack.getAmount()); euProduced += usedDroplets * fuelEu; stack.decrement(usedDroplets); @@ -138,7 +138,7 @@ public long getEuProduction(List fluidInputs, if (itemEUProductionMap.accept(fuel) && stack.getAmount() > 0) { if (!itemEUProductionMap.isStandardFuels() || ItemStackHelper.consumeFuel(stack, true)) { long fuelEU = itemEUProductionMap.getEuProduction(fuel); - long usedItem = Math.min((maxEuProduced - euProduced + fuelEU - 1) / fuelEU, stack.getAmount()); + int usedItem = (int) Math.min((maxEuProduced - euProduced + fuelEU - 1) / fuelEU, stack.getAmount()); euProduced += fuelEU * usedItem; if (itemEUProductionMap.isStandardFuels()) { @@ -263,7 +263,7 @@ default List> getAllAcceptedWithEU() { } public static class EuProductionMapBuilder { - private final Map map = new HashMap<>(); // Must Stores as string, because KubeJS could add not loader yet resource + private final Map map = new HashMap<>(); // Must Stores as string, because KubeJS could add not loader yet resource // location private final DefaultedRegistry registryAccess; @@ -271,7 +271,7 @@ public EuProductionMapBuilder(DefaultedRegistry registryAccess) { this.registryAccess = registryAccess; } - public EuProductionMapBuilder add(ResourceLocation resourceLocation, + public EuProductionMapBuilder add(Identifier resourceLocation, long eu) { map.put(resourceLocation, eu); return this; @@ -286,7 +286,7 @@ public long getEuProduction(T variant) { @Override public List getAllAccepted() { - return map.keySet().stream().map(registryAccess::get).collect(Collectors.toList()); + return map.keySet().stream().map(registryAccess::getValue).collect(Collectors.toList()); } }; } @@ -297,7 +297,8 @@ public static EUProductionMap itemFuels() { @Override public long getEuProduction(Item variant) { // TODO NEO NBT-aware fuels - int burnTime = variant.getDefaultInstance().getBurnTime(null); + // TODO 21.6 + int burnTime = 0; //variant.getDefaultInstance().getBurnTime(null); return burnTime <= 0 ? 0 : burnTime * FuelBurningComponent.EU_PER_BURN_TICK; } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FluidStorageComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FluidStorageComponent.java index 63b22baef..31031e9e6 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FluidStorageComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FluidStorageComponent.java @@ -27,86 +27,78 @@ import aztech.modern_industrialization.api.machine.component.FluidAccess; import aztech.modern_industrialization.machines.MachineComponent; import aztech.modern_industrialization.pipes.fluid.FluidNetworkExtensionTank; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.ResourceAmount; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleVariantStorage; import com.google.common.base.Preconditions; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; +import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.fluid.FluidStacksResourceHandler; public class FluidStorageComponent implements MachineComponent, FluidAccess { private final Runnable changeCallback; - private long capacity; + private int capacity; - SingleVariantStorage singleStorageVariant = new SingleVariantStorage<>() { + private final FluidStacksResourceHandler fluidHandler = new FluidStacksResourceHandler(1, 0) { + // Capacity is dynamic, don't pass it through the constructor but rather override the method @Override - protected FluidVariant getBlankVariant() { - return FluidVariant.blank(); - } - - @Override - protected long getCapacity(FluidVariant variant) { + protected int getCapacity(int index, FluidResource resource) { return capacity; } @Override - protected void onRootCommit(ResourceAmount originalState) { - if (!originalState.resource().equals(variant) || originalState.amount() != amount) { - changeCallback.run(); - } + protected void onContentsChanged(int index, FluidStack previousContents) { + changeCallback.run(); } }; - private final IFluidHandler fluidHandler = new FluidNetworkExtensionTank(singleStorageVariant); + private final ResourceHandler exposedFluidHandler = new FluidNetworkExtensionTank(fluidHandler); public FluidStorageComponent(Runnable changeCallback) { this.changeCallback = changeCallback; } - public SingleVariantStorage getFluidStorage() { - return singleStorageVariant; + public ResourceHandler getFluidHandler() { + return fluidHandler; } - public IFluidHandler getFluidHandler() { - return fluidHandler; + public ResourceHandler getExposedFluidHandler() { + return exposedFluidHandler; } @Override - public long getCapacity() { + public int getCapacity() { return capacity; } - public void setCapacity(long capacity) { + public void setCapacity(int capacity) { Preconditions.checkArgument(capacity >= 0, "Fluid Capacity must be > 0"); this.capacity = capacity; - singleStorageVariant.amount = Math.min(singleStorageVariant.amount, capacity); + this.fluidHandler.set(0, getFluid(), Math.min(getAmount(), capacity)); } - public FluidVariant getFluid() { - return singleStorageVariant.variant; + public FluidResource getFluid() { + return fluidHandler.getResource(0); } @Override - public long getAmount() { - return singleStorageVariant.amount; + public int getAmount() { + return fluidHandler.getAmountAsInt(0); } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.put("fluid", singleStorageVariant.variant.toNbt(registries)); - tag.putLong("amount", singleStorageVariant.amount); - tag.putLong("capacity", capacity); + public void writeNbt(ValueOutput output) { + fluidHandler.serialize(output); + output.putInt("capacity", capacity); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - singleStorageVariant.variant = FluidVariant.fromNbt(tag.getCompound("fluid"), registries); - singleStorageVariant.amount = tag.getLong("amount"); - capacity = tag.getLong("capacity"); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + fluidHandler.deserialize(input); + capacity = input.getIntOr("capacity", 0); } @Override - public FluidVariant getVariant() { + public FluidResource getVariant() { return getFluid(); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java index 0016d7ac5..a5a4bf395 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java @@ -34,9 +34,10 @@ import aztech.modern_industrialization.util.ItemStackHelper; import java.util.ArrayList; import java.util.List; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; + import net.minecraft.network.chat.Component; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class FuelBurningComponent implements MachineComponent { /** @@ -130,7 +131,9 @@ public void tick(List itemInputs, List 0) { long fuelTotalEu = fuelTime * EU_PER_BURN_TICK * burningEuMultiplier; burningEuBuffer += fuelTotalEu; @@ -151,7 +154,7 @@ public void tick(List itemInputs, List 0) { stack.decrement(mbConsumed); burningEuBuffer += mbConsumed * euPerMb; @@ -166,17 +169,17 @@ public void tick(List itemInputs, List getTooltips() { diff --git a/src/main/java/aztech/modern_industrialization/machines/components/IntegerHistoryComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/IntegerHistoryComponent.java index 507c0324e..1c9a5b18c 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/IntegerHistoryComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/IntegerHistoryComponent.java @@ -28,8 +28,9 @@ import java.util.Arrays; import java.util.EnumMap; import java.util.Map; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; + +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; /** * Tracks a history of values for different enum values as keys. @@ -57,18 +58,19 @@ public IntegerHistoryComponent(Class keyType, int tickHistorySize) { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { + public void writeNbt(ValueOutput output) { for (K key : keys) { - tag.putIntArray(key.toString(), histories.get(key)); + output.putIntArray(key.toString(), histories.get(key)); } } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { + public void readNbt(ValueInput input, boolean isUpgradingMachine) { for (K key : keys) { String keyString = key.toString(); - if (tag.contains(keyString)) { - int[] array = tag.getIntArray(keyString); + var maybeArray = input.getIntArray(keyString); + if (maybeArray.isPresent()) { + int[] array = maybeArray.get(); if (array.length == tickHistorySize) { histories.put(key, array); continue; diff --git a/src/main/java/aztech/modern_industrialization/machines/components/IsActiveComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/IsActiveComponent.java index b3c89c095..d910c83ec 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/IsActiveComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/IsActiveComponent.java @@ -26,8 +26,8 @@ import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.MachineComponent; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class IsActiveComponent implements MachineComponent.ClientOnly { public boolean isActive = false; @@ -40,12 +40,12 @@ public void updateActive(boolean newActive, MachineBlockEntity be) { } @Override - public void writeClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putBoolean("isActive", isActive); + public void writeClientNbt(ValueOutput output) { + output.putBoolean("isActive", isActive); } @Override - public void readClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - isActive = tag.getBoolean("isActive"); + public void readClientNbt(ValueInput input) { + isActive = input.getBooleanOr("isActive", false); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/LubricantHelper.java b/src/main/java/aztech/modern_industrialization/machines/components/LubricantHelper.java index 985537e9a..9af586175 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/LubricantHelper.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/LubricantHelper.java @@ -26,7 +26,7 @@ import aztech.modern_industrialization.MIFluids; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.neoforged.neoforge.fluids.FluidUtil; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; @@ -35,7 +35,7 @@ public class LubricantHelper { public static final int mbPerTick = 25; - public static ItemInteractionResult onUse(CrafterComponent crafter, Player player, InteractionHand hand) { + public static InteractionResult onUse(CrafterComponent crafter, Player player, InteractionHand hand) { if (crafter.hasActiveRecipe()) { int tick = crafter.getEfficiencyTicks(); int maxTick = crafter.getMaxEfficiencyTicks(); @@ -54,10 +54,10 @@ public static ItemInteractionResult onUse(CrafterComponent crafter, Player playe if (result.isSuccess() && interactionTank.getFluidAmount() >= mbPerTick) { crafter.increaseEfficiencyTicks(interactionTank.getFluidAmount() / mbPerTick); player.setItemInHand(hand, result.getResult()); - return ItemInteractionResult.SUCCESS; + return InteractionResult.SUCCESS; } } } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/MachineInventoryComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/MachineInventoryComponent.java index 289bd7000..c9ad1536e 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/MachineInventoryComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/MachineInventoryComponent.java @@ -32,8 +32,9 @@ import aztech.modern_industrialization.machines.MachineComponent; import java.util.ArrayList; import java.util.List; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; + +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class MachineInventoryComponent implements CrafterComponent.Inventory, MachineComponent.ServerOnly { public final int itemInputCount; @@ -101,13 +102,13 @@ public int hash() { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - this.inventory.writeNbt(tag, registries); + public void writeNbt(ValueOutput output) { + this.inventory.writeNbt(output); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - this.inventory.readNbt(tag, registries, isUpgradingMachine); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + this.inventory.readNbt(input, isUpgradingMachine); this.inventory.addListener(listener, null); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/MultiblockInventoryComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/MultiblockInventoryComponent.java index 313725ac8..7c594dc5f 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/MultiblockInventoryComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/MultiblockInventoryComponent.java @@ -31,7 +31,8 @@ import aztech.modern_industrialization.inventory.ConfigurableItemStack; import aztech.modern_industrialization.machines.multiblocks.HatchBlockEntity; import aztech.modern_industrialization.machines.multiblocks.ShapeMatcher; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; +import net.neoforged.neoforge.transfer.resource.DataComponentHolderResource; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -69,7 +70,7 @@ public void rebuild(ShapeMatcher shapeMatcher) { invHash++; } - private >> void rebuildList( + private >> void rebuildList( List sortedHatches, List stacks, BiConsumer> appender) { for (var stack : stacks) { stack.removeListener(listener); diff --git a/src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java index 12a2485e5..b388b3e2d 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/OrientationComponent.java @@ -27,13 +27,13 @@ import aztech.modern_industrialization.machines.MachineComponent; import aztech.modern_industrialization.machines.models.MachineModelClientData; import net.minecraft.core.Direction; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import org.jspecify.annotations.Nullable; public class OrientationComponent implements MachineComponent { @@ -52,29 +52,29 @@ public OrientationComponent(Params params, BlockEntity machine) { this.machine = machine; } - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { + public void readNbt(ValueInput input, boolean isUpgradingMachine) { if (params.hasFacing) { - facingDirection = Direction.from3DDataValue(tag.getInt("facingDirection")); + facingDirection = Direction.from3DDataValue(input.getIntOr("facingDirection", 0)); } if (params.hasOutput) { - outputDirection = Direction.from3DDataValue(tag.getInt("outputDirection")); + outputDirection = Direction.from3DDataValue(input.getIntOr("outputDirection", 0)); } - extractItems = tag.getBoolean("extractItems"); - extractFluids = tag.getBoolean("extractFluids"); + extractItems = input.getBooleanOr("extractItems", false); + extractFluids = input.getBooleanOr("extractFluids", false); } - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { + public void writeNbt(ValueOutput output) { if (params.hasFacing) { - tag.putInt("facingDirection", facingDirection.get3DDataValue()); + output.putInt("facingDirection", facingDirection.get3DDataValue()); } if (params.hasOutput) { - tag.putInt("outputDirection", outputDirection.get3DDataValue()); + output.putInt("outputDirection", outputDirection.get3DDataValue()); } if (extractItems) { - tag.putBoolean("extractItems", true); + output.putBoolean("extractItems", true); } if (extractFluids) { - tag.putBoolean("extractFluids", true); + output.putBoolean("extractFluids", true); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/OverclockComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/OverclockComponent.java index 886555cdd..ee74717a2 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/OverclockComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/OverclockComponent.java @@ -29,16 +29,17 @@ import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.MachineComponent; import java.util.*; -import net.minecraft.core.HolderLookup; + import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class OverclockComponent implements MachineComponent { private final List catalysts; @@ -50,20 +51,20 @@ public OverclockComponent(List catalysts) { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { + public void writeNbt(ValueOutput output) { for (var entry : tickMap.entrySet()) { var multiplierKey = String.format("overclock%.2f", entry.getKey().doubleValue()); - tag.putInt(multiplierKey, entry.getValue().value); + output.putInt(multiplierKey, entry.getValue().value); } } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { + public void readNbt(ValueInput input, boolean isUpgradingMachine) { for (Catalyst catalyst : catalysts) { var multiplierKey = String.format("overclock%.2f", catalyst.multiplier); - if (tag.contains(multiplierKey) && !tickMap.containsKey(catalyst.multiplier)) { - tickMap.put(catalyst.multiplier, new MutableTickCount(tag.getInt(multiplierKey))); - } + input.getInt(multiplierKey).ifPresent(multiplier -> { + tickMap.putIfAbsent(catalyst.multiplier, new MutableTickCount(multiplier)); + }); } } @@ -75,7 +76,7 @@ public int getTicks() { return 0; } - public ItemInteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { + public InteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { ItemStack stackInHand = player.getItemInHand(hand); var resourceInHand = BuiltInRegistries.ITEM.getKey(stackInHand.getItem()); @@ -96,11 +97,11 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac if (!be.getLevel().isClientSide()) { be.sync(); } - return ItemInteractionResult.sidedSuccess(be.getLevel().isClientSide); + return InteractionResult.SUCCESS; } } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } public void tick(MachineBlockEntity be) { @@ -131,7 +132,7 @@ public List getTooltips() { var tooltips = new ArrayList(); for (Catalyst catalyst : catalysts) { - var catalystItem = BuiltInRegistries.ITEM.get(catalyst.resourceLocation); + var catalystItem = BuiltInRegistries.ITEM.getValue(catalyst.resourceLocation); tooltips.add(MITooltips.line(MIText.OverclockMachine).arg(catalystItem, MITooltips.ITEM_PARSER).arg(catalyst.multiplier) .arg(catalyst.ticks).build()); } @@ -148,10 +149,10 @@ public long getRecipeEu(int eu) { } public static List getDefaultCatalysts() { - return List.of(new OverclockComponent.Catalyst(2D, ResourceLocation.parse("minecraft:gunpowder"), 120 * 20)); + return List.of(new OverclockComponent.Catalyst(2D, Identifier.parse("minecraft:gunpowder"), 120 * 20)); } - public record Catalyst(double multiplier, ResourceLocation resourceLocation, int ticks) {} + public record Catalyst(double multiplier, Identifier resourceLocation, int ticks) {} private static class MutableTickCount { public int value; diff --git a/src/main/java/aztech/modern_industrialization/machines/components/OverdriveComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/OverdriveComponent.java index c94579cde..30e4efb06 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/OverdriveComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/OverdriveComponent.java @@ -28,16 +28,16 @@ import aztech.modern_industrialization.MIItem; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.MachineComponent; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class OverdriveComponent implements MachineComponent.ServerOnly, DropableComponent { - public static final ResourceLocation ID = MI.id("overdrive"); + public static final Identifier ID = MI.id("overdrive"); private ItemStack overdriveModule = ItemStack.EMPTY; @@ -46,29 +46,29 @@ public boolean shouldOverdrive() { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.put("overdriveModuleStack", overdriveModule.saveOptional(registries)); + public void writeNbt(ValueOutput output) { + output.store("overdriveModuleStack", ItemStack.OPTIONAL_CODEC, overdriveModule); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - overdriveModule = ItemStack.parseOptional(registries, tag.getCompound("overdriveModuleStack")); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + overdriveModule = input.read("overdriveModuleStack", ItemStack.OPTIONAL_CODEC).orElse(ItemStack.EMPTY); } - public ItemInteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { + public InteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { ItemStack stackInHand = player.getItemInHand(hand); if (stackInHand.isEmpty()) { - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } if (MIItem.OVERDRIVE_MODULE.is(stackInHand) && overdriveModule.isEmpty()) { overdriveModule = stackInHand.copyWithCount(1); stackInHand.consume(1, player); be.setChanged(); - return ItemInteractionResult.sidedSuccess(player.level().isClientSide); + return InteractionResult.SUCCESS; } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } @Override diff --git a/src/main/java/aztech/modern_industrialization/machines/components/PlacedByComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/PlacedByComponent.java index 006c0c634..2d6970203 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/PlacedByComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/PlacedByComponent.java @@ -26,10 +26,11 @@ import aztech.modern_industrialization.machines.MachineComponent; import java.util.UUID; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; + import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import org.jspecify.annotations.Nullable; public class PlacedByComponent implements MachineComponent { @@ -37,16 +38,16 @@ public class PlacedByComponent implements MachineComponent { public UUID placerId = null; @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { + public void writeNbt(ValueOutput output) { if (placerId != null) { - tag.putString("placer", placerId.toString()); + output.putString("placer", placerId.toString()); } } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { + public void readNbt(ValueInput input, boolean isUpgradingMachine) { try { - placerId = UUID.fromString(tag.getString("placer")); + placerId = UUID.fromString(input.getStringOr("placer", "")); } catch (IllegalArgumentException iae) { placerId = null; } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/RedstoneControlComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/RedstoneControlComponent.java index cd49410e5..45478786f 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/RedstoneControlComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/RedstoneControlComponent.java @@ -29,16 +29,16 @@ import aztech.modern_industrialization.items.RedstoneControlModuleItem; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.MachineComponent; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class RedstoneControlComponent implements MachineComponent.ServerOnly, DropableComponent { - public static final ResourceLocation ID = MI.id("redstone_control"); + public static final Identifier ID = MI.id("redstone_control"); private ItemStack controlModule = ItemStack.EMPTY; @@ -51,29 +51,29 @@ public boolean doAllowNormalOperation(MachineBlockEntity machine) { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.put("redstoneModuleStack", controlModule.saveOptional(registries)); + public void writeNbt(ValueOutput output) { + output.store("redstoneModuleStack", ItemStack.OPTIONAL_CODEC, controlModule); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - controlModule = ItemStack.parseOptional(registries, tag.getCompound("redstoneModuleStack")); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + controlModule = input.read("redstoneModuleStack", ItemStack.OPTIONAL_CODEC).orElse(ItemStack.EMPTY); } - public ItemInteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { + public InteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { ItemStack stackInHand = player.getItemInHand(hand); if (stackInHand.isEmpty()) { - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } if (MIItem.REDSTONE_CONTROL_MODULE.is(stackInHand) && controlModule.isEmpty()) { controlModule = stackInHand.copyWithCount(1); stackInHand.consume(1, player); be.setChanged(); - return ItemInteractionResult.sidedSuccess(player.level().isClientSide); + return InteractionResult.SUCCESS; } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } @Override diff --git a/src/main/java/aztech/modern_industrialization/machines/components/ShapeValidComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/ShapeValidComponent.java index 22091fa6f..1c0434434 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/ShapeValidComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/ShapeValidComponent.java @@ -25,8 +25,8 @@ package aztech.modern_industrialization.machines.components; import aztech.modern_industrialization.machines.MachineComponent; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; /** * Syncing whether the multiblock shape is currently valid with the clients, to @@ -48,12 +48,12 @@ public boolean update() { } @Override - public void writeClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putBoolean("shapeValid", shapeValid); + public void writeClientNbt(ValueOutput output) { + output.putBoolean("shapeValid", shapeValid); } @Override - public void readClientNbt(CompoundTag tag, HolderLookup.Provider registries) { - shapeValid = tag.getBoolean("shapeValid"); + public void readClientNbt(ValueInput input) { + shapeValid = input.getBooleanOr("shapeValid", false); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/SteamHeaterComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/SteamHeaterComponent.java index a51aa7442..d089e8607 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/SteamHeaterComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/SteamHeaterComponent.java @@ -27,17 +27,20 @@ import aztech.modern_industrialization.MIFluids; import aztech.modern_industrialization.inventory.ConfigurableFluidStack; import aztech.modern_industrialization.inventory.MIFluidStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import it.unimi.dsi.fastutil.objects.Reference2LongMap; -import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap; +import it.unimi.dsi.fastutil.objects.Reference2IntMap; +import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; + import java.util.List; -import net.minecraft.core.HolderLookup; + import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class SteamHeaterComponent extends TemperatureComponent { private static final int STEAM_TO_WATER = 16; @@ -60,7 +63,7 @@ public class SteamHeaterComponent extends TemperatureComponent { /** * Amount of steam for which we already consumed the water. */ - private final Reference2LongMap steamBuffer = new Reference2LongOpenHashMap<>(); + private final Reference2IntMap steamBuffer = new Reference2IntOpenHashMap<>(); public SteamHeaterComponent(double temperatureMax, long maxEuProduction, long euPerDegree) { this(maxEuProduction, maxEuProduction, euPerDegree, true, false, false); @@ -116,28 +119,28 @@ private double tryMakeSteam(List input, List 100d) { - long steamProduction = (long) ((getTemperature() - 100d) / (temperatureMax - 100d) * maxEuProduction / euPerSteamMb); + int steamProduction = (int) ((getTemperature() - 100d) / (temperatureMax - 100d) * maxEuProduction / euPerSteamMb); try (Transaction tx = Transaction.openRoot()) { - long inserted; + int inserted; try (Transaction simul = Transaction.open(tx)) { // insertion Simulation inserted = output.insertAllSlot(steamKey, steamProduction, simul); } if (inserted > 0) { // Round water consumption up - long waterToUse = (inserted - steamBuffer.getLong(steam) + STEAM_TO_WATER - 1) / STEAM_TO_WATER; + int waterToUse = (inserted - steamBuffer.getInt(steam) + STEAM_TO_WATER - 1) / STEAM_TO_WATER; // Extract water - long extracted = input.extractAllSlot(waterKey, waterToUse, tx); + int extracted = input.extractAllSlot(waterKey, waterToUse, tx); // Add to steam buffer - steamBuffer.mergeLong(steam, extracted * STEAM_TO_WATER, Long::sum); + steamBuffer.mergeInt(steam, extracted * STEAM_TO_WATER, Integer::sum); // Produce steam - long producedSteam = output.insertAllSlot(steamKey, Math.min(steamProduction, steamBuffer.getLong(steam)), tx); - steamBuffer.mergeLong(steam, -producedSteam, Long::sum); + int producedSteam = output.insertAllSlot(steamKey, Math.min(steamProduction, steamBuffer.getInt(steam)), tx); + steamBuffer.mergeInt(steam, -producedSteam, Integer::sum); double euProduced = producedSteam * euPerSteamMb; decreaseTemperature(euProduced / euPerDegree); @@ -150,27 +153,27 @@ private double tryMakeSteam(MIFluidStorage input, MIFluidStorage output, Fluid w } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - super.writeNbt(tag, registries); + public void writeNbt(ValueOutput output) { + super.writeNbt(output); var buffer = new CompoundTag(); - for (var entry : steamBuffer.reference2LongEntrySet()) { - if (entry.getLongValue() != 0) { - buffer.putLong(entry.getKey().toString(), entry.getLongValue()); + for (var entry : steamBuffer.reference2IntEntrySet()) { + if (entry.getIntValue() != 0) { + buffer.putInt(entry.getKey().toString(), entry.getIntValue()); } } - tag.put("steamBuffer", buffer); + output.store("steamBuffer", CompoundTag.CODEC, buffer); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - super.readNbt(tag, registries, isUpgradingMachine); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + super.readNbt(input, isUpgradingMachine); - var steamBuffer = tag.getCompound("steamBuffer"); - for (var key : steamBuffer.getAllKeys()) { - var fluid = BuiltInRegistries.FLUID.get(ResourceLocation.tryParse(key)); + var steamBuffer = input.read("steamBuffer", CompoundTag.CODEC).orElseThrow(); + for (var key : steamBuffer.keySet()) { + var fluid = BuiltInRegistries.FLUID.getValue(Identifier.tryParse(key)); if (fluid != Fluids.EMPTY) { - this.steamBuffer.put(fluid, steamBuffer.getLong(key)); + this.steamBuffer.put(fluid, steamBuffer.getIntOr(key, 0)); } } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/TemperatureComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/TemperatureComponent.java index 0dce49def..b2796f446 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/TemperatureComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/TemperatureComponent.java @@ -25,8 +25,8 @@ package aztech.modern_industrialization.machines.components; import aztech.modern_industrialization.machines.MachineComponent; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class TemperatureComponent implements MachineComponent { private double temperature; @@ -54,12 +54,12 @@ public double getTemperature() { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.putDouble("temperature", temperature); + public void writeNbt(ValueOutput output) { + output.putDouble("temperature", temperature); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - setTemperature(tag.getDouble("temperature")); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + setTemperature(input.getDoubleOr("temperature", 0)); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/components/UpgradeComponent.java b/src/main/java/aztech/modern_industrialization/machines/components/UpgradeComponent.java index eadb8d267..06b3cdf7e 100644 --- a/src/main/java/aztech/modern_industrialization/machines/components/UpgradeComponent.java +++ b/src/main/java/aztech/modern_industrialization/machines/components/UpgradeComponent.java @@ -28,13 +28,14 @@ import aztech.modern_industrialization.compat.kubejs.KubeJSProxy; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.MachineComponent; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; +import com.mojang.serialization.Codec; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; public class UpgradeComponent implements MachineComponent.ServerOnly, DropableComponent { private ItemStack itemStack = ItemStack.EMPTY; @@ -49,19 +50,19 @@ public static long getExtraEu(ItemLike item) { } @Override - public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) { - tag.put("upgradesItemStack", itemStack.saveOptional(registries)); + public void writeNbt(ValueOutput output) { + output.store("upgradesItemStack", ItemStack.OPTIONAL_CODEC, itemStack); } @Override - public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) { - itemStack = ItemStack.parseOptional(registries, tag.getCompound("upgradesItemStack")); + public void readNbt(ValueInput input, boolean isUpgradingMachine) { + itemStack = input.read("upgradesItemStack", ItemStack.OPTIONAL_CODEC).orElse(ItemStack.EMPTY); } - public ItemInteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { + public InteractionResult onUse(MachineBlockEntity be, Player player, InteractionHand hand) { ItemStack stackInHand = player.getItemInHand(hand); if (stackInHand.isEmpty()) { - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } if (UpgradeComponent.getExtraEu(stackInHand.getItem()) > 0) { boolean changed = false; @@ -84,12 +85,12 @@ public ItemInteractionResult onUse(MachineBlockEntity be, Player player, Interac be.sync(); } - return ItemInteractionResult.sidedSuccess(be.getLevel().isClientSide); + return InteractionResult.SUCCESS; } } - return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } public long getAddMaxEUPerTick() { diff --git a/src/main/java/aztech/modern_industrialization/machines/gui/GuiComponentServer.java b/src/main/java/aztech/modern_industrialization/machines/gui/GuiComponentServer.java index ac3e4ff0e..1b42818b0 100644 --- a/src/main/java/aztech/modern_industrialization/machines/gui/GuiComponentServer.java +++ b/src/main/java/aztech/modern_industrialization/machines/gui/GuiComponentServer.java @@ -26,7 +26,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; /** * Server part of a synced component. @@ -49,7 +49,7 @@ public interface GuiComponentServer extends GuiComponent { Type getType(); record Type( - ResourceLocation id, + Identifier id, StreamCodec paramsCodec, StreamCodec dataCodec) {} } diff --git a/src/main/java/aztech/modern_industrialization/machines/gui/MachineGuiParameters.java b/src/main/java/aztech/modern_industrialization/machines/gui/MachineGuiParameters.java index 3c7eaa6f5..c5fdab952 100644 --- a/src/main/java/aztech/modern_industrialization/machines/gui/MachineGuiParameters.java +++ b/src/main/java/aztech/modern_industrialization/machines/gui/MachineGuiParameters.java @@ -26,15 +26,15 @@ import aztech.modern_industrialization.MI; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MachineGuiParameters { - public final ResourceLocation blockId; + public final Identifier blockId; public final int playerInventoryX, playerInventoryY; public final int backgroundWidth, backgroundHeight; public final boolean lockButton; - private MachineGuiParameters(ResourceLocation blockId, int playerInventoryX, int playerInventoryY, int backgroundWidth, int backgroundHeight, + private MachineGuiParameters(Identifier blockId, int playerInventoryX, int playerInventoryY, int backgroundWidth, int backgroundHeight, boolean lockButton) { this.blockId = blockId; this.playerInventoryX = playerInventoryX; @@ -45,7 +45,7 @@ private MachineGuiParameters(ResourceLocation blockId, int playerInventoryX, int } public void write(FriendlyByteBuf buf) { - buf.writeResourceLocation(blockId); + buf.writeIdentifier(blockId); buf.writeInt(playerInventoryX); buf.writeInt(playerInventoryY); buf.writeInt(backgroundWidth); @@ -54,16 +54,16 @@ public void write(FriendlyByteBuf buf) { } public static MachineGuiParameters read(FriendlyByteBuf buf) { - return new MachineGuiParameters(buf.readResourceLocation(), buf.readInt(), buf.readInt(), buf.readInt(), buf.readInt(), buf.readBoolean()); + return new MachineGuiParameters(buf.readIdentifier(), buf.readInt(), buf.readInt(), buf.readInt(), buf.readInt(), buf.readBoolean()); } public static class Builder { - private final ResourceLocation blockId; + private final Identifier blockId; public int playerInventoryX = 8, playerInventoryY = 84; private int backgroundSizeX = 176, backgroundSizeY = 166; public final boolean lockButton; - public Builder(ResourceLocation blockId, boolean lockButton) { + public Builder(Identifier blockId, boolean lockButton) { this.blockId = blockId; this.lockButton = lockButton; } diff --git a/src/main/java/aztech/modern_industrialization/machines/guicomponents/LargeTankFluidDisplay.java b/src/main/java/aztech/modern_industrialization/machines/guicomponents/LargeTankFluidDisplay.java index 0668adbb3..ef336c1ba 100644 --- a/src/main/java/aztech/modern_industrialization/machines/guicomponents/LargeTankFluidDisplay.java +++ b/src/main/java/aztech/modern_industrialization/machines/guicomponents/LargeTankFluidDisplay.java @@ -26,12 +26,12 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.machines.gui.GuiComponentServer; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import java.util.function.Supplier; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.Unit; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class LargeTankFluidDisplay implements GuiComponentServer { public static final Type TYPE = new Type<>(MI.id("large_tank_fluid_display"), StreamCodec.unit(Unit.INSTANCE), Data.STREAM_CODEC); @@ -57,9 +57,9 @@ public Type getType() { return TYPE; } - public record Data(FluidVariant fluid, long amount, long capacity) { + public record Data(FluidResource fluid, long amount, long capacity) { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - FluidVariant.STREAM_CODEC, + FluidResource.STREAM_CODEC, Data::fluid, ByteBufCodecs.VAR_LONG, Data::amount, diff --git a/src/main/java/aztech/modern_industrialization/machines/guicomponents/ProgressBar.java b/src/main/java/aztech/modern_industrialization/machines/guicomponents/ProgressBar.java index 39e57d8b1..9c46660c1 100644 --- a/src/main/java/aztech/modern_industrialization/machines/guicomponents/ProgressBar.java +++ b/src/main/java/aztech/modern_industrialization/machines/guicomponents/ProgressBar.java @@ -31,7 +31,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class ProgressBar implements GuiComponentServer { public static final Type TYPE = new Type<>(MI.id("progress_bar"), Params.STREAM_CODEC, ByteBufCodecs.FLOAT); @@ -94,7 +94,7 @@ public Params(int renderX, int renderY, String progressBarType, boolean isVertic } } - public ResourceLocation getTextureId() { + public Identifier getTextureId() { return MI.id("textures/gui/progress_bar/" + progressBarType + ".png"); } diff --git a/src/main/java/aztech/modern_industrialization/machines/guicomponents/ReiSlotLocking.java b/src/main/java/aztech/modern_industrialization/machines/guicomponents/ReiSlotLocking.java index a20130461..e6259e71b 100644 --- a/src/main/java/aztech/modern_industrialization/machines/guicomponents/ReiSlotLocking.java +++ b/src/main/java/aztech/modern_industrialization/machines/guicomponents/ReiSlotLocking.java @@ -29,9 +29,11 @@ import java.util.function.Supplier; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.util.Unit; import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.crafting.Recipe; public class ReiSlotLocking implements GuiComponentServer { public static final Type TYPE = new Type<>(MI.id("rei_slot_locking"), StreamCodec.unit(Unit.INSTANCE), ByteBufCodecs.BOOL); @@ -61,6 +63,6 @@ public Type getType() { @FunctionalInterface public interface SlotLockable { - void lockSlots(ResourceLocation recipeId, Inventory inventory); + void lockSlots(ResourceKey> recipeId, Inventory inventory); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/helper/EnergyHelper.java b/src/main/java/aztech/modern_industrialization/machines/helper/EnergyHelper.java index 6c2b0de86..e9ba34937 100644 --- a/src/main/java/aztech/modern_industrialization/machines/helper/EnergyHelper.java +++ b/src/main/java/aztech/modern_industrialization/machines/helper/EnergyHelper.java @@ -29,8 +29,8 @@ import aztech.modern_industrialization.api.energy.MIEnergyStorage; import aztech.modern_industrialization.machines.MachineBlockEntity; import aztech.modern_industrialization.machines.components.OrientationComponent; -import dev.technici4n.grandpower.api.EnergyStorageUtil; import net.minecraft.core.Direction; +import net.neoforged.neoforge.transfer.energy.EnergyHandlerUtil; public class EnergyHelper { public static void autoOutput(MachineBlockEntity machine, OrientationComponent orientation, CableTier output, MIEnergyStorage energySource) { @@ -40,7 +40,7 @@ public static void autoOutput(MachineBlockEntity machine, OrientationComponent o public static void autoOutput(MachineBlockEntity machine, Direction side, CableTier output, MIEnergyStorage energySource) { var storage = machine.getLevel().getCapability(EnergyApi.SIDED, machine.getBlockPos().relative(side), side.getOpposite()); if (storage != null && storage.canConnect(output)) { - if (EnergyStorageUtil.move(energySource, storage, Long.MAX_VALUE) > 0) { + if (EnergyHandlerUtil.move(energySource, storage, Integer.MAX_VALUE, null) > 0) { machine.setChanged(); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/helper/SteamHelper.java b/src/main/java/aztech/modern_industrialization/machines/helper/SteamHelper.java index d0b716480..49c1706ec 100644 --- a/src/main/java/aztech/modern_industrialization/machines/helper/SteamHelper.java +++ b/src/main/java/aztech/modern_industrialization/machines/helper/SteamHelper.java @@ -34,11 +34,11 @@ public final class SteamHelper { public static long consumeSteamEu(List fluidStacks, long maxEu, Simulation simulation) { Preconditions.checkArgument(maxEu >= 0, "May not consume < 0 EU."); - long totalRem = 0; + int totalRem = 0; for (ConfigurableFluidStack stack : fluidStacks) { if (stack.getResource().getFluid() == MIFluids.STEAM.asFluid()) { - long amount = stack.getAmount(); - long rem = Math.min(maxEu, amount); + int amount = stack.getAmount(); + int rem = (int) Math.min(maxEu, amount); if (simulation.isActing()) { stack.decrement(rem); } diff --git a/src/main/java/aztech/modern_industrialization/machines/init/MIMachineRecipeTypes.java b/src/main/java/aztech/modern_industrialization/machines/init/MIMachineRecipeTypes.java index b8a4e318b..78385fb83 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/MIMachineRecipeTypes.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/MIMachineRecipeTypes.java @@ -35,7 +35,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MIMachineRecipeTypes { private static final List recipeTypes = new ArrayList<>(); @@ -84,7 +84,7 @@ public static MachineRecipeType create(String name) { return create(name, MachineRecipeType::new); } - private static MachineRecipeType create(String name, Function ctor) { + private static MachineRecipeType create(String name, Function ctor) { MachineRecipeType type = ctor.apply(MI.id(name)); MIRegistries.RECIPE_SERIALIZERS.register(name, () -> type); MIRegistries.RECIPE_TYPES.register(name, () -> type); diff --git a/src/main/java/aztech/modern_industrialization/machines/init/MachineDefinition.java b/src/main/java/aztech/modern_industrialization/machines/init/MachineDefinition.java index 4dd676a8b..2b904b6b5 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/MachineDefinition.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/MachineDefinition.java @@ -28,11 +28,19 @@ import aztech.modern_industrialization.machines.MachineBlock; import aztech.modern_industrialization.machines.MachineBlockEntity; import java.util.function.Supplier; + +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.entity.BlockEntityType; public record MachineDefinition(Supplier> blockEntityType, - BlockDefinition blockDefinition) { + BlockDefinition blockDefinition) implements ItemLike { public MachineBlock asBlock() { return blockDefinition.asBlock(); } + + @Override + public Item asItem() { + return blockDefinition.asItem(); + } } diff --git a/src/main/java/aztech/modern_industrialization/machines/init/MachineRegistrationHelper.java b/src/main/java/aztech/modern_industrialization/machines/init/MachineRegistrationHelper.java index ec0c24fe1..127c65358 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/MachineRegistrationHelper.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/MachineRegistrationHelper.java @@ -69,13 +69,16 @@ public static MachineDefinition registerMachin .withModel((block, gen) -> { // Model generation is handled in the model provider already. }) + .withItemModel((block, gen) -> { + // Model generation is handled in the model provider already. + }) .isValidSpawn(MobSpawning.NO_SPAWN) .isRedstoneConductor(Blocks::never)); var blockEntityType = MIRegistries.BLOCK_ENTITIES.register(id, () -> { Block block = blockDefinition.asBlock(); - bet[0] = BlockEntityType.Builder.of(ctor::apply, block).build(null); + bet[0] = new BlockEntityType<>(ctor::apply, block); for (Consumer> extraRegistrator : extraRegistrators) { extraRegistrator.accept(bet[0]); diff --git a/src/main/java/aztech/modern_industrialization/machines/init/MultiblockHatches.java b/src/main/java/aztech/modern_industrialization/machines/init/MultiblockHatches.java index 048de0332..b4493ccab 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/MultiblockHatches.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/MultiblockHatches.java @@ -143,8 +143,8 @@ public static HatchPair registerFluidHatches(String englishPrefix, S String englishName = englishPrefix + " Fluid" + (input ? " Input" : " Output") + " Hatch"; var def = MachineRegistrationHelper.registerMachine(englishName, machine, bet -> { List fluidStacks = Collections - .singletonList(input ? ConfigurableFluidStack.standardInputSlot(bucketCapacity * 1000L) - : ConfigurableFluidStack.standardOutputSlot(bucketCapacity * 1000L)); + .singletonList(input ? ConfigurableFluidStack.standardInputSlot(bucketCapacity * 1000) + : ConfigurableFluidStack.standardOutputSlot(bucketCapacity * 1000)); MIInventory inventory = new MIInventory(Collections.emptyList(), fluidStacks, SlotPositions.empty(), new SlotPositions.Builder().addSlot(FLUID_HATCH_SLOT_X, FLUID_HATCH_SLOT_Y).build()); return new FluidHatch(bet, new MachineGuiParameters.Builder(machine, true).build(), input, !prefix.equals("bronze"), inventory); diff --git a/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java b/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java index 3efaa5e38..e1fca98ca 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/MultiblockMachines.java @@ -56,7 +56,7 @@ import java.util.function.Predicate; import java.util.stream.IntStream; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Blocks; public class MultiblockMachines { @@ -122,7 +122,7 @@ private static void cokeOven() { } private static void steamBlastFurnace() { - SimpleMember fireclayBricks = SimpleMember.forBlock(MIBlock.BLOCK_FIRE_CLAY_BRICKS); + SimpleMember fireclayBricks = SimpleMember.forBlock(MIBlock.FIRE_CLAY_BRICKS); HatchFlags sbfHatches = new HatchFlags.Builder().with(ITEM_INPUT, ITEM_OUTPUT, FLUID_INPUT, FLUID_OUTPUT).build(); ShapeTemplate sbfShape = new ShapeTemplate.Builder(MachineCasings.FIREBRICKS).add3by3Levels(-1, 2, fireclayBricks, sbfHatches).build(); STEAM_BLAST_FURNACE = MachineRegistrationHelper.registerMachine("Steam Blast Furnace", "steam_blast_furnace", @@ -702,7 +702,7 @@ private static void registerEbfReiCategories() { var extraWorkstations = IntStream.range(i, ElectricBlastFurnaceBlockEntity.tiers.size()) .mapToObj(j -> ElectricBlastFurnaceBlockEntity.tiers.get(j).coilBlockId()) - .toArray(ResourceLocation[]::new); + .toArray(Identifier[]::new); new Rei("EBF (%s Tier)".formatted(tier.englishName()), "electric_blast_furnace_" + tier.coilBlockId().getPath(), MIMachineRecipeTypes.BLAST_FURNACE, @@ -718,12 +718,12 @@ private static void registerEbfReiCategories() { public static class Rei { private final String englishName; - private final ResourceLocation category; + private final Identifier category; private final MachineRecipeType recipeType; private final ProgressBar.Params progressBarParams; - private final List workstations; + private final List workstations; // extra workstations to be displayed in viewers, can be any item id - private final List extraWorkstations; + private final List extraWorkstations; private Predicate extraTest = recipe -> true; private final SlotPositions.Builder itemInputs = new SlotPositions.Builder(); private final SlotPositions.Builder itemOutputs = new SlotPositions.Builder(); @@ -731,7 +731,7 @@ public static class Rei { private final SlotPositions.Builder fluidOutputs = new SlotPositions.Builder(); private SteamMode steamMode = SteamMode.ELECTRIC_ONLY; - public Rei(String englishName, ResourceLocation category, MachineRecipeType recipeType, ProgressBar.Params progressBarParams) { + public Rei(String englishName, Identifier category, MachineRecipeType recipeType, ProgressBar.Params progressBarParams) { this.englishName = englishName; this.category = category; this.recipeType = recipeType; @@ -762,17 +762,17 @@ public Rei extraTest(Predicate extraTest) { return this; } - public Rei workstations(ResourceLocation... workstations) { + public Rei workstations(Identifier... workstations) { this.workstations.clear(); this.workstations.addAll(Arrays.asList(workstations)); return this; } public Rei workstations(String... workstations) { - return workstations(Arrays.stream(workstations).map(MI::id).toList().toArray(new ResourceLocation[0])); + return workstations(Arrays.stream(workstations).map(MI::id).toList().toArray(new Identifier[0])); } - public Rei extraWorkstations(ResourceLocation... extraWorkstations) { + public Rei extraWorkstations(Identifier... extraWorkstations) { this.extraWorkstations.clear(); this.extraWorkstations.addAll(Arrays.asList(extraWorkstations)); return this; @@ -790,12 +790,12 @@ public final void register() { ReiMachineRecipes.registerCategory(category, new MachineCategoryParams(englishName, category, itemInputs.build(), itemOutputs.build(), fluidInputs.build(), fluidOutputs.build(), progressBarParams, recipeType, extraTest, true, steamMode)); - for (ResourceLocation workstation : workstations) { + for (Identifier workstation : workstations) { ReiMachineRecipes.registerWorkstation(category, workstation); ReiMachineRecipes.registerRecipeCategoryForMachine(workstation, category, ReiMachineRecipes.MachineScreenPredicate.MULTIBLOCK); ReiMachineRecipes.registerMachineClickArea(workstation, CRAFTING_GUI); } - for (ResourceLocation extraWorkstation : extraWorkstations) { + for (Identifier extraWorkstation : extraWorkstations) { ReiMachineRecipes.registerWorkstation(category, extraWorkstation); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockCraftingMachines.java b/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockCraftingMachines.java index 9987e72a3..2299158c7 100644 --- a/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockCraftingMachines.java +++ b/src/main/java/aztech/modern_industrialization/machines/init/SingleBlockCraftingMachines.java @@ -299,14 +299,14 @@ private static MachineInventoryComponent buildComponent(int itemInputCount, int } List fluidInputStacks = new ArrayList<>(); if (steamBuckets > 0) { - fluidInputStacks.add(ConfigurableFluidStack.lockedInputSlot(1000L * steamBuckets, MIFluids.STEAM.asFluid())); + fluidInputStacks.add(ConfigurableFluidStack.lockedInputSlot(1000 * steamBuckets, MIFluids.STEAM.asFluid())); } for (int i = 0; i < fluidInputCount; ++i) { - fluidInputStacks.add(ConfigurableFluidStack.standardInputSlot(1000L * ioBucketCapacity)); + fluidInputStacks.add(ConfigurableFluidStack.standardInputSlot(1000 * ioBucketCapacity)); } List fluidOutputStacks = new ArrayList<>(); for (int i = 0; i < fluidOutputCount; ++i) { - fluidOutputStacks.add(ConfigurableFluidStack.standardOutputSlot(1000L * ioBucketCapacity)); + fluidOutputStacks.add(ConfigurableFluidStack.standardOutputSlot(1000 * ioBucketCapacity)); } return new MachineInventoryComponent(itemInputStacks, itemOutputStacks, fluidInputStacks, fluidOutputStacks, itemPositions, fluidPositions); diff --git a/src/main/java/aztech/modern_industrialization/machines/models/MachineCasing.java b/src/main/java/aztech/modern_industrialization/machines/models/MachineCasing.java index e91d4645e..78995a11c 100644 --- a/src/main/java/aztech/modern_industrialization/machines/models/MachineCasing.java +++ b/src/main/java/aztech/modern_industrialization/machines/models/MachineCasing.java @@ -25,15 +25,27 @@ package aztech.modern_industrialization.machines.models; import java.util.function.Supplier; -import net.minecraft.Util; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; +import net.minecraft.util.Util; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; import org.jspecify.annotations.Nullable; public class MachineCasing { - public final ResourceLocation key; + public static final Codec CODEC = Identifier.CODEC + .comapFlatMap(id -> { + var casing = MachineCasings.getOrNull(id); + if (casing == null) { + return DataResult.error(() -> "Unknown machine casing: " + id); + } + return DataResult.success(casing); + }, casing -> casing.key); + + public final Identifier key; /** * Not null when registered as an imitation. The actual model might not be an imitation since it is resource pack driven. * Mostly used to pull the name of the casing from the block it imitates. Will also generate a corresponding casing model. @@ -41,7 +53,7 @@ public class MachineCasing { @Nullable public final Supplier imitatedBlock; - MachineCasing(ResourceLocation key, @Nullable Supplier imitatedBlock) { + MachineCasing(Identifier key, @Nullable Supplier imitatedBlock) { this.key = key; this.imitatedBlock = imitatedBlock; } diff --git a/src/main/java/aztech/modern_industrialization/machines/models/MachineCasings.java b/src/main/java/aztech/modern_industrialization/machines/models/MachineCasings.java index 58e3a78a3..ecb2022a2 100644 --- a/src/main/java/aztech/modern_industrialization/machines/models/MachineCasings.java +++ b/src/main/java/aztech/modern_industrialization/machines/models/MachineCasings.java @@ -35,14 +35,14 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import org.jspecify.annotations.Nullable; @SuppressWarnings("Convert2MethodRef") public class MachineCasings { - public static final Map registeredCasings = new HashMap<>(); + public static final Map registeredCasings = new HashMap<>(); public record CasingName(MachineCasing casing, String englishName) {} @@ -60,7 +60,7 @@ public record CasingName(MachineCasing casing, String englishName) {} public static final MachineCasing CONFIGURABLE_TANK = create(MI.id("configurable_tank"), "Configurable Tank"); public static final MachineCasing STAINLESS_STEEL_PIPE = createBlockImitation(MI.id("stainless_steel_machine_casing_pipe"), () -> MIMaterials.STAINLESS_STEEL.getPart(MIParts.MACHINE_CASING_PIPE).asBlock()); - public static final MachineCasing FIREBRICKS = createBlockImitation(MI.id("firebricks"), () -> MIBlock.BLOCK_FIRE_CLAY_BRICKS.asBlock()); + public static final MachineCasing FIREBRICKS = createBlockImitation(MI.id("firebricks"), () -> MIBlock.FIRE_CLAY_BRICKS.asBlock()); public static final MachineCasing FROSTPROOF = createBlockImitation(MI.id("frostproof_machine_casing"), () -> MIMaterials.ALUMINUM.getPart(MIParts.MACHINE_CASING_SPECIAL).asBlock()); public static final MachineCasing HEATPROOF = createBlockImitation(MI.id("heatproof_machine_casing"), @@ -82,19 +82,19 @@ public record CasingName(MachineCasing casing, String englishName) {} KubeJSProxy.instance.fireRegisterMachineCasingsEvent(); } - public static MachineCasing createBlockImitation(ResourceLocation key, Supplier block) { + public static MachineCasing createBlockImitation(Identifier key, Supplier block) { Objects.requireNonNull(block); return register(key, block); } - public static MachineCasing create(ResourceLocation key, String englishName) { + public static MachineCasing create(Identifier key, String englishName) { Objects.requireNonNull(englishName); var casing = register(key, null); translations.add(new CasingName(casing, englishName)); return casing; } - private static MachineCasing register(ResourceLocation key, @Nullable Supplier blockImitation) { + private static MachineCasing register(Identifier key, @Nullable Supplier blockImitation) { if (registeredCasings.containsKey(key)) { throw new IllegalArgumentException("Duplicate machine casing definition: " + key); } @@ -104,7 +104,11 @@ private static MachineCasing register(ResourceLocation key, @Nullable Supplier descriptionOrBlockId; + private final Identifier id; + private final Either descriptionOrBlockId; - HatchType(ResourceLocation id, Component description) { + HatchType(Identifier id, Component description) { this.id = id; this.descriptionOrBlockId = Either.left(description); } - HatchType(ResourceLocation id, ResourceLocation blockId) { + HatchType(Identifier id, Identifier blockId) { this.id = id; this.descriptionOrBlockId = Either.right(blockId); } - public ResourceLocation id() { + public Identifier id() { return id; } public MutableComponent description() { - return descriptionOrBlockId.map(Component::copy, id -> BuiltInRegistries.BLOCK.get(id).getName()); + return descriptionOrBlockId.map(Component::copy, id -> BuiltInRegistries.BLOCK.getValue(id).getName()); } @Override diff --git a/src/main/java/aztech/modern_industrialization/machines/multiblocks/HatchTypes.java b/src/main/java/aztech/modern_industrialization/machines/multiblocks/HatchTypes.java index add366f07..8c5d21b16 100644 --- a/src/main/java/aztech/modern_industrialization/machines/multiblocks/HatchTypes.java +++ b/src/main/java/aztech/modern_industrialization/machines/multiblocks/HatchTypes.java @@ -30,10 +30,10 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class HatchTypes { - private static final Map registeredHatches = new HashMap<>(); + private static final Map registeredHatches = new HashMap<>(); public static final HatchType ITEM_INPUT = register(MI.id("item_input"), MIText.ItemInputHatch); public static final HatchType ITEM_OUTPUT = register(MI.id("item_output"), MIText.ItemOutputHatch); @@ -45,7 +45,7 @@ public class HatchTypes { public static final HatchType NUCLEAR_FLUID = register(MI.id("nuclear_fluid"), MI.id("nuclear_fluid_hatch")); public static final HatchType LARGE_TANK = register(MI.id("large_tank"), MI.id("large_tank_hatch")); - public static HatchType register(ResourceLocation id, MutableComponent description) { + public static HatchType register(Identifier id, MutableComponent description) { if (registeredHatches.containsKey(id)) { throw new IllegalArgumentException("Duplicate hatch type definition: " + id); } @@ -54,14 +54,14 @@ public static HatchType register(ResourceLocation id, MutableComponent descripti return type; } - public static HatchType register(ResourceLocation id, MIText description) { + public static HatchType register(Identifier id, MIText description) { return register(id, description.text()); } /** * The block id corresponds to the user-facing description of the hatch type. */ - public static HatchType register(ResourceLocation id, ResourceLocation blockId) { + public static HatchType register(Identifier id, Identifier blockId) { if (registeredHatches.containsKey(id)) { throw new IllegalArgumentException("Duplicate hatch type definition: " + id); } @@ -70,7 +70,7 @@ public static HatchType register(ResourceLocation id, ResourceLocation blockId) return type; } - public static HatchType get(ResourceLocation id) { + public static HatchType get(Identifier id) { var type = registeredHatches.get(id); if (type != null) { return type; @@ -80,7 +80,7 @@ public static HatchType get(ResourceLocation id) { } public static HatchType get(String name) { - return get(ResourceLocation.isValidPath(name) ? MI.id(name) : ResourceLocation.parse(name)); + return get(Identifier.isValidPath(name) ? MI.id(name) : Identifier.parse(name)); } public static Collection values() { diff --git a/src/main/java/aztech/modern_industrialization/machines/multiblocks/MultiblockMachineBlockEntity.java b/src/main/java/aztech/modern_industrialization/machines/multiblocks/MultiblockMachineBlockEntity.java index ccb2af39f..c7319f024 100644 --- a/src/main/java/aztech/modern_industrialization/machines/multiblocks/MultiblockMachineBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/machines/multiblocks/MultiblockMachineBlockEntity.java @@ -87,7 +87,7 @@ public final void unlink() { @Override public boolean useWrench(Player player, InteractionHand hand, BlockHitResult hitResult) { if (super.useWrench(player, hand, hitResult)) { - if (!level.isClientSide) { + if (!level.isClientSide()) { unlink(); } return true; @@ -98,7 +98,7 @@ public boolean useWrench(Player player, InteractionHand hand, BlockHitResult hit @Override public void setRemoved() { super.setRemoved(); - if (!level.isClientSide) { + if (!level.isClientSide()) { unlink(); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/multiblocks/ShapeMatcher.java b/src/main/java/aztech/modern_industrialization/machines/multiblocks/ShapeMatcher.java index e7613d2e4..a962dff24 100644 --- a/src/main/java/aztech/modern_industrialization/machines/multiblocks/ShapeMatcher.java +++ b/src/main/java/aztech/modern_industrialization/machines/multiblocks/ShapeMatcher.java @@ -175,7 +175,7 @@ public void rematch(Level world) { public Set getSpannedChunks() { Set spannedChunks = new HashSet<>(); for (BlockPos pos : simpleMembers.keySet()) { - spannedChunks.add(new ChunkPos(pos)); + spannedChunks.add(ChunkPos.containing(pos)); } return spannedChunks; } diff --git a/src/main/java/aztech/modern_industrialization/machines/multiblocks/SimpleMember.java b/src/main/java/aztech/modern_industrialization/machines/multiblocks/SimpleMember.java index e64ac584f..d4cbc3b69 100644 --- a/src/main/java/aztech/modern_industrialization/machines/multiblocks/SimpleMember.java +++ b/src/main/java/aztech/modern_industrialization/machines/multiblocks/SimpleMember.java @@ -28,7 +28,7 @@ import java.util.function.Supplier; import net.minecraft.core.Direction; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.RotatedPillarBlock; @@ -59,8 +59,8 @@ public BlockState getPreviewState() { }; } - static SimpleMember forBlockId(ResourceLocation id) { - return forBlock(() -> BuiltInRegistries.BLOCK.get(id)); + static SimpleMember forBlockId(Identifier id) { + return forBlock(() -> BuiltInRegistries.BLOCK.getValue(id)); } static SimpleMember forBlockState(BlockState state) { @@ -83,12 +83,12 @@ static SimpleMember verticalChain() { return new SimpleMember() { @Override public boolean matchesState(BlockState state) { - return state.is(Blocks.CHAIN) && state.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y; + return state.is(Blocks.IRON_CHAIN) && state.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y; } @Override public BlockState getPreviewState() { - return Blocks.CHAIN.defaultBlockState().setValue(RotatedPillarBlock.AXIS, Direction.Axis.Y); + return Blocks.IRON_CHAIN.defaultBlockState().setValue(RotatedPillarBlock.AXIS, Direction.Axis.Y); } }; } diff --git a/src/main/java/aztech/modern_industrialization/machines/multiblocks/world/ChunkEventListeners.java b/src/main/java/aztech/modern_industrialization/machines/multiblocks/world/ChunkEventListeners.java index 7cb665efe..b832e163f 100644 --- a/src/main/java/aztech/modern_industrialization/machines/multiblocks/world/ChunkEventListeners.java +++ b/src/main/java/aztech/modern_industrialization/machines/multiblocks/world/ChunkEventListeners.java @@ -70,7 +70,7 @@ public static void init() { }); NeoForge.EVENT_BUS.addListener(BlockEvent.NeighborNotifyEvent.class, event -> { if (event.getLevel() instanceof Level level) { - onBlockStateChange(level, new ChunkPos(event.getPos()), event.getPos()); + onBlockStateChange(level, ChunkPos.containing(event.getPos()), event.getPos()); } }); } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/CentrifugeMachineRecipeType.java b/src/main/java/aztech/modern_industrialization/machines/recipe/CentrifugeMachineRecipeType.java index e6f119200..0ee52dca3 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/CentrifugeMachineRecipeType.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/CentrifugeMachineRecipeType.java @@ -25,13 +25,13 @@ package aztech.modern_industrialization.machines.recipe; import java.util.List; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.ComposterBlock; public class CentrifugeMachineRecipeType extends ProxyableMachineRecipeType { - public CentrifugeMachineRecipeType(ResourceLocation id) { + public CentrifugeMachineRecipeType(Identifier id) { super(id); } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/ConflictsChecker.java b/src/main/java/aztech/modern_industrialization/machines/recipe/ConflictsChecker.java index 94e8615ca..94dc96c03 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/ConflictsChecker.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/ConflictsChecker.java @@ -28,8 +28,6 @@ import aztech.modern_industrialization.inventory.ConfigurableItemStack; import aztech.modern_industrialization.machines.components.CrafterComponent; import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import java.io.BufferedOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -39,11 +37,13 @@ import java.util.Collections; import java.util.List; import java.util.TreeMap; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.Items; import net.minecraft.world.level.material.Fluids; import net.neoforged.fml.loading.FMLPaths; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; public class ConflictsChecker { public static Path writeConflictReport(ServerLevel level) throws IOException { @@ -52,14 +52,14 @@ public static Path writeConflictReport(ServerLevel level) throws IOException { int conflictTypeCount = 0; for (var type : MIMachineRecipeTypes.getRecipeTypes()) { - var conflicts = new TreeMap>(); + var conflicts = new TreeMap>(); for (var recipe : type.getRecipesWithCache(level)) { var itemConfStacks = recipe.value().itemInputs.stream() .map(input -> { var confStack = new ConfigurableItemStack(); var item = input.getInputItems().stream().findFirst().orElse(Items.AIR); - confStack.setKey(ItemVariant.of(item)); + confStack.setKey(ItemResource.of(item)); confStack.setAmount(Integer.MAX_VALUE); return confStack; }) @@ -68,7 +68,7 @@ public static Path writeConflictReport(ServerLevel level) throws IOException { .map(input -> { var confStack = new ConfigurableFluidStack(Integer.MAX_VALUE); var fluid = input.getInputFluids().stream().findFirst().orElse(Fluids.EMPTY); - confStack.setKey(FluidVariant.of(fluid)); + confStack.setKey(FluidResource.of(fluid)); confStack.setAmount(Integer.MAX_VALUE); return confStack; }) @@ -80,8 +80,8 @@ public static Path writeConflictReport(ServerLevel level) throws IOException { } if (CrafterComponent.doInputsMatch(itemConfStacks, fluidConfStacks, otherRecipe.value())) { - conflicts.computeIfAbsent(recipe.id(), i -> new ArrayList<>()) - .add(otherRecipe.id()); + conflicts.computeIfAbsent(recipe.id().identifier(), i -> new ArrayList<>()) + .add(otherRecipe.id().identifier()); conflictCount++; } } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/CuttingMachineRecipeType.java b/src/main/java/aztech/modern_industrialization/machines/recipe/CuttingMachineRecipeType.java index 0c91429a0..1768251bc 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/CuttingMachineRecipeType.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/CuttingMachineRecipeType.java @@ -25,13 +25,15 @@ package aztech.modern_industrialization.machines.recipe; import java.util.List; -import net.minecraft.resources.ResourceLocation; + +import aztech.modern_industrialization.MICommonProxy; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; public class CuttingMachineRecipeType extends ProxyableMachineRecipeType { - public CuttingMachineRecipeType(ResourceLocation id) { + public CuttingMachineRecipeType(Identifier id) { super(id); } @@ -40,7 +42,7 @@ protected void fillRecipeList(Level world, List> rec // Add all regular cutting machine recipes recipeList.addAll(getManagerRecipes(world)); // Add all stone cutter recipes - for (var stonecuttingRecipe : world.getRecipeManager().getAllRecipesFor(RecipeType.STONECUTTING)) { + for (var stonecuttingRecipe : MICommonProxy.INSTANCE.getRecipeMap(world).byType(RecipeType.STONECUTTING)) { var recipe = RecipeConversions.ofStonecutting(stonecuttingRecipe, this, world.registryAccess()); if (recipe != null) { recipeList.add(recipe); diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/FurnaceRecipeProxy.java b/src/main/java/aztech/modern_industrialization/machines/recipe/FurnaceRecipeProxy.java index 32447245c..f2f758386 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/FurnaceRecipeProxy.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/FurnaceRecipeProxy.java @@ -26,22 +26,24 @@ import aztech.modern_industrialization.MI; import java.util.*; -import net.minecraft.resources.ResourceLocation; + +import aztech.modern_industrialization.MICommonProxy; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; public class FurnaceRecipeProxy extends ProxyableMachineRecipeType { - public FurnaceRecipeProxy(ResourceLocation id) { + public FurnaceRecipeProxy(Identifier id) { super(id); } protected void fillRecipeList(Level world, List> recipeList) { - for (var smeltingRecipe : world.getRecipeManager().getAllRecipesFor(RecipeType.SMELTING)) { + for (var smeltingRecipe : MICommonProxy.INSTANCE.getRecipeMap(world).byType(RecipeType.SMELTING)) { var recipe = RecipeConversions.ofSmelting(smeltingRecipe, this, world.registryAccess()); recipeList.add(recipe); } - recipeList.sort(Comparator.comparing(r -> r.id().getNamespace().equals(MI.ID) ? 0 : 1)); + recipeList.sort(Comparator.comparing(r -> r.id().identifier().getNamespace().equals(MI.ID) ? 0 : 1)); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/MIRecipeJson.java b/src/main/java/aztech/modern_industrialization/machines/recipe/MIRecipeJson.java index c12e9112b..283f62235 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/MIRecipeJson.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/MIRecipeJson.java @@ -26,14 +26,17 @@ import aztech.modern_industrialization.definition.FluidLike; import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import java.util.Map; + +import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.level.ItemLike; @@ -42,16 +45,20 @@ @SuppressWarnings({ "FieldCanBeLocal", "unused", "MismatchedQueryAndUpdateOfCollection" }) public class MIRecipeJson> { + protected final HolderGetter fluids; + protected final HolderGetter items; protected final MachineRecipe recipe; - protected MIRecipeJson(MachineRecipeType machineRecipeType, int eu, int duration) { + protected MIRecipeJson(HolderGetter fluids, HolderGetter items, MachineRecipeType machineRecipeType, int eu, int duration) { + this.fluids = fluids; + this.items = items; this.recipe = new MachineRecipe(machineRecipeType); recipe.eu = eu; recipe.duration = duration; } protected MIRecipeJson(MIRecipeJson otherWithSameData) { - this((MachineRecipeType) otherWithSameData.recipe.getType(), otherWithSameData.recipe.eu, otherWithSameData.recipe.duration); + this(otherWithSameData.fluids, otherWithSameData.items, (MachineRecipeType) otherWithSameData.recipe.getType(), otherWithSameData.recipe.eu, otherWithSameData.recipe.duration); recipe.itemInputs.addAll(otherWithSameData.recipe.itemInputs); recipe.fluidInputs.addAll(otherWithSameData.recipe.fluidInputs); @@ -59,132 +66,147 @@ protected MIRecipeJson(MIRecipeJson otherWithSameData) { recipe.fluidOutputs.addAll(otherWithSameData.recipe.fluidOutputs); } - public static MIRecipeJson> create(MachineRecipeType machineRecipeType, int eu, int duration) { - return new MIRecipeJson<>(machineRecipeType, eu, duration); + @Deprecated(forRemoval = true) + public T itemIn(String id, int amount) { + return itemIn(id, amount, 1); } - public T addItemInput(String maybeTag, int amount) { - return addItemInput(maybeTag, amount, 1); + @Deprecated(forRemoval = true) + public T itemIn(String id, int amount, float probability) { + return itemIn(Ingredient.of(BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(id)))), amount, probability); } - public T addItemInput(TagKey tag, int amount) { - return addItemInput(tag, amount, 1); + public T itemIn(ItemLike item) { + return itemIn(item, 1); } - public T addItemInput(TagKey tag, int amount, float probability) { - return addItemInput("#" + tag.location(), amount, probability); + public T itemIn(ItemLike item, int amount) { + return itemIn(item.asItem(), amount, 1); } - public T addItemInput(String maybeTag, int amount, float probability) { - Ingredient ing; - if (maybeTag.startsWith("#")) { - ing = Ingredient.of(ItemTags.create(ResourceLocation.parse(maybeTag.substring(1)))); - } else { - if (!BuiltInRegistries.ITEM.containsKey(ResourceLocation.parse(maybeTag))) { - throw new RuntimeException("Could not find item " + maybeTag); - } - ing = Ingredient.of(BuiltInRegistries.ITEM.get(ResourceLocation.parse(maybeTag))); - } - return addItemInput(ing, amount, probability); + public T itemIn(ItemLike item, int amount, float probability) { + return itemIn(Ingredient.of(item), amount, probability); + } + + public T itemIn(TagKey tag) { + return itemIn(tag, 1); + } + + public T itemIn(TagKey tag, int amount) { + return itemIn(tag, amount, 1); + } + + public T itemIn(TagKey tag, int amount, float probability) { + return itemIn(Ingredient.of(items.getOrThrow(tag)), amount, probability); } - public T addItemInput(ItemLike item, int amount) { - return addItemInput(item.asItem(), amount, 1); + public T itemIn(Ingredient ingredient) { + return itemIn(ingredient, 1); } - public T addItemInput(ItemLike item, int amount, float probability) { - return addItemInput(Ingredient.of(item), amount, probability); + public T itemIn(Ingredient ingredient, int amount) { + return itemIn(ingredient, amount, 1); } - public T addItemInput(Ingredient ingredient, int amount, float probability) { + public T itemIn(Ingredient ingredient, int amount, float probability) { recipe.itemInputs.add(new MachineRecipe.ItemInput(ingredient, amount, probability)); return (T) this; } - public T addItemOutput(String itemId, int amount) { - return addItemOutput(itemId, amount, 1); + @Deprecated(forRemoval = true) + public T itemOut(String itemId, int amount) { + return itemOut(itemId, amount, 1); } - public T addItemOutput(String itemId, int amount, float probability) { - return addItemOutput(BuiltInRegistries.ITEM.get(ResourceLocation.parse(itemId)), amount, probability); + @Deprecated(forRemoval = true) + public T itemOut(String itemId, int amount, float probability) { + return itemOut(BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(itemId))), amount, probability); } - public T addItemOutput(ItemLike item, int amount) { - return addItemOutput(item, amount, 1); + public T itemOut(ItemLike item) { + return itemOut(item, 1); } - public T addItemOutput(Item item, int amount) { - return addItemOutput(item, amount, 1); + public T itemOut(ItemLike item, int amount) { + return itemOut(item, amount, 1); } - public T addItemOutput(ItemLike item, int amount, float probability) { - return addItemOutput(ItemVariant.of(item), amount, probability); + public T itemOut(ItemLike item, int amount, float probability) { + return itemOut(new ItemStackTemplate(item.asItem(), amount), probability); } - public T addItemOutput(ItemVariant variant, int amount, float probability) { - recipe.itemOutputs.add(new MachineRecipe.ItemOutput(variant, amount, probability)); + public T itemOut(ItemStackTemplate output, float probability) { + recipe.itemOutputs.add(new MachineRecipe.ItemOutput(output, probability)); return (T) this; } - public T addFluidInput(String fluid, int amount) { - return addFluidInput(fluid, amount, 1); + @Deprecated(forRemoval = true) + public T fluidIn(String fluid, int amount) { + return fluidIn(fluid, amount, 1); } - public T addFluidInput(String fluid, int amount, float probability) { - return addFluidInput(BuiltInRegistries.FLUID.get(ResourceLocation.parse(fluid)), amount, probability); + @Deprecated(forRemoval = true) + public T fluidIn(String fluid, int amount, float probability) { + return fluidIn(BuiltInRegistries.FLUID.getValue(Identifier.parse(fluid)), amount, probability); } - public T addFluidInput(FluidLike fluid, int amount, float probability) { - return addFluidInput(fluid.asFluid(), amount, probability); + public T fluidIn(FluidLike fluid, int amount) { + return fluidIn(fluid.asFluid(), amount); } - public T addFluidInput(FluidLike fluid, int amount) { - return addFluidInput(fluid.asFluid(), amount); + public T fluidIn(FluidLike fluid, int amount, float probability) { + return fluidIn(fluid.asFluid(), amount, probability); } - public T addFluidInput(Fluid fluid, int amount) { - return addFluidInput(fluid, amount, 1); + public T fluidIn(Fluid fluid, int amount) { + return fluidIn(fluid, amount, 1); } - public T addFluidInput(Fluid fluid, int amount, float probability) { - ResourceLocation id = BuiltInRegistries.FLUID.getKey(fluid); - if (id.equals(BuiltInRegistries.FLUID.getDefaultKey())) { - throw new RuntimeException("Could not find id for fluid " + fluid); - } - return addFluidInput(FluidIngredient.of(fluid), amount, probability); + public T fluidIn(Fluid fluid, int amount, float probability) { + return fluidIn(FluidIngredient.of(fluid), amount, probability); } - public T addFluidInput(TagKey tag, int amount) { - return addFluidInput(tag, amount, 1); + public T fluidIn(TagKey tag, int amount) { + return fluidIn(tag, amount, 1); } - public T addFluidInput(TagKey tag, int amount, float probability) { - return addFluidInput(FluidIngredient.tag(tag), amount, probability); + public T fluidIn(TagKey tag, int amount, float probability) { + return fluidIn(FluidIngredient.of(fluids.getOrThrow(tag)), amount, probability); } - public T addFluidInput(FluidIngredient ingredient, int amount, float probability) { + public T fluidIn(FluidIngredient ingredient, int amount) { + return fluidIn(ingredient, amount, 1); + } + + public T fluidIn(FluidIngredient ingredient, int amount, float probability) { recipe.fluidInputs.add(new MachineRecipe.FluidInput(ingredient, amount, probability)); return (T) this; } - public T addFluidOutput(String fluid, int amount) { - return addFluidOutput(fluid, amount, 1); + @Deprecated(forRemoval = true) + public T fluidOut(String fluid, int amount) { + return fluidOut(fluid, amount, 1); + } + + public T fluidOut(FluidLike fluid, int amount) { + return fluidOut(fluid.asFluid(), amount); } - public T addFluidOutput(FluidLike fluid, int amount) { - return addFluidOutput(fluid.asFluid(), amount); + public T fluidOut(FluidLike fluid, int amount, float probability) { + return fluidOut(fluid.asFluid(), amount); } - public T addFluidOutput(String fluid, int amount, float probability) { - return addFluidOutput(BuiltInRegistries.FLUID.get(ResourceLocation.parse(fluid)), amount, probability); + @Deprecated(forRemoval = true) + public T fluidOut(String fluid, int amount, float probability) { + return fluidOut(BuiltInRegistries.FLUID.getValue(Identifier.parse(fluid)), amount, probability); } - public T addFluidOutput(Fluid fluid, int amount) { - return addFluidOutput(fluid, amount, 1); + public T fluidOut(Fluid fluid, int amount) { + return fluidOut(fluid, amount, 1); } - public T addFluidOutput(Fluid fluid, int amount, float probability) { - ResourceLocation id = BuiltInRegistries.FLUID.getKey(fluid); + public T fluidOut(Fluid fluid, int amount, float probability) { + Identifier id = BuiltInRegistries.FLUID.getKey(fluid); if (id.equals(BuiltInRegistries.FLUID.getDefaultKey())) { throw new RuntimeException("Could not find id for fluid " + fluid); } @@ -204,14 +226,14 @@ public static MIRecipeJson assemblerFromShaped(ShapedRecipe recipe) { public static MIRecipeJson fromShaped( MachineRecipeType machine, int eu, int duration, int division, - ItemStack result, + ItemStackTemplate result, String[] pattern, Map key) { - if (result.getCount() % division != 0) { + if (result.count() % division != 0) { throw new IllegalArgumentException("Output must be divisible by division"); } - MIRecipeJson assemblerJson = MIRecipeJson.create(machine, eu, duration).addItemOutput(result.getItem(), result.getCount() / division); + MIRecipeJson assemblerJson = new MIRecipeJson<>(null, null, machine, eu, duration).itemOut(result.item().value(), result.count() / division); for (Map.Entry entry : key.entrySet()) { int count = 0; for (String row : pattern) { @@ -227,7 +249,7 @@ public static MIRecipeJson fromShaped( } Ingredient input = entry.getValue(); - assemblerJson.addItemInput(input, count / division, 1); + assemblerJson.itemIn(input, count / division, 1); } return assemblerJson; diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipe.java b/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipe.java index 891071949..5645c8943 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipe.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipe.java @@ -25,19 +25,17 @@ package aztech.modern_industrialization.machines.recipe; import aztech.modern_industrialization.machines.recipe.condition.MachineProcessCondition; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.util.DefaultedListWrapper; import aztech.modern_industrialization.util.MIExtraCodecs; import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.NonNullList; + +import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponentPatch; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -47,17 +45,19 @@ import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.PlacementInfo; import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeBookCategory; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs; -import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.crafting.FluidIngredient; -import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs; public class MachineRecipe implements Recipe { public static MapCodec codec(MachineRecipeType type) { @@ -85,7 +85,7 @@ public static MapCodec codec(MachineRecipeType type) { } public static StreamCodec streamCodec(MachineRecipeType type) { - return NeoForgeStreamCodecs.composite( + return StreamCodec.composite( ByteBufCodecs.VAR_INT, r -> r.eu, ByteBufCodecs.VAR_INT, @@ -115,7 +115,7 @@ public static StreamCodec streamCodec(Ma final MachineRecipeType type; - public int eu; // Also used for forge hammer damage + public int eu; public int duration; public List itemInputs = new ArrayList<>(); public List fluidInputs = new ArrayList<>(); @@ -131,58 +131,39 @@ public long getTotalEu() { return (long) eu * duration; } - @Override - public boolean isSpecial() { - return true; - } - @Override public boolean matches(RecipeInput recipeInput, Level world) { throw new UnsupportedOperationException(); } @Override - public ItemStack assemble(RecipeInput recipeInput, HolderLookup.Provider registryAccess) { + public ItemStack assemble(RecipeInput recipeInput) { throw new UnsupportedOperationException(); } @Override - public boolean canCraftInDimensions(int width, int height) { - throw new UnsupportedOperationException(); + public boolean isSpecial() { + return true; } @Override - public NonNullList getIngredients() { - // This function is implemented for AE2 pattern shift-clicking compat. - // This is the reason the counts of the ItemStacks in the ingredient are - // modified. - // (They should never be used somewhere else anyway) - return new DefaultedListWrapper<>(itemInputs.stream().filter(i -> i.probability == 1).map(i -> { - for (ItemStack stack : i.ingredient.getItems()) { - stack.setCount(i.amount); - } - return i.ingredient; - }).collect(Collectors.toList())); + public RecipeSerializer getSerializer() { + return type; } @Override - public ItemStack getResultItem(HolderLookup.Provider registryAccess) { - for (ItemOutput o : itemOutputs) { - if (o.probability == 1) { - return o.getStack(); - } - } - return ItemStack.EMPTY; + public RecipeType getType() { + return type; } @Override - public RecipeSerializer getSerializer() { - return type; + public PlacementInfo placementInfo() { + return PlacementInfo.NOT_PLACEABLE; } @Override - public RecipeType getType() { - return type; + public RecipeBookCategory recipeBookCategory() { + throw new UnsupportedOperationException(); } public boolean conditionsMatch(MachineProcessCondition.Context context) { @@ -205,7 +186,7 @@ public boolean conditionsMatch(MachineProcessCondition.Context context) { public record ItemInput(Ingredient ingredient, int amount, float probability) { public static final Codec CODEC = RecordCodecBuilder.create( g -> g.group( - Ingredient.MAP_CODEC_NONEMPTY.forGetter(ItemInput::ingredient), + Ingredient.CODEC.fieldOf("ingredient").forGetter(ItemInput::ingredient), AMOUNT_CODEC.forGetter(ItemInput::amount), MIExtraCodecs.FLOAT_01.optionalFieldOf("probability", 1f).forGetter(ItemInput::probability)) .apply(g, ItemInput::new)); @@ -224,69 +205,69 @@ public boolean matches(ItemStack otherStack) { } public List getInputItems() { - return Arrays.stream(ingredient.getItems()).map(ItemStack::getItem).distinct().collect(Collectors.toList()); + return ingredient.items().map(Holder::value).distinct().collect(Collectors.toList()); } } - public record FluidInput(FluidIngredient fluid, long amount, float probability) { + public record FluidInput(FluidIngredient fluid, int amount, float probability) { @Deprecated(forRemoval = true) - public FluidInput(Fluid fluid, long amount, float probability) { + public FluidInput(Fluid fluid, int amount, float probability) { this(FluidIngredient.of(fluid), amount, probability); } public static final Codec CODEC = RecordCodecBuilder.create( g -> g.group( - FluidIngredient.MAP_CODEC_NONEMPTY.forGetter(FluidInput::fluid), - NeoForgeExtraCodecs.optionalFieldAlwaysWrite(MIExtraCodecs.POSITIVE_LONG, "amount", 1L).forGetter(FluidInput::amount), + FluidIngredient.CODEC.fieldOf("ingredient").forGetter(FluidInput::fluid), + NeoForgeExtraCodecs.optionalFieldAlwaysWrite(ExtraCodecs.POSITIVE_INT, "amount", 1).forGetter(FluidInput::amount), MIExtraCodecs.FLOAT_01.optionalFieldOf("probability", 1f).forGetter(FluidInput::probability)) .apply(g, FluidInput::new)); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( FluidIngredient.STREAM_CODEC, FluidInput::fluid, - ByteBufCodecs.VAR_LONG, + ByteBufCodecs.VAR_INT, FluidInput::amount, ByteBufCodecs.FLOAT, FluidInput::probability, FluidInput::new); public List getInputFluids() { - return Arrays.stream(fluid.getStacks()).map(FluidStack::getFluid).distinct().collect(Collectors.toList()); + return fluid.fluids().stream().map(Holder::value).distinct().collect(Collectors.toList()); } } - public record ItemOutput(ItemVariant variant, int amount, float probability) { + public record ItemOutput(ItemStackTemplate template, float probability) { + private static final Codec> ITEM_NON_AIR_CODEC = BuiltInRegistries.ITEM + .holderByNameCodec() + .validate(item -> item.is(Items.AIR.builtInRegistryHolder()) ? DataResult.error(() -> "Item must not be minecraft:air") : DataResult.success(item)); public static final Codec CODEC = RecordCodecBuilder.create( g -> g.group( - ItemStack.ITEM_NON_AIR_CODEC.fieldOf("item") - .forGetter(itemOutput -> itemOutput.variant.getItem().builtInRegistryHolder()), - AMOUNT_CODEC.forGetter(itemOutput -> itemOutput.amount), + ITEM_NON_AIR_CODEC.fieldOf("id") + .forGetter(itemOutput -> itemOutput.template.item()), + AMOUNT_CODEC.forGetter(itemOutput -> itemOutput.template.count()), DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY) - .forGetter(itemOutput -> itemOutput.variant.getComponentsPatch()), + .forGetter(itemOutput -> itemOutput.template.components()), MIExtraCodecs.FLOAT_01.optionalFieldOf("probability", 1f) .forGetter(itemOutput -> itemOutput.probability)) - .apply(g, (item, count, components, probability) -> new ItemOutput(ItemVariant.of(new ItemStack(item, 1, components)), count, - probability))); + .apply(g, (item, count, components, probability) -> new ItemOutput(new ItemStackTemplate(item, count, components), probability))); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - ItemVariant.STREAM_CODEC, - ItemOutput::variant, - ByteBufCodecs.VAR_INT, - ItemOutput::amount, + ItemStackTemplate.STREAM_CODEC, + ItemOutput::template, ByteBufCodecs.FLOAT, ItemOutput::probability, ItemOutput::new); public ItemStack getStack() { - return variant.toStack(amount); + return template.create(); } } - public record FluidOutput(Fluid fluid, long amount, float probability) { + public record FluidOutput(Fluid fluid, int amount, float probability) { public static final Codec CODEC = RecordCodecBuilder.create( g -> g.group( - BuiltInRegistries.FLUID.byNameCodec().fieldOf("fluid").forGetter(fluidOutput -> fluidOutput.fluid), - NeoForgeExtraCodecs.optionalFieldAlwaysWrite(MIExtraCodecs.POSITIVE_LONG, "amount", 1L) + BuiltInRegistries.FLUID.byNameCodec().fieldOf("id").forGetter(fluidOutput -> fluidOutput.fluid), + NeoForgeExtraCodecs.optionalFieldAlwaysWrite(ExtraCodecs.POSITIVE_INT, "amount", 1) .forGetter(fluidOutput -> fluidOutput.amount), MIExtraCodecs.FLOAT_01.optionalFieldOf("probability", 1f).forGetter(fluidOutput -> fluidOutput.probability)) .apply(g, FluidOutput::new)); @@ -294,7 +275,7 @@ public record FluidOutput(Fluid fluid, long amount, float probability) { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.registry(Registries.FLUID), FluidOutput::fluid, - ByteBufCodecs.VAR_LONG, + ByteBufCodecs.VAR_INT, FluidOutput::amount, ByteBufCodecs.FLOAT, FluidOutput::probability, diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeBuilder.java index b917f20c6..0d84e6b44 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeBuilder.java @@ -26,19 +26,31 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.recipe.json.MIRecipeBuilder; +import dev.latvian.mods.kubejs.recipe.RecipeKey; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.level.material.Fluid; public class MachineRecipeBuilder extends MIRecipeJson implements MIRecipeBuilder { - public MachineRecipeBuilder(MachineRecipeType machineRecipeType, int eu, int duration) { - super(machineRecipeType, eu, duration); + public MachineRecipeBuilder(HolderGetter fluids, HolderGetter items, MachineRecipeType machineRecipeType, int eu, int duration) { + super(fluids, items, machineRecipeType, eu, duration); } public MachineRecipeBuilder(MIRecipeJson otherWithSameData) { super(otherWithSameData); } + public void save(RecipeOutput recipeOutput, ResourceKey> key) { + recipeOutput.accept(key, recipe, null); + } + + // TODO: remove string path function @Override public void offerTo(RecipeOutput recipeOutput, String path) { - recipeOutput.accept(MI.id(path), recipe, null); + recipeOutput.accept(ResourceKey.create(Registries.RECIPE, MI.id(path)), recipe, null); } } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeType.java b/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeType.java index 8a872edf3..9f0f125ec 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeType.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/MachineRecipeType.java @@ -24,12 +24,13 @@ package aztech.modern_industrialization.machines.recipe; +import aztech.modern_industrialization.MICommonProxy; import com.mojang.serialization.DataResult; import com.mojang.serialization.MapCodec; import java.util.*; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.RecipeHolder; @@ -42,7 +43,7 @@ public class MachineRecipeType implements RecipeType, RecipeSeria private final MapCodec codec; private final StreamCodec streamCodec; - public MachineRecipeType(ResourceLocation id) { + public MachineRecipeType(Identifier id) { this.id = id; var baseCodec = MachineRecipe.codec(this); this.codec = MapCodec.of(baseCodec, baseCodec.flatMap(machineRecipe -> { @@ -60,7 +61,7 @@ public MachineRecipeType(ResourceLocation id) { * Never modify or store the result! */ protected Collection> getManagerRecipes(Level level) { - return level.getRecipeManager().getAllRecipesFor(this); + return MICommonProxy.INSTANCE.getRecipeMap(level).byType(this); } public Collection> getRecipesWithoutCache(Level level) { @@ -72,7 +73,7 @@ public Collection> getRecipesWithCache(ServerLevel l } @Nullable - public RecipeHolder getRecipe(ServerLevel world, ResourceLocation id) { + public RecipeHolder getRecipe(ServerLevel world, Identifier id) { return getRecipesWithCache(world).stream().filter(r -> r.id().equals(id)).findFirst().orElse(null); } @@ -131,7 +132,7 @@ public Collection> getFluidOnlyRecipes(ServerLevel w return Collections.unmodifiableList(fluidOnlyRecipes); } - private final ResourceLocation id; + private final Identifier id; private boolean allowItemInput = false; private boolean allowFluidInput = false; private boolean allowItemOutput = false; @@ -157,7 +158,7 @@ public MachineRecipeType withFluidOutputs() { return this; } - public ResourceLocation getId() { + public Identifier getId() { return id; } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/ProxyableMachineRecipeType.java b/src/main/java/aztech/modern_industrialization/machines/recipe/ProxyableMachineRecipeType.java index 9c34a89c5..c954efc94 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/ProxyableMachineRecipeType.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/ProxyableMachineRecipeType.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.level.Level; @@ -36,7 +36,7 @@ * A machine recipe type that allows adding proxies */ public abstract class ProxyableMachineRecipeType extends MachineRecipeType { - public ProxyableMachineRecipeType(ResourceLocation id) { + public ProxyableMachineRecipeType(Identifier id) { super(id); } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/RecipeConversions.java b/src/main/java/aztech/modern_industrialization/machines/recipe/RecipeConversions.java index 506a91bfb..a79dcf6c9 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/RecipeConversions.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/RecipeConversions.java @@ -28,12 +28,14 @@ import aztech.modern_industrialization.MIFluids; import aztech.modern_industrialization.config.MIServerConfig; import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import java.util.Collections; import java.util.List; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.SmeltingRecipe; @@ -46,19 +48,20 @@ public class RecipeConversions { public static RecipeHolder ofSmelting(RecipeHolder holder, MachineRecipeType type, RegistryAccess registryAccess) { - ResourceLocation id = ResourceLocation.fromNamespaceAndPath(holder.id().getNamespace(), "/" + holder.id().getPath() + "_exported_mi_furnace"); + var baseId = holder.id().identifier(); + Identifier id = Identifier.fromNamespaceAndPath(baseId.getNamespace(), "/" + baseId.getPath() + "_exported_mi_furnace"); var smeltingRecipe = holder.value(); - Ingredient ingredient = smeltingRecipe.getIngredients().get(0); + Ingredient ingredient = smeltingRecipe.input(); MachineRecipe recipe = new MachineRecipe(type); recipe.eu = 2; - recipe.duration = smeltingRecipe.getCookingTime(); + recipe.duration = smeltingRecipe.cookingTime(); recipe.itemInputs = Collections.singletonList(new MachineRecipe.ItemInput(ingredient, 1, 1)); recipe.fluidInputs = Collections.emptyList(); - var result = smeltingRecipe.getResultItem(registryAccess); + var result = smeltingRecipe.assemble(null); recipe.itemOutputs = Collections - .singletonList(new MachineRecipe.ItemOutput(ItemVariant.of(result), result.getCount(), 1)); + .singletonList(new MachineRecipe.ItemOutput(ItemStackTemplate.fromNonEmptyStack(result), 1)); recipe.fluidOutputs = Collections.emptyList(); - return new RecipeHolder<>(id, recipe); + return new RecipeHolder<>(ResourceKey.create(Registries.RECIPE, id), recipe); } @Nullable @@ -68,20 +71,21 @@ public static RecipeHolder ofStonecutting(RecipeHolder(id, recipe); + return new RecipeHolder<>(ResourceKey.create(Registries.RECIPE, id), recipe); } @Nullable @@ -96,7 +100,7 @@ public static RecipeHolder ofCompostable(ItemLike compostable) { float probability = ComposterBlock.COMPOSTABLES.getOrDefault(compostable.asItem(), 0.0F); if (probability > 0.0F) { - ResourceLocation id = MI.id("/" + BuiltInRegistries.ITEM.getKey(compostable.asItem()).getPath() + "_to_plant_oil"); + Identifier id = MI.id("/" + BuiltInRegistries.ITEM.getKey(compostable.asItem()).getPath() + "_to_plant_oil"); MachineRecipe plantOil = new MachineRecipe(MIMachineRecipeTypes.CENTRIFUGE); plantOil.eu = 8; plantOil.duration = 200; @@ -110,10 +114,10 @@ public static RecipeHolder ofCompostable(ItemLike compostable) { plantOil.fluidOutputs = List.of(new MachineRecipe.FluidOutput( MIFluids.PLANT_OIL.asFluid(), - (long) (probability * FluidType.BUCKET_VOLUME), + (int) (probability * FluidType.BUCKET_VOLUME), 1.0f)); plantOil.itemOutputs = Collections.emptyList(); - return new RecipeHolder<>(id, plantOil); + return new RecipeHolder<>(ResourceKey.create(Registries.RECIPE, id), plantOil); } else { return null; } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/BiomeProcessCondition.java b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/BiomeProcessCondition.java index a21932d60..8d90605b1 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/BiomeProcessCondition.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/BiomeProcessCondition.java @@ -30,7 +30,7 @@ import com.mojang.datafixers.util.Either; import com.mojang.serialization.MapCodec; import java.util.List; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.core.registries.Registries; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -38,7 +38,7 @@ import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.TagKey; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -54,7 +54,7 @@ public record BiomeProcessCondition(Either, TagKey> bi static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.either( ResourceKey.streamCodec(Registries.BIOME), - ResourceLocation.STREAM_CODEC.map(rl -> TagKey.create(Registries.BIOME, rl), TagKey::location)), + Identifier.STREAM_CODEC.map(rl -> TagKey.create(Registries.BIOME, rl), TagKey::location)), BiomeProcessCondition::biome, BiomeProcessCondition::new); @@ -64,19 +64,19 @@ public boolean canProcessRecipe(Context context, MachineRecipe recipe) { return biome.map(entityBiome::is, entityBiome::is); } - private static MutableComponent biomeId(ResourceLocation biomeLocation) { + private static MutableComponent biomeId(Identifier biomeLocation) { return Component.translatable(Util.makeDescriptionId("biome", biomeLocation)); } @Override public void appendDescription(List list) { biome.ifLeft(rk -> { - list.add(MIText.RequiresBiome.text(biomeId(rk.location()))); + list.add(MIText.RequiresBiome.text(biomeId(rk.identifier()))); }).ifRight(tag -> { var holderLookup = MICommonProxy.INSTANCE.getClientPlayer().registryAccess(); var biomeNames = holderLookup.lookupOrThrow(tag.registry()).get(tag).map(named -> { return named.stream() - .map(holder -> biomeId(holder.unwrapKey().orElseThrow().location())) + .map(holder -> biomeId(holder.unwrapKey().orElseThrow().identifier())) .reduce((a, b) -> a.append(", ").append(b)) .orElseThrow(); }).orElse(Component.literal("???")); diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/DimensionProcessCondition.java b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/DimensionProcessCondition.java index b56ce460e..f05b493da 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/DimensionProcessCondition.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/DimensionProcessCondition.java @@ -54,7 +54,7 @@ public boolean canProcessRecipe(Context context, MachineRecipe recipe) { @Override public void appendDescription(List list) { - var loc = dimension.location(); + var loc = dimension.identifier(); var dimComponent = Component.translatable("dimension.%s.%s".formatted(loc.getNamespace(), loc.getPath())); list.add(MIText.RequiresDimension.text(dimComponent)); } diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessCondition.java b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessCondition.java index cdce63439..1c05a3235 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessCondition.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessCondition.java @@ -34,12 +34,12 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; public interface MachineProcessCondition { - Codec CODEC = ResourceLocation.CODEC + Codec CODEC = Identifier.CODEC .>flatXmap( resLoc -> Optional.ofNullable(MachineProcessConditions.getCodec(resLoc)) .map(DataResult::success) @@ -49,7 +49,7 @@ public interface MachineProcessCondition { .orElseGet(() -> DataResult.error(() -> "Unknown machine process condition codec " + codec))) .dispatch(MachineProcessCondition::codec, c -> c); @SuppressWarnings({ "unchecked", "rawtypes" }) - StreamCodec STREAM_CODEC = ResourceLocation.STREAM_CODEC + StreamCodec STREAM_CODEC = Identifier.STREAM_CODEC .mapStream(b -> b) .map( resLoc -> Optional.ofNullable(MachineProcessConditions.getStreamCodec(resLoc)) diff --git a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessConditions.java b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessConditions.java index 26b6425ac..8538f2e00 100644 --- a/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessConditions.java +++ b/src/main/java/aztech/modern_industrialization/machines/recipe/condition/MachineProcessConditions.java @@ -30,16 +30,16 @@ import com.mojang.serialization.MapCodec; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.jspecify.annotations.Nullable; public final class MachineProcessConditions { - private static final BiMap> MAP = HashBiMap.create(); - private static final BiMap> STREAM_MAP = HashBiMap + private static final BiMap> MAP = HashBiMap.create(); + private static final BiMap> STREAM_MAP = HashBiMap .create(); public static void register( - ResourceLocation id, + Identifier id, MapCodec codec, StreamCodec streamCodec) { if (MAP.get(id) != null || MAP.inverse().get(codec) != null || STREAM_MAP.inverse().get(streamCodec) != null) { @@ -51,20 +51,20 @@ public static void register( } @Nullable - public static MapCodec getCodec(ResourceLocation id) { + public static MapCodec getCodec(Identifier id) { return MAP.get(id); } @Nullable - public static StreamCodec getStreamCodec(ResourceLocation id) { + public static StreamCodec getStreamCodec(Identifier id) { return STREAM_MAP.get(id); } - public static ResourceLocation getId(MapCodec codec) { + public static Identifier getId(MapCodec codec) { return MAP.inverse().get(codec); } - public static ResourceLocation getId(StreamCodec streamCodec) { + public static Identifier getId(StreamCodec streamCodec) { return STREAM_MAP.inverse().get(streamCodec); } diff --git a/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java b/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java index 4fc6ef5a4..50c1dfa16 100644 --- a/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java +++ b/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java @@ -29,6 +29,7 @@ import static aztech.modern_industrialization.materials.set.MaterialSet.*; import aztech.modern_industrialization.MIItem; +import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.api.energy.CableTier; import aztech.modern_industrialization.compat.kubejs.KubeJSProxy; import aztech.modern_industrialization.items.SortOrder; @@ -48,6 +49,7 @@ import aztech.modern_industrialization.nuclear.NuclearConstant; import aztech.modern_industrialization.nuclear.NuclearOrder; import net.minecraft.util.valueproviders.UniformInt; +import net.neoforged.neoforge.common.Tags; // @formatter:off public class MIMaterials { @@ -141,15 +143,15 @@ public static String template(String name) { public static MaterialBuilder addVanillaMetal(boolean nugget, MaterialBuilder builder) { String n = builder.getMaterialName(); - MaterialBuilder res = builder.addMaterialItemParts(MaterialItemPart.external(INGOT, "#c:ingots/" + n, "minecraft:" + n + "_ingot")) - .addMaterialItemParts(MaterialItemPart.external(BLOCK, "#c:storage_blocks/" + n, "minecraft:" + n + "_block")) - .addMaterialItemParts(MaterialItemPart.external(ORE, "#c:ores/" + n, "minecraft:" + n + "_ore")) + MaterialBuilder res = builder.addMaterialItemParts(MaterialItemPart.external(INGOT, "minecraft:" + n + "_ingot", MITags.convention("ingots/" + n))) + .addMaterialItemParts(MaterialItemPart.external(BLOCK, "minecraft:" + n + "_block", MITags.convention("storage_blocks/" + n))) + .addMaterialItemParts(MaterialItemPart.external(ORE, "minecraft:" + n + "_ore", MITags.convention("ores/" + n))) .addMaterialItemParts(MaterialItemPart.external(ORE_DEEPSLATE, "minecraft:deepslate_" + n + "_ore")) - .addMaterialItemParts(MaterialItemPart.external(RAW_METAL, "#c:raw_materials/" + n, "minecraft:raw_" + n)) - .addMaterialItemParts(MaterialItemPart.external(RAW_METAL_BLOCK, "#c:storage_blocks/raw_" + n, "minecraft:raw_" + n + "_block")); + .addMaterialItemParts(MaterialItemPart.external(RAW_METAL, "minecraft:raw_" + n, MITags.convention("raw_materials/" + n))) + .addMaterialItemParts(MaterialItemPart.external(RAW_METAL_BLOCK, "minecraft:raw_" + n + "_block", MITags.convention("storage_blocks/raw_" + n))); if (nugget) { - res.addMaterialItemParts(MaterialItemPart.external(NUGGET, "#c:nuggets/" + n, "minecraft:" + n + "_nugget")); + res.addMaterialItemParts(MaterialItemPart.external(NUGGET, "minecraft:" + n + "_nugget", MITags.convention("nuggets/" + n))); } res.addRecipes(ForgeHammerRecipes::apply, SmeltingRecipes::apply, StandardRecipes::apply); @@ -162,15 +164,15 @@ public static MaterialBuilder addVanillaGem(boolean compressor, MaterialBuilder public static MaterialBuilder addVanillaGem(boolean compressor, String gemPath, MaterialBuilder builder) { String n = builder.getMaterialName(); - MaterialBuilder res = builder.addMaterialItemParts(MaterialItemPart.external(GEM, "minecraft:" + gemPath, "minecraft:" + gemPath)) - .addMaterialItemParts(MaterialItemPart.external(BLOCK, "#c:storage_blocks/" + n, "minecraft:" + n + "_block")) - .addMaterialItemParts(MaterialItemPart.external(ORE, "#c:ores/" + n, "minecraft:" + n + "_ore")) + MaterialBuilder res = builder.addMaterialItemParts(MaterialItemPart.external(GEM, "minecraft:" + gemPath)) + .addMaterialItemParts(MaterialItemPart.external(BLOCK, "minecraft:" + n + "_block", MITags.convention("storage_blocks/" + n))) + .addMaterialItemParts(MaterialItemPart.external(ORE, "minecraft:" + n + "_ore", MITags.convention("ores/" + n))) .addMaterialItemParts(MaterialItemPart.external(ORE_DEEPSLATE, "minecraft:deepslate_" + n + "_ore")); res.addRecipes(SmeltingRecipes::apply, StandardRecipes::apply); if (compressor) { - res.addRecipes(context -> new MIRecipeBuilder(context, MIMachineRecipeTypes.COMPRESSOR, n).addTaggedPartInput(DUST, 1).addItemOutput("minecraft:" + gemPath, 1)); + res.addRecipes(context -> new MIRecipeBuilder(context, MIMachineRecipeTypes.COMPRESSOR, n).addTaggedPartInput(DUST, 1).itemOut("minecraft:" + gemPath, 1)); } return res; } @@ -251,10 +253,10 @@ public static MaterialBuilder addVanillaGem(boolean compressor, String gemPath, .set(MaterialProperty.SET, STONE) .set(MaterialProperty.MEAN_RGB, 0xd20000) .set(MaterialProperty.HARDNESS, SOFT) - .addParts(TINY_DUST, CRUSHED_DUST, BATTERY.of(CableTier.LV)).addMaterialItemParts(MaterialItemPart.external(DUST, "minecraft:redstone", "minecraft:redstone")) - .addMaterialItemParts(MaterialItemPart.external(BLOCK, "#c:storage_blocks/redstone", "minecraft:redstone_block")) - .addMaterialItemParts(MaterialItemPart.external(ORE, "#c:ores/redstone", "minecraft:redstone_ore")) - .addMaterialItemParts(MaterialItemPart.external(ORE_DEEPSLATE, "#c:ores/redstone", "minecraft:deepslate_redstone_ore")) + .addParts(TINY_DUST, CRUSHED_DUST, BATTERY.of(CableTier.LV)).addMaterialItemParts(MaterialItemPart.external(DUST, "minecraft:redstone")) + .addMaterialItemParts(MaterialItemPart.external(BLOCK, "minecraft:redstone_block", Tags.Items.STORAGE_BLOCKS_REDSTONE)) + .addMaterialItemParts(MaterialItemPart.external(ORE, "minecraft:redstone_ore", Tags.Items.ORES_REDSTONE)) + .addMaterialItemParts(MaterialItemPart.external(ORE_DEEPSLATE, "minecraft:deepslate_redstone_ore", Tags.Items.ORES_REDSTONE)) .addRecipes(StandardRecipes::apply, SmeltingRecipes::apply) .cancelRecipes("macerator/ore_to_crushed")); @@ -266,11 +268,11 @@ public static MaterialBuilder addVanillaGem(boolean compressor, String gemPath, .set(MaterialProperty.HARDNESS, SOFT) .addParts(CRUSHED_DUST, DUST, TINY_DUST) .addParts(ORE.of(UniformInt.of(2, 5), MaterialOreSet.QUARTZ)) - .addMaterialItemParts(MaterialItemPart.external(GEM, "minecraft:quartz", "minecraft:quartz")).addRecipes(StandardRecipes::apply) + .addMaterialItemParts(MaterialItemPart.external(GEM, "minecraft:quartz")).addRecipes(StandardRecipes::apply) .cancelRecipes("macerator/ore_to_crushed") .addRecipes(context -> { new MIRecipeBuilder(context, MIMachineRecipeTypes.COMPRESSOR, "quartz") - .addTaggedPartInput(DUST, 1).addItemOutput("minecraft:quartz", 1); + .addTaggedPartInput(DUST, 1).itemOut("minecraft:quartz", 1); }) ); @@ -279,7 +281,7 @@ public static MaterialBuilder addVanillaGem(boolean compressor, String gemPath, .set(MaterialProperty.MEAN_RGB, 0xb75a36) .set(MaterialProperty.HARDNESS, SOFT) .addParts(DUST, TINY_DUST) - .addMaterialItemParts(MaterialItemPart.external(INGOT, "minecraft:brick", "minecraft:brick")) + .addMaterialItemParts(MaterialItemPart.external(INGOT, "minecraft:brick")) .addRecipes(StandardRecipes::apply, SmeltingRecipes::apply)); FIRE_CLAY = MaterialRegistry.addMaterial( diff --git a/src/main/java/aztech/modern_industrialization/materials/Material.java b/src/main/java/aztech/modern_industrialization/materials/Material.java index bee2c10bb..5d81885d9 100644 --- a/src/main/java/aztech/modern_industrialization/materials/Material.java +++ b/src/main/java/aztech/modern_industrialization/materials/Material.java @@ -30,8 +30,13 @@ import aztech.modern_industrialization.materials.property.MaterialProperty; import java.util.Collections; import java.util.Map; +import java.util.function.BiConsumer; import java.util.function.Consumer; + +import net.minecraft.core.HolderGetter; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.material.Fluid; import org.jspecify.annotations.Nullable; /** @@ -42,10 +47,10 @@ public class Material { final Map parts; private final Map, Object> properties; - public final Consumer registerRecipes; + public final RecipeProvider registerRecipes; Material(String name, Map, Object> properties, Map parts, - Consumer registerRecipes) { + RecipeProvider registerRecipes) { this.name = name; this.properties = properties; this.parts = parts; @@ -69,8 +74,17 @@ public MaterialItemPart getPart(PartKeyProvider part) { return ret; } + public Item getPartItem(PartKeyProvider part) { + return getPart(part).asItem(); + } + @Nullable public T get(MaterialProperty prop) { return (T) properties.get(prop); } + + @FunctionalInterface + public interface RecipeProvider { + void registerRecipes(HolderGetter fluids, HolderGetter items, RecipeOutput output); + } } diff --git a/src/main/java/aztech/modern_industrialization/materials/MaterialBuilder.java b/src/main/java/aztech/modern_industrialization/materials/MaterialBuilder.java index 31966171d..6753ac990 100644 --- a/src/main/java/aztech/modern_industrialization/materials/MaterialBuilder.java +++ b/src/main/java/aztech/modern_industrialization/materials/MaterialBuilder.java @@ -29,7 +29,11 @@ import aztech.modern_industrialization.materials.recipe.builder.MaterialRecipeBuilder; import java.util.*; import java.util.function.Consumer; + +import net.minecraft.core.HolderGetter; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.material.Fluid; import org.jspecify.annotations.Nullable; public final class MaterialBuilder { @@ -131,9 +135,9 @@ public final Material build(RegisteringEvent... events) { return new Material(materialName, properties, Collections.unmodifiableMap(partsMap), this::buildRecipes); } - public void buildRecipes(RecipeOutput output) { + public void buildRecipes(HolderGetter fluids, HolderGetter items, RecipeOutput output) { Map recipesMap = new HashMap<>(); - RecipeContext recipeContext = new RecipeContext(recipesMap); + RecipeContext recipeContext = new RecipeContext(fluids, items, recipesMap); for (RecipeAction action : recipesActions) { action.apply(recipeContext); } @@ -164,12 +168,24 @@ public T get(MaterialProperty prop) { } public class RecipeContext { + private final HolderGetter fluids; + private final HolderGetter items; private final Map recipesMap; - public RecipeContext(Map recipesMap) { + public RecipeContext(HolderGetter fluids, HolderGetter items, Map recipesMap) { + this.fluids = fluids; + this.items = items; this.recipesMap = recipesMap; } + public HolderGetter fluids() { + return fluids; + } + + public HolderGetter items() { + return items; + } + public void addRecipe(MaterialRecipeBuilder builder) { if (recipesMap.containsKey(builder.getRecipeId())) { if (recipesMap.get(builder.getRecipeId()).isCanceled()) { diff --git a/src/main/java/aztech/modern_industrialization/materials/part/BarrelPart.java b/src/main/java/aztech/modern_industrialization/materials/part/BarrelPart.java index 52e398e9c..cf50ca7ba 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/BarrelPart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/BarrelPart.java @@ -38,11 +38,10 @@ import aztech.modern_industrialization.datagen.tag.TagsToGenerate; import aztech.modern_industrialization.definition.BlockDefinition; import aztech.modern_industrialization.items.SortOrder; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge.SlotItemHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; +import net.minecraft.client.data.models.model.TexturedModel; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.apache.commons.lang3.mutable.MutableObject; import org.jspecify.annotations.Nullable; @@ -66,7 +65,7 @@ private PartTemplate of(PartEnglishNameFormatter englishNameFormatter, Long stac PartTemplate template = new PartTemplate(englishNameFormatter, key()).asColumnBlock(SortOrder.BARRELS) .withRegister((partContext, part, itemPath, itemId, itemTag, englishName) -> { - StorageBehaviour barrelStorageBehaviour = BarrelBlock.withStackCapacity(stackCapacity); + StorageBehaviour barrelStorageBehaviour = BarrelBlock.withStackCapacity(stackCapacity); EntityBlock factory = (pos, state) -> new BarrelBlockEntity(bet.getValue(), pos, state); @@ -74,12 +73,10 @@ private PartTemplate of(PartEnglishNameFormatter englishNameFormatter, Long stac englishName, itemPath, MIBlock.BlockDefinitionParams.defaultStone() - .withBlockConstructor(s -> new BarrelBlock(factory, barrelStorageBehaviour)) + .withBlockConstructor(p -> new BarrelBlock(p, factory, barrelStorageBehaviour)) .withBlockItemConstructor(BarrelItem::new) .withModel((block, gen) -> { - String name = gen.name(block); - gen.simpleBlock(block, - gen.models().cubeColumn(name, gen.blockTexture(name + "_side"), gen.blockTexture(name + "_top"))); + gen.createTrivialBlock(block, TexturedModel.COLUMN); }) .withBlockEntityRendererItemModel() .noLootTable() @@ -88,14 +85,15 @@ private PartTemplate of(PartEnglishNameFormatter englishNameFormatter, Long stac TagsToGenerate.generateTag(MITags.BARRELS, blockDefinition, "Barrels"); MIRegistries.BLOCK_ENTITIES.register(itemPath, () -> { - var ret = BlockEntityType.Builder.of(factory::newBlockEntity, blockDefinition.asBlock()).build(null); + var ret = new BlockEntityType<>(factory::newBlockEntity, blockDefinition.asBlock()); // noinspection unchecked,rawtypes bet.setValue((BlockEntityType) ret); return ret; }); MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, bet.getValue(), (be, side) -> new SlotItemHandler(be)); + // TODO 26.1 +// event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, bet.getValue(), (be, side) -> new SlotItemHandler(be)); }); MICommonProxy.INSTANCE.registerPartBarrelClient(bet::getValue, partContext.get(MEAN_RGB)); diff --git a/src/main/java/aztech/modern_industrialization/materials/part/BlockPart.java b/src/main/java/aztech/modern_industrialization/materials/part/BlockPart.java index f906d415e..4eed8214e 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/BlockPart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/BlockPart.java @@ -24,13 +24,14 @@ package aztech.modern_industrialization.materials.part; +import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.materials.set.MaterialBlockSet; public class BlockPart implements PartKeyProvider { public PartTemplate of(MaterialBlockSet set) { return new PartTemplate("Block of %s", key()) - .withCustomPath("%s_block", "storage_blocks/%s") + .withCustomPath("%s_block", materialName -> MITags.convention("storage_blocks/" + materialName)) .asBlock(SortOrder.STORAGE_BLOCKS, new TextureGenParams.Block(set)); } diff --git a/src/main/java/aztech/modern_industrialization/materials/part/CasingPart.java b/src/main/java/aztech/modern_industrialization/materials/part/CasingPart.java index 0b71314c0..25d687dea 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/CasingPart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/CasingPart.java @@ -45,7 +45,7 @@ public PartTemplate of(PartEnglishNameFormatter formatter, @Nullable String path PartTemplate regPart = new PartTemplate(formatter, this.key) .asBlock(SortOrder.CASINGS, new TextureGenParams.CasingBlock(), 5, resistance, 1, false); if (path != null) { - return regPart.withCustomPath(path, path); + return regPart.withCustomPath(path); } return regPart; } diff --git a/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java b/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java index c02f0ad7b..1cf160800 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/MIParts.java @@ -26,6 +26,7 @@ import static aztech.modern_industrialization.materials.part.NuclearFuelPart.Type.*; +import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.datagen.tag.TagsToGenerate; import aztech.modern_industrialization.items.SortOrder; import java.util.HashSet; @@ -58,10 +59,10 @@ public class MIParts { public static final PartTemplate GEAR = new PartTemplate("Gear", "gear"); public static final PartTemplate GEM = new PartTemplate("%s", "gem").withRegister((partContext, part, itemPath, itemId, itemTag, englishName) -> { var item = PartTemplate.createSimpleItem(englishName, itemPath, partContext, part); - TagsToGenerate.generateTag("c:gems/" + itemPath, item, englishName + "s"); + TagsToGenerate.generateTag(itemTag, item, englishName + "s"); }) .withTexture(new TextureGenParams.Gem()) - .withCustomPath("%s", "%s"); + .withCustomPath("%s", MITags::convention); public static final PartTemplate HAMMER = new PartTemplate("Hammer", "hammer"); @@ -107,20 +108,16 @@ public class MIParts { public static final Map CATEGORY_TAGS = Map.of( BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks"), DUST.key(), new CategoryTag(Tags.Items.DUSTS, "Dusts"), - GEAR.key(), new CategoryTag("c:gears", "Gears"), + GEAR.key(), new CategoryTag(MITags.convention("gears"), "Gears"), INGOT.key(), new CategoryTag(Tags.Items.INGOTS, "Ingots"), NUGGET.key(), new CategoryTag(Tags.Items.NUGGETS, "Nuggets"), - PLATE.key(), new CategoryTag("c:plates", "Plates"), + PLATE.key(), new CategoryTag(MITags.convention("plates"), "Plates"), ROD.key(), new CategoryTag(Tags.Items.RODS, "Rods"), RAW_METAL.key(), new CategoryTag(Tags.Items.RAW_MATERIALS, "Raw Ores"), - TINY_DUST.key(), new CategoryTag("c:tiny_dusts", "Tiny Dusts"), + TINY_DUST.key(), new CategoryTag(MITags.convention("tiny_dusts"), "Tiny Dusts"), RAW_METAL_BLOCK.key(), new CategoryTag(Tags.Items.STORAGE_BLOCKS, "Storage Blocks")); - public record CategoryTag(String tag, String englishName) { - public CategoryTag(TagKey tag, String englishName) { - this(tag.location().toString(), englishName); - } - } + public record CategoryTag(TagKey tag, String englishName) { } public static final List BLOCKS = PartKeyProvider.of(ORE, BARREL, BLOCK, COIL, MACHINE_CASING, MACHINE_CASING_SPECIAL, MACHINE_CASING_PIPE, RAW_METAL_BLOCK); diff --git a/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPart.java b/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPart.java index 77f7f91e8..1fba29048 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPart.java @@ -27,27 +27,29 @@ import aztech.modern_industrialization.MIItem; import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.materials.MaterialBuilder; +import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; +import net.minecraft.resources.Identifier; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; +import org.jspecify.annotations.Nullable; public sealed interface MaterialItemPart extends PartKeyProvider, ItemLike permits MaterialItemPartImpl { /** * External parts are already registered and already have a texture, * but they're in the material system for recipe generation. */ - static MaterialItemPart external(PartKey key, String taggedItemId, String itemId) { - return new MaterialItemPartImpl(key, taggedItemId, itemId, ctx -> {}, new TextureGenParams.NoTexture(), false); + static MaterialItemPart external(PartKey key, String itemId, @Nullable TagKey tag) { + return new MaterialItemPartImpl(key, itemId, tag, ctx -> {}, new TextureGenParams.NoTexture(), false); } - static MaterialItemPart external(PartKeyProvider part, String taggedItemId, String itemId) { - return external(part.key(), taggedItemId, itemId); + static MaterialItemPart external(PartKeyProvider part, String itemId, @Nullable TagKey tag) { + return external(part.key(), itemId, tag); } /** @@ -55,7 +57,7 @@ static MaterialItemPart external(PartKeyProvider part, String taggedItemId, Stri * but they're in the material system for recipe generation. */ static MaterialItemPart external(PartKeyProvider part, String itemId) { - return external(part, itemId, itemId); + return external(part, itemId, null); } /** @@ -64,40 +66,32 @@ static MaterialItemPart external(PartKeyProvider part, String itemId) { static MaterialItemPart simpleItem(PartKeyProvider part, String englishName, String itemPath) { String itemId = "modern_industrialization:" + itemPath; - return new MaterialItemPartImpl(part.key(), itemId, itemId, ctx -> { + return new MaterialItemPartImpl(part.key(), itemId, null, ctx -> { MIItem.item(englishName, itemPath, SortOrder.MATERIALS.and(ctx.getMaterialName())); }, new TextureGenParams.NoTexture(), true); } - /** - * @return The common tag of this material prefixed by # if available, or the id - * otherwise. - */ - String getTaggedItemId(); - - default Ingredient getTaggedIngredient() { - var taggedItem = getTaggedItemId(); - if (taggedItem.startsWith("#")) { - return Ingredient.of(ItemTags.create(ResourceLocation.parse(taggedItem.substring(1)))); - } else { - return Ingredient.of(asItem()); - } - } - /** * @return The full id of this part. Includes the namespace and the path, separated by :. */ + // TODO: replace by ResourceLocation String getItemId(); @Override default Item asItem() { - return BuiltInRegistries.ITEM.getOrThrow(ResourceKey.create(Registries.ITEM, ResourceLocation.parse(getItemId()))); + return BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(getItemId()))); } default Block asBlock() { - return BuiltInRegistries.BLOCK.getOrThrow(ResourceKey.create(Registries.BLOCK, ResourceLocation.parse(getItemId()))); + return BuiltInRegistries.BLOCK.getValueOrThrow(ResourceKey.create(Registries.BLOCK, Identifier.parse(getItemId()))); } + /** + * Returns an ingredient for this item that will either be a tag ingredient (if the part is tagged), + * or a single item ingredient otherwise. + */ + Ingredient asIngredient(HolderGetter items); + /** * Perform any required registration. */ diff --git a/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPartImpl.java b/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPartImpl.java index 5beada4db..bbe371767 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPartImpl.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/MaterialItemPartImpl.java @@ -25,6 +25,12 @@ package aztech.modern_industrialization.materials.part; import aztech.modern_industrialization.materials.MaterialBuilder; +import net.minecraft.core.HolderGetter; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import org.jspecify.annotations.Nullable; + import java.util.function.Consumer; /** @@ -32,17 +38,17 @@ */ final class MaterialItemPartImpl implements MaterialItemPart { private final PartKey key; - private final String taggedItemId; private final String itemId; + private final @Nullable TagKey tag; private final Consumer registration; private final TextureGenParams textureGenParams; private final boolean internal; - MaterialItemPartImpl(PartKey key, String taggedItemId, String itemId, + MaterialItemPartImpl(PartKey key, String itemId, @Nullable TagKey tag, Consumer registration, TextureGenParams textureGenParams, boolean internal) { this.key = key; - this.taggedItemId = taggedItemId; this.itemId = itemId; + this.tag = tag; this.registration = registration; this.textureGenParams = textureGenParams; this.internal = internal; @@ -54,13 +60,13 @@ public PartKey key() { } @Override - public String getTaggedItemId() { - return taggedItemId; + public String getItemId() { + return itemId; } @Override - public String getItemId() { - return itemId; + public Ingredient asIngredient(HolderGetter items) { + return tag == null ? Ingredient.of(asItem()) : Ingredient.of(items.getOrThrow(tag)); } @Override diff --git a/src/main/java/aztech/modern_industrialization/materials/part/OrePart.java b/src/main/java/aztech/modern_industrialization/materials/part/OrePart.java index 6864c87f0..f8fdd7233 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/OrePart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/OrePart.java @@ -28,6 +28,7 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIBlock; +import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.blocks.OreBlock; import aztech.modern_industrialization.datagen.dynreg.DynamicRegistryDatagen; import aztech.modern_industrialization.datagen.loot.MIBlockLoot; @@ -43,7 +44,7 @@ import net.minecraft.data.worldgen.placement.OrePlacements; import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.BiomeTags; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; @@ -65,10 +66,10 @@ import org.apache.commons.lang3.StringUtils; public class OrePart implements PartKeyProvider { - public static final ResourceLocation TYPE_STONE = ResourceLocation.fromNamespaceAndPath("minecraft", "stone"); - public static final ResourceLocation TYPE_DEEPSLATE = ResourceLocation.fromNamespaceAndPath("minecraft", "deepslate"); + public static final Identifier TYPE_STONE = Identifier.fromNamespaceAndPath("minecraft", "stone"); + public static final Identifier TYPE_DEEPSLATE = Identifier.fromNamespaceAndPath("minecraft", "deepslate"); - private final ResourceLocation stoneType; + private final Identifier stoneType; private final Block stoneBlock; private final PartKey key; @@ -97,14 +98,14 @@ public PartTemplate of(MaterialOreSet set) { return of(new OrePartParams(UniformInt.of(0, 0), set)); } - public OrePart(ResourceLocation stoneType) { + public OrePart(Identifier stoneType) { this.stoneType = stoneType; if (stoneType.equals(TYPE_STONE)) { key = new PartKey("ore"); } else { key = new PartKey("ore_%s".formatted(stoneType.getPath())); } - stoneBlock = BuiltInRegistries.BLOCK.getOrThrow(ResourceKey.create(Registries.BLOCK, stoneType)); + stoneBlock = BuiltInRegistries.BLOCK.getValueOrThrow(ResourceKey.create(Registries.BLOCK, stoneType)); } public PartTemplate of(OrePartParams oreParams) { @@ -159,10 +160,10 @@ public PartTemplate of(OrePartParams oreParams) { throw new IllegalArgumentException("Mismatch between raw ore and xp drops for material: " + partContext.getMaterialName()); } - String tag = "c:ores/" + partContext.getMaterialName(); + var tag = MITags.convention("ores/" + partContext.getMaterialName()); TagsToGenerate.generateTag(tag, oreBlockBlockDefinition, partContext.getMaterialEnglishName() + " Ores"); - TagsToGenerate.addTagToTag(tag, Tags.Items.ORES.location().toString(), "Ores"); + TagsToGenerate.addTagToTag(tag, Tags.Items.ORES, "Ores"); if (stoneType.equals(TYPE_DEEPSLATE)) { TagsToGenerate.generateTagNoTranslation(Tags.Items.ORES_IN_GROUND_DEEPSLATE, oreBlockBlockDefinition); } else if (stoneType.equals(TYPE_STONE)) { @@ -171,7 +172,7 @@ public PartTemplate of(OrePartParams oreParams) { if (oreParams.generate) { String genIdPrefix = stoneType.equals(TYPE_STONE) ? "" : "%s_".formatted(stoneType.getPath()); - ResourceLocation oreGenId = MI.id( + Identifier oreGenId = MI.id( genIdPrefix + "ore_generator_" + partContext.getMaterialName()); var featureKey = ResourceKey.create(Registries.CONFIGURED_FEATURE, oreGenId); @@ -214,7 +215,7 @@ public PartTemplate of(OrePartParams oreParams) { }) .withTexture(new TextureGenParams.Ore(stoneType, oreParams.set)) - .withCustomPath((stoneType.equals(TYPE_STONE) ? "" : "%s_".formatted(stoneType.getPath())) + "%s_ore", "ores/%s"); + .withCustomPath((stoneType.equals(TYPE_STONE) ? "" : "%s_".formatted(stoneType.getPath())) + "%s_ore", materialName -> MITags.convention("ores/" + materialName)); } public static List ofAll(OrePartParams params) { diff --git a/src/main/java/aztech/modern_industrialization/materials/part/PartItemPathFormatter.java b/src/main/java/aztech/modern_industrialization/materials/part/PartItemPathFormatter.java index 436f8a1d6..cf2bac442 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/PartItemPathFormatter.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/PartItemPathFormatter.java @@ -24,6 +24,13 @@ package aztech.modern_industrialization.materials.part; +import aztech.modern_industrialization.MITags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import org.jspecify.annotations.Nullable; + +import java.util.function.Function; + public sealed interface PartItemPathFormatter { static String idFromPath(String path) { return "modern_industrialization:" + path; @@ -31,7 +38,8 @@ static String idFromPath(String path) { String getPartItemPath(String materialName, PartKey partKey); - String getPartItemTag(String materialName, PartKey partKey); + @Nullable + TagKey getPartItemTag(String materialName, PartKey partKey); default String getPartItemId(String materialName, PartKey partKey) { return "modern_industrialization:" + getPartItemPath(materialName, partKey); @@ -44,16 +52,16 @@ public String getPartItemPath(String materialName, PartKey partKey) { } @Override - public String getPartItemTag(String materialName, PartKey partKey) { + public @Nullable TagKey getPartItemTag(String materialName, PartKey partKey) { if (MIParts.TAGGED_PARTS.contains(partKey)) { - return "#c:%ss/%s".formatted(partKey.key, materialName); + return MITags.convention("%ss/%s".formatted(partKey.key, materialName)); } else { - return idFromPath(getPartItemPath(materialName, partKey)); + return null; } } } - record Overridden(String path, String tag) implements PartItemPathFormatter { + record Overridden(String path, Function> materialNameToTag) implements PartItemPathFormatter { @Override public String getPartItemPath(String materialName, PartKey partKey) { if (path.contains("%s")) { @@ -64,16 +72,8 @@ public String getPartItemPath(String materialName, PartKey partKey) { } @Override - public String getPartItemTag(String materialName, PartKey partKey) { - if (MIParts.TAGGED_PARTS.contains(partKey)) { - if (tag.contains("%s")) { - return "#c:" + String.format(tag, materialName); - } else { - return tag; - } - } else { - return idFromPath(getPartItemPath(materialName, partKey)); - } + public @Nullable TagKey getPartItemTag(String materialName, PartKey partKey) { + return materialNameToTag.apply(materialName); } } } diff --git a/src/main/java/aztech/modern_industrialization/materials/part/PartTemplate.java b/src/main/java/aztech/modern_industrialization/materials/part/PartTemplate.java index 1fa5e8789..cb8817ff6 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/PartTemplate.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/PartTemplate.java @@ -31,8 +31,15 @@ import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.materials.MaterialBuilder; import aztech.modern_industrialization.util.TagHelper; +import com.mojang.datafixers.types.Func; +import net.minecraft.client.data.models.model.TexturedModel; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.ItemLike; +import org.jspecify.annotations.Nullable; + +import java.util.function.Function; public class PartTemplate implements PartKeyProvider { private final PartEnglishNameFormatter englishNameFormatter; @@ -80,14 +87,13 @@ public static ItemDefinition createSimpleItem(String englishName, String i return MIItem.item(englishName, itemPath, SortOrder.MATERIALS.and(partContext.getMaterialName()).and(part)); } - private static void setupTag(MaterialBuilder.PartContext context, PartKey part, String itemTag, ItemLike item) { + private static void setupTag(MaterialBuilder.PartContext context, PartKey part, TagKey generatedTag, ItemLike item) { // item tag // items whose path are overridden (such as fire clay ingot -> brick) are not // added to the tags for (PartKey partTagged : MIParts.TAGGED_PARTS) { if (partTagged.equals(part)) { - var generatedTag = itemTag.replaceFirst("#", ""); - TagsToGenerate.generateTag(generatedTag, item, getTagEnglishName(context, itemTag)); + TagsToGenerate.generateTag(generatedTag, item, getTagEnglishName(context, generatedTag.location().getPath())); var categoryTag = MIParts.CATEGORY_TAGS.get(partTagged.key()); if (categoryTag != null) { @@ -97,10 +103,10 @@ private static void setupTag(MaterialBuilder.PartContext context, PartKey part, } } - private static String getTagEnglishName(MaterialBuilder.PartContext context, String tag) { - var parts = tag.split(":")[1].split("/"); + private static String getTagEnglishName(MaterialBuilder.PartContext context, String tagPath) { + var parts = tagPath.split("/"); if (parts.length != 2) { - throw new IllegalArgumentException("Tag " + tag + " has more than 2 slash-separated parts"); + throw new IllegalArgumentException("Tag " + tagPath + " has more than 2 slash-separated parts"); } var sb = new StringBuilder(); @@ -117,7 +123,7 @@ private static String getTagEnglishName(MaterialBuilder.PartContext context, Str } if (!material.equals(context.getMaterialName())) { - throw new IllegalArgumentException("Tag " + tag + " does not contain the material name after slash: " + context.getMaterialName()); + throw new IllegalArgumentException("Tag " + tagPath + " does not contain the material name after slash: " + context.getMaterialName()); } part = part.replace('_', ' '); @@ -183,9 +189,7 @@ public PartTemplate asColumnBlock(SortOrder sortOrder) { .addMoreTags(TagHelper.getMiningLevelTag(1)) .sortOrder(sortOrder.and(partContext.getMaterialName())) .withModel((block, gen) -> { - String name = gen.name(block); - gen.simpleBlockWithItem(block, - gen.models().cubeColumn(name, gen.blockTexture(name + "_side"), gen.blockTexture(name + "_top"))); + gen.createTrivialBlock(block, TexturedModel.COLUMN); }) .destroyTime(5.0f) .explosionResistance(6.0f) @@ -222,12 +226,12 @@ public PartTemplate withOverlay(PartKeyProvider normal, String overlay) { return withOverlay(normal.key(), overlay); } - public PartTemplate withCustomPath(String itemPath, String itemTag) { - return new PartTemplate(englishNameFormatter, partKey, register, textureGenParams, new PartItemPathFormatter.Overridden(itemPath, itemTag)); + public PartTemplate withCustomPath(String itemPath, Function> materialNameToTag) { + return new PartTemplate(englishNameFormatter, partKey, register, textureGenParams, new PartItemPathFormatter.Overridden(itemPath, materialNameToTag)); } public PartTemplate withCustomPath(String itemPath) { - return withCustomPath(itemPath, itemPath); + return withCustomPath(itemPath, _ -> null); } public TextureGenParams getTextureGenParams() { @@ -237,10 +241,10 @@ public TextureGenParams getTextureGenParams() { public MaterialItemPart create(String material, String materialEnglishName) { String itemPath = this.itemPathFormatter.getPartItemPath(material, partKey); String itemId = this.itemPathFormatter.getPartItemId(material, partKey); - String itemTag = this.itemPathFormatter.getPartItemTag(material, partKey); + var itemTag = this.itemPathFormatter.getPartItemTag(material, partKey); String itemEnglishName = englishNameFormatter.format(materialEnglishName); - return new MaterialItemPartImpl(partKey, itemTag, itemId, ctx -> { + return new MaterialItemPartImpl(partKey, itemId, itemTag, ctx -> { register.register(ctx, partKey, itemPath, itemId, itemTag, itemEnglishName); }, this.textureGenParams, true); } @@ -252,6 +256,6 @@ public PartKey key() { @FunctionalInterface public interface Register { - void register(MaterialBuilder.PartContext partContext, PartKey part, String itemPath, String itemId, String itemTag, String itemEnglishName); + void register(MaterialBuilder.PartContext partContext, PartKey part, String itemPath, String itemId, @Nullable TagKey itemTag, String itemEnglishName); } } diff --git a/src/main/java/aztech/modern_industrialization/materials/part/RawMetalPart.java b/src/main/java/aztech/modern_industrialization/materials/part/RawMetalPart.java index c2e4a5231..285b7929f 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/RawMetalPart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/RawMetalPart.java @@ -27,6 +27,7 @@ import static aztech.modern_industrialization.materials.part.MIParts.RAW_METAL; import static aztech.modern_industrialization.materials.part.MIParts.RAW_METAL_BLOCK; +import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.materials.set.MaterialRawSet; import java.util.List; @@ -38,11 +39,11 @@ public PartTemplate of(MaterialRawSet set) { if (isBlock) { return part .asBlock(SortOrder.RAW_ORE_BLOCKS, new TextureGenParams.RawMetal(true, set), 5, 6, 1) - .withCustomPath("raw_%s_block", "storage_blocks/raw_%s"); + .withCustomPath("raw_%s_block", materialName -> MITags.convention("storage_blocks/raw_" + materialName)); } else { return part .withTexture(new TextureGenParams.RawMetal(false, set)) - .withCustomPath("raw_%s", "raw_materials/%s"); + .withCustomPath("raw_%s", materialName -> MITags.convention("raw_materials/" + materialName)); } } diff --git a/src/main/java/aztech/modern_industrialization/materials/part/TankPart.java b/src/main/java/aztech/modern_industrialization/materials/part/TankPart.java index b2e613e0a..2d5c50e32 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/TankPart.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/TankPart.java @@ -26,6 +26,7 @@ import static aztech.modern_industrialization.materials.property.MaterialProperty.MEAN_RGB; +import aztech.modern_industrialization.MI; import aztech.modern_industrialization.MIBlock; import aztech.modern_industrialization.MICapabilities; import aztech.modern_industrialization.MICommonProxy; @@ -33,27 +34,34 @@ import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.blocks.storage.StorageBehaviour; import aztech.modern_industrialization.blocks.storage.tank.*; -import aztech.modern_industrialization.datagen.model.BaseModelProvider; import aztech.modern_industrialization.datagen.tag.TagsToGenerate; import aztech.modern_industrialization.definition.BlockDefinition; -import aztech.modern_industrialization.items.ContainerItem; import aztech.modern_industrialization.items.SortOrder; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; + +import java.util.Optional; import java.util.function.BiConsumer; + +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.model.ModelTemplate; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.data.models.model.TextureSlot; +import net.minecraft.client.data.models.model.TexturedModel; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.apache.commons.lang3.mutable.MutableObject; import org.jspecify.annotations.Nullable; public class TankPart implements PartKeyProvider { - public static final BiConsumer MODEL_GENERATOR = (block, gen) -> { - gen.simpleBlock(block, gen.models() - .getBuilder(gen.blockTexture(block).getPath()) - .parent(gen.models().getExistingFile(gen.modLoc("base/tank"))) - .texture("0", gen.blockTexture(block).toString())); + public static final BiConsumer MODEL_GENERATOR = (block, gen) -> { + var textureSlot = TextureSlot.create("0"); + var template = new ModelTemplate(Optional.of(MI.id("base/tank")), Optional.empty(), textureSlot); + var texturedModel = TexturedModel.createDefault(b -> new TextureMapping().put(textureSlot, TextureMapping.getBlockTexture(b)), template); + gen.createTrivialBlock(block, texturedModel); }; @Override @@ -77,7 +85,7 @@ public PartTemplate of(PartEnglishNameFormatter englishNameFormatter, long bucke .asBlock(SortOrder.TANKS, new TextureGenParams.SimpleRecoloredBlock()) .withRegister((partContext, part, itemPath, itemId, itemTag, englishName) -> { - StorageBehaviour tankStorageBehaviour = StorageBehaviour.uniformQuantity(capacity); + StorageBehaviour tankStorageBehaviour = StorageBehaviour.uniformQuantity(capacity); EntityBlock factory = (pos, state) -> new TankBlockEntity(bet.getValue(), pos, state); @@ -85,7 +93,7 @@ public PartTemplate of(PartEnglishNameFormatter englishNameFormatter, long bucke englishName, itemPath, MIBlock.BlockDefinitionParams.defaultStone() - .withBlockConstructor(s -> new TankBlock(factory, tankStorageBehaviour)) + .withBlockConstructor(p -> new TankBlock(p, factory, tankStorageBehaviour)) .withBlockItemConstructor(TankItem::new) .withModel(MODEL_GENERATOR) .withBlockEntityRendererItemModel() @@ -95,17 +103,18 @@ public PartTemplate of(PartEnglishNameFormatter englishNameFormatter, long bucke TagsToGenerate.generateTag(MITags.TANKS, blockDefinition, "Tanks"); MIRegistries.BLOCK_ENTITIES.register(itemPath, () -> { - var ret = BlockEntityType.Builder.of(factory::newBlockEntity, blockDefinition.asBlock()).build(null); + var ret = new BlockEntityType<>(factory::newBlockEntity, blockDefinition.asBlock()); // noinspection unchecked,rawtypes bet.setValue((BlockEntityType) ret); return ret; }); MICapabilities.onEvent(event -> { - event.registerBlockEntity(Capabilities.FluidHandler.BLOCK, bet.getValue(), (be, side) -> be.fluidHandler); + event.registerBlockEntity(Capabilities.Fluid.BLOCK, bet.getValue(), (be, side) -> be.fluidHandler); - var item = (TankItem) blockDefinition.asItem(); - event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ignored) -> new ContainerItem.FluidHandler(stack, item), item); + // TODO 26.1 +// var item = (TankItem) blockDefinition.asItem(); +// event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ignored) -> new ContainerItem.FluidHandler(stack, item), item); }); MICommonProxy.INSTANCE.registerPartTankClient(bet::getValue, partContext.get(MEAN_RGB)); diff --git a/src/main/java/aztech/modern_industrialization/materials/part/TextureGenParams.java b/src/main/java/aztech/modern_industrialization/materials/part/TextureGenParams.java index 65f19c366..e919f1be9 100644 --- a/src/main/java/aztech/modern_industrialization/materials/part/TextureGenParams.java +++ b/src/main/java/aztech/modern_industrialization/materials/part/TextureGenParams.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.materials.set.MaterialBlockSet; import aztech.modern_industrialization.materials.set.MaterialOreSet; import aztech.modern_industrialization.materials.set.MaterialRawSet; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.jspecify.annotations.Nullable; public sealed interface TextureGenParams { @@ -47,7 +47,7 @@ record Gem() implements TextureGenParams {} record HotIngot() implements TextureGenParams {} - record Ore(ResourceLocation stoneType, MaterialOreSet oreSet) implements TextureGenParams {} + record Ore(Identifier stoneType, MaterialOreSet oreSet) implements TextureGenParams {} record RawMetal(boolean isBlock, MaterialRawSet rawSet) implements TextureGenParams {} diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/ForgeHammerRecipes.java b/src/main/java/aztech/modern_industrialization/materials/recipe/ForgeHammerRecipes.java index 6fa14d2de..56fa3dc50 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/ForgeHammerRecipes.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/ForgeHammerRecipes.java @@ -30,6 +30,7 @@ import aztech.modern_industrialization.materials.part.PartKeyProvider; import aztech.modern_industrialization.materials.recipe.builder.ForgeHammerRecipeBuilder; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; /** * Standard forge hammer recipes for early-game materials. @@ -86,8 +87,8 @@ private static void addRecipe(MaterialBuilder.RecipeContext ctx, PartKeyProvider var output = ctx.getPart(outputPart); if (input != null && output != null) { - var outputStack = new ItemStack(output, outputCount); - new ForgeHammerRecipeBuilder(ctx, recipeName, input.getTaggedIngredient(), inputCount, outputStack, cost); + var outputStack = new ItemStackTemplate(output.asItem(), outputCount); + new ForgeHammerRecipeBuilder(ctx, recipeName, input.asIngredient(ctx.items()), inputCount, outputStack, cost); } } diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/SmeltingRecipes.java b/src/main/java/aztech/modern_industrialization/materials/recipe/SmeltingRecipes.java index ccfc40365..29b9c3565 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/SmeltingRecipes.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/SmeltingRecipes.java @@ -49,11 +49,15 @@ public static void apply(MaterialBuilder.RecipeContext ctx) { public static void applyBlastFurnace(MaterialBuilder.RecipeContext ctx, boolean hotIngot, int eu, int duration) { if (hotIngot) { - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.BLAST_FURNACE, "dust", eu, duration).addTaggedPartInput(DUST, 1).addPartOutput(HOT_INGOT, - 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.BLAST_FURNACE, "dust", eu, duration) + .addTaggedPartInput(DUST, 1) + .addPartOutput(HOT_INGOT, 1); } else { - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.BLAST_FURNACE, "dust", eu, duration).addTaggedPartInput(DUST, 1).addPartOutput(INGOT, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.BLAST_FURNACE, "tiny_dust", eu, duration / 10).addTaggedPartInput(TINY_DUST, 1) + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.BLAST_FURNACE, "dust", eu, duration) + .addTaggedPartInput(DUST, 1) + .addPartOutput(INGOT, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.BLAST_FURNACE, "tiny_dust", eu, duration / 10) + .addTaggedPartInput(TINY_DUST, 1) .addPartOutput(NUGGET, 1); } } diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java b/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java index bde3aacd4..8d5452240 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java @@ -31,6 +31,7 @@ import aztech.modern_industrialization.MIFluids; import aztech.modern_industrialization.MIItem; import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes; +import aztech.modern_industrialization.materials.MIMaterials; import aztech.modern_industrialization.materials.MaterialBuilder; import aztech.modern_industrialization.materials.part.PartKeyProvider; import aztech.modern_industrialization.materials.recipe.builder.MIRecipeBuilder; @@ -51,37 +52,59 @@ public static void apply(MaterialBuilder.RecipeContext ctx) { add3By3Crafting(ctx, ctx.get(MAIN_PART), BLOCK, false); // Not in packer due to conflicts with double ingots. add3By3Crafting(ctx, RAW_METAL, RAW_METAL_BLOCK, true); - new ShapedRecipeBuilder(ctx, BLADE, 4, "blade", "P", "P", "I").addTaggedPart('P', CURVED_PLATE).addTaggedPart('I', ROD) + new ShapedRecipeBuilder(ctx, BLADE, 4, "blade", "P", "P", "I") + .addTaggedPart('P', CURVED_PLATE) + .addTaggedPart('I', ROD) .exportToMachine(MIMachineRecipeTypes.PACKER); - new ShapelessRecipeBuilder(ctx, ORE, 1, "deepslate_to_ore").addPart(ORE_DEEPSLATE); + new ShapelessRecipeBuilder(ctx, ORE, 1, "deepslate_to_ore") + .addPart(ORE_DEEPSLATE); - new ShapedRecipeBuilder(ctx, COIL, 1, "coil", "xxx", "x x", "xxx").addTaggedPart('x', CABLE).exportToAssembler(); - new ShapedRecipeBuilder(ctx, LARGE_PLATE, 1, "large_plate", "xx", "xx").addTaggedPart('x', PLATE) + new ShapedRecipeBuilder(ctx, COIL, 1, "coil", "xxx", "x x", "xxx") + .addTaggedPart('x', CABLE) + .exportToAssembler(); + new ShapedRecipeBuilder(ctx, LARGE_PLATE, 1, "large_plate", "xx", "xx") + .addTaggedPart('x', PLATE) .exportToMachine(MIMachineRecipeTypes.PACKER); - new ShapedRecipeBuilder(ctx, ROTOR, 1, "rotor", "bBb", "BRB", "bBb").addTaggedPart('b', BOLT).addTaggedPart('B', BLADE).addTaggedPart('R', - RING); + new ShapedRecipeBuilder(ctx, ROTOR, 1, "rotor", "bBb", "BRB", "bBb") + .addTaggedPart('b', BOLT) + .addTaggedPart('B', BLADE) + .addTaggedPart('R', RING); - new ShapedRecipeBuilder(ctx, GEAR, 1, "gear", "PbP", "bRb", "PbP").addTaggedPart('b', BOLT).addTaggedPart('P', PLATE).addTaggedPart('R', - RING); + new ShapedRecipeBuilder(ctx, GEAR, 1, "gear", "PbP", "bRb", "PbP") + .addTaggedPart('b', BOLT) + .addTaggedPart('P', PLATE) + .addTaggedPart('R', RING); - new ShapedRecipeBuilder(ctx, HAMMER, 1, "hammer", "ppp", "psp", " s ").addTaggedPart('p', LARGE_PLATE).addInput('s', Items.STICK); + new ShapedRecipeBuilder(ctx, HAMMER, 1, "hammer", "ppp", "psp", " s ") + .addTaggedPart('p', LARGE_PLATE) + .addInput('s', Items.STICK); - new ShapedRecipeBuilder(ctx, RING, 2, "ring", "bRb", "R R", "bRb").addTaggedPart('b', BOLT).addTaggedPart('R', ROD); + new ShapedRecipeBuilder(ctx, RING, 2, "ring", "bRb", "R R", "bRb") + .addTaggedPart('b', BOLT) + .addTaggedPart('R', ROD); - new ShapedRecipeBuilder(ctx, CABLE, 3, "cable", "rrr", "www", "rrr").addInput('r', MIItem.RUBBER_SHEET) - .addTaggedPart('w', WIRE).exportToMachine(MIMachineRecipeTypes.PACKER); + new ShapedRecipeBuilder(ctx, CABLE, 3, "cable", "rrr", "www", "rrr") + .addInput('r', MIItem.RUBBER_SHEET) + .addTaggedPart('w', WIRE) + .exportToMachine(MIMachineRecipeTypes.PACKER); - new ShapedRecipeBuilder(ctx, TANK, 1, "tank", "###", "#G#", "###").addTaggedPart('#', PLATE).addInput('G', Tags.Items.GLASS_BLOCKS) + new ShapedRecipeBuilder(ctx, TANK, 1, "tank", "###", "#G#", "###") + .addTaggedPart('#', PLATE) + .addInput('G', Tags.Items.GLASS_BLOCKS) .exportToAssembler(); new ShapedRecipeBuilder(ctx, BARREL, 1, "barrel", "###", "#b#", "###") .addTaggedPart('#', PLATE) .addInput('b', Tags.Items.BARRELS_WOODEN) .exportToAssembler(); - new ShapedRecipeBuilder(ctx, DRILL_HEAD, 1, "drill_head", "bcp", "GRc", "bGb").addTaggedPart('G', GEAR).addPart('b', BOLT) - .addPart('c', CURVED_PLATE).addTaggedPart('R', ROD).addTaggedPart('p', PLATE); + new ShapedRecipeBuilder(ctx, DRILL_HEAD, 1, "drill_head", "bcp", "GRc", "bGb") + .addTaggedPart('G', GEAR) + .addPart('b', BOLT) + .addPart('c', CURVED_PLATE) + .addTaggedPart('R', ROD) + .addTaggedPart('p', PLATE); // MACERATOR addMaceratorRecycling(ctx, DOUBLE_INGOT, 18); @@ -101,79 +124,127 @@ public static void apply(MaterialBuilder.RecipeContext ctx) { addMaceratorRecycling(ctx, DRILL_HEAD, 7 * 9 + 4); addMaceratorRecycling(ctx, WIRE, 4); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.MACERATOR, "ore_to_crushed").addTaggedPartInput(ORE, 1).addPartOutput(CRUSHED_DUST, 3); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.MACERATOR, "ore_to_raw").addTaggedPartInput(ORE, 1).addPartOutput(RAW_METAL, 3); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.MACERATOR, "ore_to_crushed") + .addTaggedPartInput(ORE, 1) + .addPartOutput(CRUSHED_DUST, 3); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.MACERATOR, "ore_to_raw") + .addTaggedPartInput(ORE, 1) + .addPartOutput(RAW_METAL, 3); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.MACERATOR, "crushed_dust", 2, (int) (100 * ctx.get(HARDNESS).timeFactor)) .addTaggedPartInput(CRUSHED_DUST, 1) - .addPartOutput(DUST, 1).addPartOutput(DUST, 1, 0.5f); + .addPartOutput(DUST, 1) + .addPartOutput(DUST, 1, 0.5f); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.MACERATOR, "raw_metal", 2, (int) (100 * ctx.get(HARDNESS).timeFactor)) .addTaggedPartInput(RAW_METAL, 1) - .addPartOutput(DUST, 1).addPartOutput(DUST, 1, 0.5f); + .addPartOutput(DUST, 1) + .addPartOutput(DUST, 1, 0.5f); // COMPRESSOR - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "main").addTaggedPartInput(ctx.get(MAIN_PART), 1).addPartOutput(PLATE, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "plate").addTaggedPartInput(PLATE, 1).addPartOutput(CURVED_PLATE, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "double_ingot").addTaggedPartInput(DOUBLE_INGOT, 1).addPartOutput(PLATE, 2); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "ring").addTaggedPartInput(ROD, 1).addPartOutput(RING, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "main") + .addTaggedPartInput(ctx.get(MAIN_PART), 1) + .addPartOutput(PLATE, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "plate") + .addTaggedPartInput(PLATE, 1) + .addPartOutput(CURVED_PLATE, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "double_ingot") + .addTaggedPartInput(DOUBLE_INGOT, 1) + .addPartOutput(PLATE, 2); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.COMPRESSOR, "ring") + .addTaggedPartInput(ROD, 1) + .addPartOutput(RING, 1); // CUTTING MACHINE addCuttingMachine(ctx, "main", ctx.get(MAIN_PART), ROD, 2); addCuttingMachine(ctx, "double_ingot", DOUBLE_INGOT, ROD, 4); addCuttingMachine(ctx, "rod", ROD, BOLT, 2); // PACKER - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "block").addTaggedPartInput(ctx.get(MAIN_PART), 9) - .addItemInput(MIItem.PACKER_BLOCK_TEMPLATE, 1, 0.0f).addPartOutput(BLOCK, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "double_ingot").addTaggedPartInput(INGOT, 2) - .addItemInput(MIItem.PACKER_DOUBLE_INGOT_TEMPLATE, 1, 0.0f).addPartOutput(DOUBLE_INGOT, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "block") + .addTaggedPartInput(ctx.get(MAIN_PART), 9) + .itemIn(MIItem.PACKER_BLOCK_TEMPLATE, 1, 0.0f) + .addPartOutput(BLOCK, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "double_ingot") + .addTaggedPartInput(INGOT, 2) + .itemIn(MIItem.PACKER_DOUBLE_INGOT_TEMPLATE, 1, 0.0f) + .addPartOutput(DOUBLE_INGOT, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "fuel_rod_double").addPartInput(FUEL_ROD, 2) - .addItemInput("#c:plates/nuclear_alloy", 1) + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "fuel_rod_double") + .addPartInput(FUEL_ROD, 2) + .itemIn(MIMaterials.NUCLEAR_ALLOY.getPart(PLATE).asIngredient(ctx.items()), 1) .addPartOutput(FUEL_ROD_DOUBLE, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "fuel_rod_quad").addItemInput("#c:plates/nuclear_alloy", 2) + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, "fuel_rod_quad") + .itemIn(MIMaterials.NUCLEAR_ALLOY.getPart(PLATE).asIngredient(ctx.items()), 2) .addPartInput(FUEL_ROD_DOUBLE, 2) .addPartOutput(FUEL_ROD_QUAD, 1); // UNPACKER - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.UNPACKER, "coil").addTaggedPartInput(COIL, 1).addPartOutput(CABLE, 8); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.UNPACKER, "coil") + .addTaggedPartInput(COIL, 1) + .addPartOutput(CABLE, 8); // WIREMILL - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.WIREMILL, "wire").addTaggedPartInput(PLATE, 1).addPartOutput(WIRE, 2); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.WIREMILL, "fine_wire").addTaggedPartInput(WIRE, 1).addPartOutput(FINE_WIRE, 4); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.WIREMILL, "wire") + .addTaggedPartInput(PLATE, 1) + .addPartOutput(WIRE, 2); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.WIREMILL, "fine_wire") + .addTaggedPartInput(WIRE, 1) + .addPartOutput(FINE_WIRE, 4); // EXTRA ASSEMBLER - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "rotor").addTaggedPartInput(BLADE, 4).addTaggedPartInput(RING, 1) - .addFluidInput(MIFluids.SOLDERING_ALLOY, 100).addPartOutput(ROTOR, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "gear").addTaggedPartInput(PLATE, 4).addTaggedPartInput(RING, 1) - .addFluidInput(MIFluids.SOLDERING_ALLOY, 100).addPartOutput(GEAR, 2); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "drill_head").addTaggedPartInput(PLATE, 1).addTaggedPartInput(CURVED_PLATE, 2) - .addTaggedPartInput(ROD, 1).addTaggedPartInput(GEAR, 2).addFluidInput(MIFluids.SOLDERING_ALLOY, 75) + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "rotor") + .addTaggedPartInput(BLADE, 4) + .addTaggedPartInput(RING, 1) + .fluidIn(MIFluids.SOLDERING_ALLOY, 100) + .addPartOutput(ROTOR, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "gear") + .addTaggedPartInput(PLATE, 4) + .addTaggedPartInput(RING, 1) + .fluidIn(MIFluids.SOLDERING_ALLOY, 100) + .addPartOutput(GEAR, 2); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "drill_head") + .addTaggedPartInput(PLATE, 1) + .addTaggedPartInput(CURVED_PLATE, 2) + .addTaggedPartInput(ROD, 1) + .addTaggedPartInput(GEAR, 2) + .fluidIn(MIFluids.SOLDERING_ALLOY, 75) .addPartOutput(DRILL_HEAD, 1); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "cable_synthetic_rubber") .addTaggedPartInput(WIRE, 3) - .addFluidInput(MIFluids.SYNTHETIC_RUBBER, 30) + .fluidIn(MIFluids.SYNTHETIC_RUBBER, 30) .addPartOutput(CABLE, 3); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "cable_styrene_rubber") .addTaggedPartInput(WIRE, 3) - .addFluidInput(MIFluids.STYRENE_BUTADIENE_RUBBER, 6) + .fluidIn(MIFluids.STYRENE_BUTADIENE_RUBBER, 6) .addPartOutput(CABLE, 3); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.ASSEMBLER, "fuel_rod", 16, 200) - .addItemInput("modern_industrialization:blastproof_alloy_curved_plate", 2) - .addItemInput(MIItem.LARGE_MOTOR, 1).addItemInput(MIItem.ROBOT_ARM, 2).addTaggedPartInput(ROD, 18) - .addFluidInput(MIFluids.SOLDERING_ALLOY, 500).addFluidInput(MIFluids.HELIUM, 100) + .itemIn("modern_industrialization:blastproof_alloy_curved_plate", 2) + .itemIn(MIItem.LARGE_MOTOR, 1) + .itemIn(MIItem.ROBOT_ARM, 2) + .addTaggedPartInput(ROD, 18) + .fluidIn(MIFluids.SOLDERING_ALLOY, 500) + .fluidIn(MIFluids.HELIUM, 100) .addPartOutput(FUEL_ROD, 1); // HEAT EXCHANGER - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.HEAT_EXCHANGER, "hot_ingot", 8, 10).addPartInput(HOT_INGOT, 1) - .addFluidInput(MIFluids.CRYOFLUID, 20) - .addPartOutput(INGOT, 1).addFluidOutput(MIFluids.ARGON, 13).addFluidOutput(MIFluids.HELIUM, 5); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.HEAT_EXCHANGER, "hot_ingot", 8, 10) + .addPartInput(HOT_INGOT, 1) + .fluidIn(MIFluids.CRYOFLUID, 20) + .addPartOutput(INGOT, 1) + .fluidOut(MIFluids.ARGON, 13) + .fluidOut(MIFluids.HELIUM, 5); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.POLARIZER, "rod_magnetic", 8, 200).addTaggedPartInput(ROD, 1).addPartOutput(ROD_MAGNETIC, 1); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.POLARIZER, "wire_magnetic", 8, 200).addTaggedPartInput(WIRE, 1).addPartOutput(WIRE_MAGNETIC, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.POLARIZER, "rod_magnetic", 8, 200) + .addTaggedPartInput(ROD, 1) + .addPartOutput(ROD_MAGNETIC, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.POLARIZER, "wire_magnetic", 8, 200) + .addTaggedPartInput(WIRE, 1) + .addPartOutput(WIRE_MAGNETIC, 1); new SmeltingRecipeBuilder(ctx, ROD_MAGNETIC, ROD, 0.0f, false); new SmeltingRecipeBuilder(ctx, WIRE_MAGNETIC, WIRE, 0.0f, false); - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.VACUUM_FREEZER, "hot_ingot", 32, 250).addTaggedPartInput(HOT_INGOT, 1).addPartOutput(INGOT, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.VACUUM_FREEZER, "hot_ingot", 32, 250) + .addTaggedPartInput(HOT_INGOT, 1) + .addPartOutput(INGOT, 1); } /** @@ -207,14 +278,20 @@ private static void add3By3Crafting(MaterialBuilder.RecipeContext ctx, PartKeyPr } if (packer) { - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, bigPart).addTaggedPartInput(smallPart, 9).addPartOutput(bigPart, 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.PACKER, bigPart) + .addTaggedPartInput(smallPart, 9) + .addPartOutput(bigPart, 1); } - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.UNPACKER, smallPart).addTaggedPartInput(bigPart, 1).addPartOutput(smallPart, 9); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.UNPACKER, smallPart) + .addTaggedPartInput(bigPart, 1) + .addPartOutput(smallPart, 9); } private static void addCuttingMachine(MaterialBuilder.RecipeContext ctx, String name, PartKeyProvider inputPart, PartKeyProvider outputPart, int amount) { - new MIRecipeBuilder(ctx, MIMachineRecipeTypes.CUTTING_MACHINE, name).addTaggedPartInput(inputPart, 1).addPartOutput(outputPart, amount) - .addFluidInput("modern_industrialization:lubricant", 1); + new MIRecipeBuilder(ctx, MIMachineRecipeTypes.CUTTING_MACHINE, name) + .addTaggedPartInput(inputPart, 1) + .addPartOutput(outputPart, amount) + .fluidIn("modern_industrialization:lubricant", 1); } } diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ForgeHammerRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ForgeHammerRecipeBuilder.java index c62105a6d..95c76e496 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ForgeHammerRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ForgeHammerRecipeBuilder.java @@ -27,8 +27,11 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.blocks.forgehammer.ForgeHammerRecipe; import aztech.modern_industrialization.materials.MaterialBuilder; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.Ingredient; public class ForgeHammerRecipeBuilder implements MaterialRecipeBuilder { @@ -37,7 +40,7 @@ public class ForgeHammerRecipeBuilder implements MaterialRecipeBuilder { private boolean canceled = false; private final ForgeHammerRecipe recipe; - public ForgeHammerRecipeBuilder(MaterialBuilder.RecipeContext context, String id, Ingredient input, int inputCount, ItemStack output, + public ForgeHammerRecipeBuilder(MaterialBuilder.RecipeContext context, String id, Ingredient input, int inputCount, ItemStackTemplate output, int hammerDamage) { this.recipeId = "forge_hammer/" + id; this.context = context; @@ -64,7 +67,7 @@ public boolean isCanceled() { public void save(RecipeOutput recipeOutput) { if (!canceled) { String fullId = "materials/" + context.getMaterialName() + "/" + recipeId; - recipeOutput.accept(MI.id(fullId), recipe, null); + recipeOutput.accept(ResourceKey.create(Registries.RECIPE, MI.id(fullId)), recipe, null); } } } diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/MIRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/MIRecipeBuilder.java index 515d69205..87c4bcfff 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/MIRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/MIRecipeBuilder.java @@ -33,7 +33,9 @@ import aztech.modern_industrialization.materials.part.MaterialItemPart; import aztech.modern_industrialization.materials.part.PartKeyProvider; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; import org.jspecify.annotations.Nullable; public class MIRecipeBuilder extends MIRecipeJson implements MaterialRecipeBuilder { @@ -42,7 +44,7 @@ public class MIRecipeBuilder extends MIRecipeJson implements Ma private boolean canceled = false; public MIRecipeBuilder(MaterialBuilder.RecipeContext context, MachineRecipeType type, String recipeSuffix, int eu, int duration) { - super(type, eu, duration); + super(context.fluids(), context.items(), type, eu, duration); this.recipeId = type.getPath() + "/" + recipeSuffix; this.context = context; context.addRecipe(this); @@ -78,7 +80,7 @@ public MIRecipeBuilder addPartInput(@Nullable MaterialItemPart part, int amount) if (part == null) { canceled = true; } else { - addItemInput(part.getItemId(), amount); + itemIn(part.getItemId(), amount); } return this; } @@ -87,7 +89,7 @@ public MIRecipeBuilder addTaggedPartInput(@Nullable MaterialItemPart part, int a if (part == null) { canceled = true; } else { - addItemInput(part.getTaggedItemId(), amount); + itemIn(part.asIngredient(context.items()), amount); } return this; } @@ -100,7 +102,7 @@ public MIRecipeBuilder addPartOutput(@Nullable MaterialItemPart part, int amount if (part == null) { canceled = true; } else { - return addItemOutput(part.getItemId(), amount); + return itemOut(part.getItemId(), amount); } return this; } @@ -113,7 +115,7 @@ public MIRecipeBuilder addPartOutput(@Nullable MaterialItemPart part, int amount if (part == null) { canceled = true; } else { - return addItemOutput(part.getItemId(), amount, probability); + return itemOut(part.getItemId(), amount, probability); } return this; } @@ -136,7 +138,7 @@ public void cancel() { public void save(RecipeOutput recipeOutput) { if (!canceled) { String fullId = "materials/" + context.getMaterialName() + "/" + recipeId; - recipeOutput.accept(MI.id(fullId), recipe, null); + recipeOutput.accept(ResourceKey.create(Registries.RECIPE, MI.id(fullId)), recipe, null); } } } diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapedRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapedRecipeBuilder.java index 4b09b3b1b..d3996ade7 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapedRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapedRecipeBuilder.java @@ -35,12 +35,15 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapedRecipe; @@ -52,7 +55,7 @@ public class ShapedRecipeBuilder implements MaterialRecipeBuilder { private final MaterialBuilder.RecipeContext context; private boolean canceled = false; private final String id; - private final ItemStack result; + private final ItemStackTemplate result; private final String[] pattern; private final Map inputs = new HashMap<>(); @@ -66,7 +69,7 @@ public ShapedRecipeBuilder(MaterialBuilder.RecipeContext context, PartKeyProvide this.pattern = null; canceled = true; } else { - this.result = new ItemStack(output.asItem(), count); + this.result = new ItemStackTemplate(output.asItem(), count); this.pattern = pattern; } context.addRecipe(this); @@ -83,7 +86,7 @@ public ShapedRecipeBuilder addPart(char key, PartKeyProvider part) { public ShapedRecipeBuilder addTaggedPart(char key, PartKeyProvider part) { if (context.getPart(part) != null) { - addInput(key, context.getPart(part).getTaggedItemId()); + addInput(key, context.getPart(part).asIngredient(context.items())); } else { canceled = true; } @@ -91,26 +94,27 @@ public ShapedRecipeBuilder addTaggedPart(char key, PartKeyProvider part) { } public ShapedRecipeBuilder addInput(char key, TagKey tag) { - return addInput(key, "#" + tag.location().toString()); + return addInput(key, Ingredient.of(context.items().getOrThrow(tag))); } - public ShapedRecipeBuilder addInput(char key, String maybeTag) { + public ShapedRecipeBuilder addInput(char key, String id) { + return addInput(key, Ingredient.of(BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(id))))); + } + + public ShapedRecipeBuilder addInput(char key, ItemLike item) { + return addInput(key, BuiltInRegistries.ITEM.getKey(item.asItem()).toString()); + } + + public ShapedRecipeBuilder addInput(char key, Ingredient ingredient) { if (!canceled) { if (inputs.containsKey(key)) { throw new IllegalArgumentException("Key mapping is already registered: " + key); } - Ingredient ingredient = maybeTag.startsWith("#") - ? Ingredient.of(ItemTags.create(ResourceLocation.parse(maybeTag.substring(1)))) - : Ingredient.of(BuiltInRegistries.ITEM.get(ResourceLocation.parse(maybeTag))); inputs.put(key, ingredient); } return this; } - public ShapedRecipeBuilder addInput(char key, ItemLike item) { - return addInput(key, BuiltInRegistries.ITEM.getKey(item.asItem()).toString()); - } - public ShapedRecipeBuilder exportToAssembler(int eu, int duration) { return exportToMachine(MIMachineRecipeTypes.ASSEMBLER, eu, duration, 1); } @@ -161,7 +165,7 @@ public void save(RecipeOutput recipeOutput) { } String fullId = "materials/" + context.getMaterialName() + "/" + recipeId; - recipeOutput.accept(MI.id(fullId), new ShapedRecipe( + recipeOutput.accept(ResourceKey.create(Registries.RECIPE, MI.id(fullId)), new ShapedRecipe( "", CraftingBookCategory.MISC, ShapedRecipePattern.of(inputs, pattern), diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapelessRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapelessRecipeBuilder.java index ddfb7c327..72f28d391 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapelessRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/ShapelessRecipeBuilder.java @@ -28,8 +28,11 @@ import aztech.modern_industrialization.materials.MaterialBuilder; import aztech.modern_industrialization.materials.part.PartKeyProvider; import net.minecraft.core.NonNullList; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapelessRecipe; @@ -38,7 +41,7 @@ public class ShapelessRecipeBuilder implements MaterialRecipeBuilder { public final String recipeId; private final MaterialBuilder.RecipeContext context; private boolean canceled = false; - private final ItemStack result; + private final ItemStackTemplate result; private final NonNullList ingredients = NonNullList.create(); public ShapelessRecipeBuilder(MaterialBuilder.RecipeContext context, PartKeyProvider result, int count, String id) { @@ -49,7 +52,7 @@ public ShapelessRecipeBuilder(MaterialBuilder.RecipeContext context, PartKeyProv this.result = null; canceled = true; } else { - this.result = new ItemStack(output.asItem(), count); + this.result = new ItemStackTemplate(output.asItem(), count); } context.addRecipe(this); } @@ -83,7 +86,7 @@ public void save(RecipeOutput recipeOutput) { if (!canceled) { String fullId = "materials/" + context.getMaterialName() + "/" + recipeId; recipeOutput.accept( - MI.id(fullId), + ResourceKey.create(Registries.RECIPE, MI.id(fullId)), new ShapelessRecipe( "", CraftingBookCategory.MISC, diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/SmeltingRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/SmeltingRecipeBuilder.java index ba79880ce..76cf0dba8 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/builder/SmeltingRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/builder/SmeltingRecipeBuilder.java @@ -27,7 +27,11 @@ import aztech.modern_industrialization.MI; import aztech.modern_industrialization.materials.MaterialBuilder; import aztech.modern_industrialization.materials.part.PartKeyProvider; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.BlastingRecipe; import net.minecraft.world.item.crafting.CookingBookCategory; @@ -73,7 +77,7 @@ public SmeltingRecipeBuilder(MaterialBuilder.RecipeContext context, PartKeyProvi "", CookingBookCategory.MISC, Ingredient.of(input.asItem()), - output.asItem().getDefaultInstance(), + new ItemStackTemplate(output.asItem()), experience, cookingtime); context.addRecipe(this); @@ -102,7 +106,7 @@ public boolean isCanceled() { public void save(RecipeOutput recipeOutput) { if (!canceled) { String fullId = "materials/" + context.getMaterialName() + "/" + recipeId; - recipeOutput.accept(MI.id(fullId), smeltingRecipe, null); + recipeOutput.accept(ResourceKey.create(Registries.RECIPE, MI.id(fullId)), smeltingRecipe, null); } } } diff --git a/src/main/java/aztech/modern_industrialization/misc/runtime_datagen/RuntimeDataGen.java b/src/main/java/aztech/modern_industrialization/misc/runtime_datagen/RuntimeDataGen.java index 72f053585..47f35f064 100644 --- a/src/main/java/aztech/modern_industrialization/misc/runtime_datagen/RuntimeDataGen.java +++ b/src/main/java/aztech/modern_industrialization/misc/runtime_datagen/RuntimeDataGen.java @@ -25,27 +25,30 @@ package aztech.modern_industrialization.misc.runtime_datagen; import aztech.modern_industrialization.MI; + +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; import java.util.stream.Stream; import net.minecraft.DetectedVersion; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.registries.VanillaRegistries; +import net.neoforged.fml.ModList; import net.neoforged.fml.loading.FMLPaths; -import net.neoforged.fml.loading.LoadingModList; -import net.neoforged.neoforge.common.data.ExistingFileHelper; public class RuntimeDataGen { @FunctionalInterface public interface DataGenConfig { - void run(DataGenerator gen, ExistingFileHelper fileHelper, CompletableFuture registries, boolean run, - boolean runtimeDatagen); + void run(DataGenerator gen, CompletableFuture registries, boolean runtimeDatagen); } public static void run(DataGenConfig... configs) { @@ -74,17 +77,12 @@ private static void runInner(DataGenConfig... configs) throws Exception { MI.LOGGER.info("Starting MI runtime data generation"); - var modContainer = LoadingModList.get().getModFileById(MI.ID); + var modContainer = ModList.get().getModFileById(MI.ID); var registriesFuture = CompletableFuture.supplyAsync(VanillaRegistries::createLookup, Util.backgroundExecutor()); - var gen = new DataGenerator(dataOutput, DetectedVersion.tryDetectVersion(), true); + var gen = new DataGenerator.Cached(dataOutput, DetectedVersion.tryDetectVersion(), true); for (var config : configs) { - config.run( - gen, - new ExistingFileHelper(List.of(), Set.of(), false, null, null), - registriesFuture, - true, - true); + config.run(gen, registriesFuture, true); } gen.run(); @@ -107,8 +105,9 @@ private static void runInner(DataGenConfig... configs) throws Exception { return; } - var newCache = readCache(cachePath); - var oldCache = readCache(modContainer.getFile().findResource(".cache/" + cachePath.getFileName())); + var newCache = readCache(cachePath.toString(), () -> Files.newBufferedReader(cachePath)); + var oldCache = readCache(cachePath.getFileName().toString(), + () -> new BufferedReader(new InputStreamReader(modContainer.getFile().getContents().openFile(".cache/" + cachePath.getFileName())))); for (var newEntry : newCache.entrySet()) { var oldHash = oldCache.get(newEntry.getKey()); @@ -136,8 +135,8 @@ private static void runInner(DataGenConfig... configs) throws Exception { /** * Read cache, and return map from resource path to hash. */ - private static Map readCache(Path path) { - try (var reader = Files.newBufferedReader(path)) { + private static Map readCache(String name, ReaderSupplier readerSupplier) { + try (var reader = readerSupplier.get()) { Map map = new HashMap<>(); // Skip header line @@ -150,8 +149,13 @@ private static Map readCache(Path path) { return map; } catch (IOException e) { - MI.LOGGER.warn("Failed to read cache file " + path, e); + MI.LOGGER.warn("Failed to read cache file " + name, e); return Map.of(); } } + + @FunctionalInterface + private interface ReaderSupplier { + BufferedReader get() throws IOException; + } } diff --git a/src/main/java/aztech/modern_industrialization/network/BasePacket.java b/src/main/java/aztech/modern_industrialization/network/BasePacket.java index 9c05af0b9..d338d7c29 100644 --- a/src/main/java/aztech/modern_industrialization/network/BasePacket.java +++ b/src/main/java/aztech/modern_industrialization/network/BasePacket.java @@ -28,6 +28,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; +import net.neoforged.neoforge.client.network.ClientPacketDistributor; import net.neoforged.neoforge.network.PacketDistributor; import net.neoforged.neoforge.network.handling.IPayloadContext; @@ -35,7 +36,7 @@ public interface BasePacket extends CustomPacketPayload { void handle(Context ctx); default void sendToServer() { - PacketDistributor.sendToServer(this); + ClientPacketDistributor.sendToServer(this); } default void sendToClient(ServerPlayer player) { diff --git a/src/main/java/aztech/modern_industrialization/network/MIPackets.java b/src/main/java/aztech/modern_industrialization/network/MIPackets.java index a0733e581..93f789897 100644 --- a/src/main/java/aztech/modern_industrialization/network/MIPackets.java +++ b/src/main/java/aztech/modern_industrialization/network/MIPackets.java @@ -51,6 +51,7 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.network.handling.IPayloadHandler; import net.neoforged.neoforge.network.registration.PayloadRegistrar; public class MIPackets { @@ -101,8 +102,9 @@ public static void init(RegisterPayloadHandlersEvent event) { } private static

void register(PayloadRegistrar registrar, Registration

reg) { - registrar.playBidirectional(reg.packetType, reg.packetCodec, (packet, context) -> { + IPayloadHandler

handler = (packet, context) -> { packet.handle(new BasePacket.Context(reg.clazz, context)); - }); + }; + registrar.playBidirectional(reg.packetType, reg.packetCodec, handler, handler); } } diff --git a/src/main/java/aztech/modern_industrialization/network/machines/DoSlotDraggingPacket.java b/src/main/java/aztech/modern_industrialization/network/machines/DoSlotDraggingPacket.java index 66bab747c..9a37e91e8 100644 --- a/src/main/java/aztech/modern_industrialization/network/machines/DoSlotDraggingPacket.java +++ b/src/main/java/aztech/modern_industrialization/network/machines/DoSlotDraggingPacket.java @@ -26,22 +26,22 @@ import aztech.modern_industrialization.compat.viewer.ReiDraggable; import aztech.modern_industrialization.network.BasePacket; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.Simulation; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.Slot; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.jspecify.annotations.Nullable; -public record DoSlotDraggingPacket(int containerId, int slotId, boolean isItem, @Nullable ItemVariant itemVariant, - @Nullable FluidVariant fluidVariant) implements BasePacket { - public DoSlotDraggingPacket(int containerId, int slotId, ItemVariant itemVariant) { +public record DoSlotDraggingPacket(int containerId, int slotId, boolean isItem, @Nullable ItemResource itemVariant, + @Nullable FluidResource fluidVariant) implements BasePacket { + public DoSlotDraggingPacket(int containerId, int slotId, ItemResource itemVariant) { this(containerId, slotId, true, itemVariant, null); } - public DoSlotDraggingPacket(int containerId, int slotId, FluidVariant fluidVariant) { + public DoSlotDraggingPacket(int containerId, int slotId, FluidResource fluidVariant) { this(containerId, slotId, false, null, fluidVariant); } @@ -50,7 +50,7 @@ private DoSlotDraggingPacket(RegistryFriendlyByteBuf buf) { } private DoSlotDraggingPacket(int containerId, int slotId, boolean isItem, RegistryFriendlyByteBuf buf) { - this(containerId, slotId, isItem, isItem ? ItemVariant.fromPacket(buf) : null, isItem ? null : FluidVariant.fromPacket(buf)); + this(containerId, slotId, isItem, isItem ? ItemResource.STREAM_CODEC.decode(buf) : null, isItem ? null : FluidResource.STREAM_CODEC.decode(buf)); } public static StreamCodec STREAM_CODEC = StreamCodec.ofMember( @@ -61,9 +61,9 @@ public void write(RegistryFriendlyByteBuf buf) { buf.writeVarInt(slotId); buf.writeBoolean(isItem); if (isItem) { - itemVariant.toPacket(buf); + ItemResource.STREAM_CODEC.encode(buf, itemVariant); } else { - fluidVariant.toPacket(buf); + FluidResource.STREAM_CODEC.encode(buf, fluidVariant); } } diff --git a/src/main/java/aztech/modern_industrialization/network/machines/ForgeHammerMoveRecipePacket.java b/src/main/java/aztech/modern_industrialization/network/machines/ForgeHammerMoveRecipePacket.java index 9e9b81016..b61fe67b1 100644 --- a/src/main/java/aztech/modern_industrialization/network/machines/ForgeHammerMoveRecipePacket.java +++ b/src/main/java/aztech/modern_industrialization/network/machines/ForgeHammerMoveRecipePacket.java @@ -30,14 +30,14 @@ import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.inventory.AbstractContainerMenu; -public record ForgeHammerMoveRecipePacket(int containedId, ResourceLocation recipeId, int fillAction, int amount) implements BasePacket { +public record ForgeHammerMoveRecipePacket(int containedId, Identifier recipeId, int fillAction, int amount) implements BasePacket { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( MIStreamCodecs.BYTE, ForgeHammerMoveRecipePacket::containedId, - ResourceLocation.STREAM_CODEC, + Identifier.STREAM_CODEC, ForgeHammerMoveRecipePacket::recipeId, MIStreamCodecs.BYTE, ForgeHammerMoveRecipePacket::fillAction, diff --git a/src/main/java/aztech/modern_industrialization/network/machines/ReiLockSlotsPacket.java b/src/main/java/aztech/modern_industrialization/network/machines/ReiLockSlotsPacket.java index e3f87eea2..df48010a3 100644 --- a/src/main/java/aztech/modern_industrialization/network/machines/ReiLockSlotsPacket.java +++ b/src/main/java/aztech/modern_industrialization/network/machines/ReiLockSlotsPacket.java @@ -29,15 +29,18 @@ import aztech.modern_industrialization.network.BasePacket; import aztech.modern_industrialization.network.MIStreamCodecs; import io.netty.buffer.ByteBuf; +import net.minecraft.core.registries.Registries; import net.minecraft.network.codec.StreamCodec; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.crafting.Recipe; -public record ReiLockSlotsPacket(int containedId, ResourceLocation recipeId) implements BasePacket { +public record ReiLockSlotsPacket(int containedId, ResourceKey> recipeId) implements BasePacket { public static final StreamCodec STREAM_CODEC = StreamCodec.composite( MIStreamCodecs.BYTE, ReiLockSlotsPacket::containedId, - ResourceLocation.STREAM_CODEC, + ResourceKey.streamCodec(Registries.RECIPE), ReiLockSlotsPacket::recipeId, ReiLockSlotsPacket::new); diff --git a/src/main/java/aztech/modern_industrialization/network/machines/UpdateFluidSlotPacket.java b/src/main/java/aztech/modern_industrialization/network/machines/UpdateFluidSlotPacket.java index b6e770797..70a849a58 100644 --- a/src/main/java/aztech/modern_industrialization/network/machines/UpdateFluidSlotPacket.java +++ b/src/main/java/aztech/modern_industrialization/network/machines/UpdateFluidSlotPacket.java @@ -25,26 +25,24 @@ package aztech.modern_industrialization.network.machines; import aztech.modern_industrialization.inventory.ConfigurableFluidStack; +import aztech.modern_industrialization.inventory.ConfigurableItemStack; import aztech.modern_industrialization.inventory.ConfigurableScreenHandler; import aztech.modern_industrialization.network.BasePacket; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.Slot; public record UpdateFluidSlotPacket(int syncId, int stackId, ConfigurableFluidStack newStack) implements BasePacket { - public static final StreamCodec STREAM_CODEC = StreamCodec.ofMember( - UpdateFluidSlotPacket::write, UpdateFluidSlotPacket::new); - - public UpdateFluidSlotPacket(RegistryFriendlyByteBuf buf) { - this(buf.readUnsignedByte(), buf.readVarInt(), new ConfigurableFluidStack(buf.readNbt(), buf.registryAccess())); - } - - public void write(RegistryFriendlyByteBuf buf) { - buf.writeByte(syncId); - buf.writeVarInt(stackId); - buf.writeNbt(newStack.toNbt(buf.registryAccess())); - } + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_INT, + UpdateFluidSlotPacket::syncId, + ByteBufCodecs.VAR_INT, + UpdateFluidSlotPacket::stackId, + ConfigurableFluidStack.STREAM_CODEC, + UpdateFluidSlotPacket::newStack, + UpdateFluidSlotPacket::new); @Override public void handle(Context ctx) { diff --git a/src/main/java/aztech/modern_industrialization/network/machines/UpdateItemSlotPacket.java b/src/main/java/aztech/modern_industrialization/network/machines/UpdateItemSlotPacket.java index 180817b7d..7cfcfd5c5 100644 --- a/src/main/java/aztech/modern_industrialization/network/machines/UpdateItemSlotPacket.java +++ b/src/main/java/aztech/modern_industrialization/network/machines/UpdateItemSlotPacket.java @@ -28,23 +28,20 @@ import aztech.modern_industrialization.inventory.ConfigurableScreenHandler; import aztech.modern_industrialization.network.BasePacket; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.Slot; public record UpdateItemSlotPacket(int syncId, int stackId, ConfigurableItemStack newStack) implements BasePacket { - public static final StreamCodec STREAM_CODEC = StreamCodec.ofMember( - UpdateItemSlotPacket::write, UpdateItemSlotPacket::new); - - public UpdateItemSlotPacket(RegistryFriendlyByteBuf buf) { - this(buf.readUnsignedByte(), buf.readVarInt(), new ConfigurableItemStack(buf.readNbt(), buf.registryAccess())); - } - - public void write(RegistryFriendlyByteBuf buf) { - buf.writeByte(syncId); - buf.writeVarInt(stackId); - buf.writeNbt(newStack.toNbt(buf.registryAccess())); - } + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_INT, + UpdateItemSlotPacket::syncId, + ByteBufCodecs.VAR_INT, + UpdateItemSlotPacket::stackId, + ConfigurableItemStack.STREAM_CODEC, + UpdateItemSlotPacket::newStack, + UpdateItemSlotPacket::new); @Override public void handle(Context ctx) { diff --git a/src/main/java/aztech/modern_industrialization/network/pipes/SetNetworkFluidPacket.java b/src/main/java/aztech/modern_industrialization/network/pipes/SetNetworkFluidPacket.java index 60801505e..a12d4a280 100644 --- a/src/main/java/aztech/modern_industrialization/network/pipes/SetNetworkFluidPacket.java +++ b/src/main/java/aztech/modern_industrialization/network/pipes/SetNetworkFluidPacket.java @@ -26,23 +26,17 @@ import aztech.modern_industrialization.network.BasePacket; import aztech.modern_industrialization.pipes.fluid.FluidPipeScreenHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.inventory.AbstractContainerMenu; +import net.neoforged.neoforge.transfer.fluid.FluidResource; -public record SetNetworkFluidPacket(int syncId, FluidVariant fluid) implements BasePacket { - public static final StreamCodec STREAM_CODEC = StreamCodec.ofMember( - SetNetworkFluidPacket::write, SetNetworkFluidPacket::new); - - public SetNetworkFluidPacket(RegistryFriendlyByteBuf buf) { - this(buf.readUnsignedByte(), FluidVariant.fromPacket(buf)); - } - - public void write(RegistryFriendlyByteBuf buf) { - buf.writeByte(syncId); - fluid.toPacket(buf); - } +public record SetNetworkFluidPacket(int syncId, FluidResource fluid) implements BasePacket { + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_INT, SetNetworkFluidPacket::syncId, + FluidResource.STREAM_CODEC, SetNetworkFluidPacket::fluid, + SetNetworkFluidPacket::new); @Override public void handle(Context ctx) { diff --git a/src/main/java/aztech/modern_industrialization/nuclear/FluidNuclearComponent.java b/src/main/java/aztech/modern_industrialization/nuclear/FluidNuclearComponent.java index 4764e7126..8af61392a 100644 --- a/src/main/java/aztech/modern_industrialization/nuclear/FluidNuclearComponent.java +++ b/src/main/java/aztech/modern_industrialization/nuclear/FluidNuclearComponent.java @@ -26,31 +26,31 @@ import aztech.modern_industrialization.MIFluids; import aztech.modern_industrialization.compat.kubejs.KubeJSProxy; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import java.util.IdentityHashMap; import java.util.Map; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jspecify.annotations.Nullable; public record FluidNuclearComponent( - FluidVariant variant, + FluidResource variant, double heatConduction, NeutronBehaviour neutronBehaviour, - FluidVariant neutronProduct, - long neutronProductAmount, - double neutronProductProbability) implements NuclearComponent { + FluidResource neutronProduct, + int neutronProductAmount, + double neutronProductProbability) implements NuclearComponent { public FluidNuclearComponent( Fluid fluid, double heatConduction, double density, NuclearConstant.ScatteringType type, IsotopeParams params, - FluidVariant neutronProduct, - long neutronProductAmount, + FluidResource neutronProduct, + int neutronProductAmount, double neutronProductProbability) { this( - FluidVariant.of(fluid), + FluidResource.of(fluid), heatConduction * density, NeutronBehaviour.of(type, params, density), neutronProduct, @@ -59,7 +59,7 @@ public FluidNuclearComponent( } @Override - public FluidVariant getVariant() { + public FluidResource getVariant() { return variant; } @@ -74,12 +74,12 @@ public NeutronBehaviour getNeutronBehaviour() { } @Override - public FluidVariant getNeutronProduct() { + public FluidResource getNeutronProduct() { return neutronProduct; } @Override - public long getNeutronProductAmount() { + public int getNeutronProductAmount() { return neutronProductAmount; } @@ -114,7 +114,7 @@ public static void init() { 1, NuclearConstant.ScatteringType.ULTRA_LIGHT, NuclearConstant.HYDROGEN, - MIFluids.DEUTERIUM.variant(), + MIFluids.DEUTERIUM.resource(), 1, 1)); register(new FluidNuclearComponent(MIFluids.HEAVY_WATER.asFluid(), @@ -122,7 +122,7 @@ public static void init() { 1, NuclearConstant.ScatteringType.LIGHT, NuclearConstant.DEUTERIUM, - MIFluids.TRITIUM.variant(), + MIFluids.TRITIUM.resource(), 1, 1)); register(new FluidNuclearComponent(MIFluids.HIGH_PRESSURE_WATER.asFluid(), @@ -130,7 +130,7 @@ public static void init() { 4, NuclearConstant.ScatteringType.ULTRA_LIGHT, NuclearConstant.HYDROGEN, - MIFluids.DEUTERIUM.variant(), + MIFluids.DEUTERIUM.resource(), 8, 0.125)); register(new FluidNuclearComponent(MIFluids.HIGH_PRESSURE_HEAVY_WATER.asFluid(), @@ -138,7 +138,7 @@ public static void init() { 4, NuclearConstant.ScatteringType.LIGHT, NuclearConstant.DEUTERIUM, - MIFluids.TRITIUM.variant(), + MIFluids.TRITIUM.resource(), 8, 0.125)); diff --git a/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponent.java b/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponent.java index 3b02a5920..aebe03c3e 100644 --- a/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponent.java +++ b/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponent.java @@ -24,14 +24,14 @@ package aztech.modern_industrialization.nuclear; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.DataComponentHolderResource; import org.jspecify.annotations.Nullable; -public interface NuclearComponent { +public interface NuclearComponent { double getHeatConduction(); NeutronBehaviour getNeutronBehaviour(); @@ -43,7 +43,7 @@ default T getNeutronProduct() { return null; } - default long getNeutronProductAmount() { + default int getNeutronProductAmount() { return 0; } @@ -55,11 +55,11 @@ default int getMaxTemperature() { return Integer.MAX_VALUE; } - static ResourceLocation getEmiRecipeId(NuclearComponent component, String category, String type) { + static Identifier getEmiRecipeId(NuclearComponent component, String category, String type) { return switch (component.getVariant()) { - case ItemVariant itemVariant -> BuiltInRegistries.ITEM.getKey(itemVariant.getItem()).withPrefix("/" + category + "/item/").withSuffix("/" + type); - case FluidVariant fluidVariant -> BuiltInRegistries.FLUID.getKey(fluidVariant.getFluid()).withPrefix("/" + category + "/fluid/").withSuffix("/" + type); - case Object object -> throw new IllegalArgumentException("Unknown component variant " + object); + case ItemResource itemResource -> BuiltInRegistries.ITEM.getKey(itemResource.getItem()).withPrefix("/" + category + "/item/").withSuffix("/" + type); + case FluidResource fluidResource -> BuiltInRegistries.FLUID.getKey(fluidResource.getFluid()).withPrefix("/" + category + "/fluid/").withSuffix("/" + type); + case Object object -> throw new IllegalArgumentException("Unknown component resource " + object); }; } } diff --git a/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponentItem.java b/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponentItem.java index f9bec20a0..0516e9775 100644 --- a/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponentItem.java +++ b/src/main/java/aztech/modern_industrialization/nuclear/NuclearComponentItem.java @@ -27,10 +27,10 @@ import aztech.modern_industrialization.MIItem; import aztech.modern_industrialization.definition.ItemDefinition; import aztech.modern_industrialization.items.SortOrder; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import net.minecraft.world.item.Item; +import net.neoforged.neoforge.transfer.item.ItemResource; -public class NuclearComponentItem extends Item implements NuclearComponent { +public class NuclearComponentItem extends Item implements NuclearComponent { public final int maxTemperature; public final double heatConduction; public final NeutronBehaviour neutronBehaviour; @@ -64,7 +64,7 @@ public NeutronBehaviour getNeutronBehaviour() { } @Override - public ItemVariant getVariant() { - return ItemVariant.of(this); + public ItemResource getVariant() { + return ItemResource.of(this); } } diff --git a/src/main/java/aztech/modern_industrialization/nuclear/NuclearFuel.java b/src/main/java/aztech/modern_industrialization/nuclear/NuclearFuel.java index 67c9a5794..157f22c0e 100644 --- a/src/main/java/aztech/modern_industrialization/nuclear/NuclearFuel.java +++ b/src/main/java/aztech/modern_industrialization/nuclear/NuclearFuel.java @@ -29,17 +29,17 @@ import aztech.modern_industrialization.definition.ItemDefinition; import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.machines.components.NuclearEfficiencyHistoryComponent; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.RandomSource; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.transfer.item.ItemResource; public class NuclearFuel extends NuclearAbsorbable { public final double directEnergyFactor; public final double neutronMultiplicationFactor; - public final ResourceLocation depletedVersionId; + public final Identifier depletedVersionId; public final int size; @@ -52,7 +52,7 @@ public class NuclearFuel extends NuclearAbsorbable { public final static record NuclearFuelParams(int desintegrationMax, int maxTemperature, int tempLimitLow, int tempLimitHigh, double neutronMultiplicationFactor, double directEnergyFactor, int size) {} - public NuclearFuel(Properties settings, NuclearFuelParams params, NeutronBehaviour neutronBehaviour, ResourceLocation depletedVersionId) { + public NuclearFuel(Properties settings, NuclearFuelParams params, NeutronBehaviour neutronBehaviour, Identifier depletedVersionId) { this(settings, params.desintegrationMax, params.maxTemperature, params.tempLimitLow, params.tempLimitHigh, params.neutronMultiplicationFactor, params.directEnergyFactor, neutronBehaviour, params.size, depletedVersionId); } @@ -63,7 +63,7 @@ private static int clampTemp(int temperature) { private NuclearFuel(Properties settings, int desintegrationMax, int maxTemperature, int tempLimitLow, int tempLimitHigh, double neutronMultiplicationFactor, double directEnergyFactor, NeutronBehaviour neutronBehaviour, int size, - ResourceLocation depletedVersionId) { + Identifier depletedVersionId) { super(settings, clampTemp(maxTemperature), 0.8 * NuclearConstant.BASE_HEAT_CONDUCTION, neutronBehaviour, desintegrationMax); this.size = size; @@ -86,12 +86,12 @@ public static ItemDefinition of(String englishName, String id, Nucl } @Override - public ItemVariant getNeutronProduct() { - return ItemVariant.of(BuiltInRegistries.ITEM.getOptional(depletedVersionId).get()); + public ItemResource getNeutronProduct() { + return ItemResource.of(BuiltInRegistries.ITEM.getOptional(depletedVersionId).get()); } @Override - public long getNeutronProductAmount() { + public int getNeutronProductAmount() { return size; } diff --git a/src/main/java/aztech/modern_industrialization/nuclear/NuclearTileData.java b/src/main/java/aztech/modern_industrialization/nuclear/NuclearTileData.java index cee4c6ce1..a4c84c16c 100644 --- a/src/main/java/aztech/modern_industrialization/nuclear/NuclearTileData.java +++ b/src/main/java/aztech/modern_industrialization/nuclear/NuclearTileData.java @@ -24,11 +24,11 @@ package aztech.modern_industrialization.nuclear; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; import java.util.Optional; import net.minecraft.network.RegistryFriendlyByteBuf; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.resource.Resource; import org.jspecify.annotations.Nullable; public interface NuclearTileData { @@ -44,7 +44,8 @@ public interface NuclearTileData { double getMeanEuGeneration(); - TransferVariant getVariant(); + // TODO I don't like this + Resource getVariant(); long getVariantAmount(); @@ -52,15 +53,15 @@ public interface NuclearTileData { @Nullable default NuclearComponent getComponent() { - TransferVariant variant = getVariant(); + var variant = getVariant(); - if (variant instanceof ItemVariant resource) { - if (!variant.isBlank() && getVariantAmount() > 0 && resource.getItem() instanceof NuclearComponent comp) { + if (variant instanceof ItemResource resource) { + if (!variant.isEmpty() && getVariantAmount() > 0 && resource.getItem() instanceof NuclearComponent comp) { return comp; } - } else if (variant instanceof FluidVariant resource) { - if (!resource.isBlank() && getVariantAmount() > 0) { + } else if (variant instanceof FluidResource resource) { + if (!resource.isEmpty() && getVariantAmount() > 0) { return FluidNuclearComponent.get(resource.getFluid()); } } @@ -87,7 +88,11 @@ static void write(Optional maybeData, RegistryFriendlyByteBuf b buf.writeDouble(tile.getMeanEuGeneration()); buf.writeBoolean(!tile.isFluid()); - tile.getVariant().toPacket(buf); + if (tile.isFluid()) { + FluidResource.STREAM_CODEC.encode(buf, (FluidResource) tile.getVariant()); + } else { + ItemResource.STREAM_CODEC.encode(buf, (ItemResource) tile.getVariant()); + } buf.writeLong(tile.getVariantAmount()); } else { @@ -113,7 +118,7 @@ static Optional read(RegistryFriendlyByteBuf buf) { final double euGeneration = buf.readDouble(); final boolean isItem = buf.readBoolean(); - final TransferVariant variant = isItem ? ItemVariant.fromPacket(buf) : FluidVariant.fromPacket(buf); + final Resource variant = isItem ? ItemResource.STREAM_CODEC.decode(buf) : FluidResource.STREAM_CODEC.decode(buf); final long amount = buf.readLong(); return Optional.of(new NuclearTileData() { @@ -158,7 +163,7 @@ public double getMeanEuGeneration() { } @Override - public TransferVariant getVariant() { + public Resource getVariant() { return variant; } diff --git a/src/main/java/aztech/modern_industrialization/pipes/MIPipes.java b/src/main/java/aztech/modern_industrialization/pipes/MIPipes.java index 419e378b5..13a877ff7 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/MIPipes.java +++ b/src/main/java/aztech/modern_industrialization/pipes/MIPipes.java @@ -31,7 +31,6 @@ import aztech.modern_industrialization.MITags; import aztech.modern_industrialization.api.energy.CableTier; import aztech.modern_industrialization.config.MIStartupConfig; -import aztech.modern_industrialization.datagen.model.DelegatingModelBuilder; import aztech.modern_industrialization.datagen.tag.TagsToGenerate; import aztech.modern_industrialization.items.SortOrder; import aztech.modern_industrialization.pipes.api.*; @@ -47,25 +46,26 @@ import aztech.modern_industrialization.pipes.item.ItemNetworkData; import aztech.modern_industrialization.pipes.item.ItemNetworkNode; import aztech.modern_industrialization.pipes.item.ItemPipeScreenHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; + import java.util.*; import java.util.function.BiConsumer; import java.util.function.Supplier; -import net.minecraft.core.registries.BuiltInRegistries; + +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; -import net.neoforged.neoforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class MIPipes { public static final MIPipes INSTANCE = new MIPipes(); - public static final Supplier BLOCK_PIPE = MIBlock.BLOCKS.register("pipe", - () -> new PipeBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).destroyTime(2.0f))); + public static final Supplier BLOCK_PIPE = MIBlock.BLOCKS.registerBlock("pipe", + p -> new PipeBlock(p.mapColor(MapColor.METAL).destroyTime(2.0f))); public static Supplier> BLOCK_ENTITY_TYPE_PIPE; public static volatile boolean transparentCamouflage = false; private final Map> pipeItems = new HashMap<>(); @@ -81,7 +81,7 @@ public class MIPipes { public void setup() { BLOCK_ENTITY_TYPE_PIPE = MIRegistries.BLOCK_ENTITIES.register("pipe", - () -> BlockEntityType.Builder.of(PipeBlockEntity::new, BLOCK_PIPE.get()).build(null)); + () -> new BlockEntityType<>(PipeBlockEntity::new, BLOCK_PIPE.get())); for (PipeColor color : PipeColor.values()) { registerFluidPipeType(color); @@ -101,22 +101,23 @@ public void setup() { } } - public static final BiConsumer ITEM_MODEL_GENERATOR = (item, modelGenerator) -> { - // Delegate to block model - modelGenerator.getBuilder(BuiltInRegistries.ITEM.getKey(item).getPath()) - .customLoader(DelegatingModelBuilder::new) - .delegate(modelGenerator.getExistingFile(MI.id("block/pipe"))) - .end(); + public static final BiConsumer ITEM_MODEL_GENERATOR = (item, modelGenerator) -> { + try { + // TODO: temporary reflection hack + modelGenerator.itemModelOutput.accept(item, (ItemModel.Unbaked) Class.forName("aztech.modern_industrialization.client.pipes.impl.PipeItemModel$Unbaked").getConstructor().newInstance()); + } catch (ReflectiveOperationException exception) { + throw new RuntimeException(exception); + } }; private void registerFluidPipeType(PipeColor color) { String pipeId = color.prefix + "fluid_pipe"; PipeNetworkType type = PipeNetworkType.register(MI.id(pipeId), (id, data) -> new FluidNetwork(id, data, FluidType.BUCKET_VOLUME), - FluidNetworkNode::new, color.color, true); + FluidNetworkData.CODEC, FluidNetworkNode::new, color.color, true); var itemDef = MIItem.item( color.englishNamePrefix + "Fluid Pipe", pipeId, - prop -> new PipeItem(prop, type, new FluidNetworkData(FluidVariant.blank())), + prop -> new PipeItem(prop, type, new FluidNetworkData(FluidResource.EMPTY)), ITEM_MODEL_GENERATOR, SortOrder.PIPES.and(color)); register(type, itemDef::asItem); @@ -125,7 +126,7 @@ private void registerFluidPipeType(PipeColor color) { private void registerItemPipeType(PipeColor color) { String pipeId = color.prefix + "item_pipe"; - PipeNetworkType type = PipeNetworkType.register(MI.id(pipeId), ItemNetwork::new, ItemNetworkNode::new, color.color, true); + PipeNetworkType type = PipeNetworkType.register(MI.id(pipeId), ItemNetwork::new, ItemNetworkData.CODEC, ItemNetworkNode::new, color.color, true); var itemDef = MIItem.item( color.englishNamePrefix + "Item Pipe", pipeId, @@ -139,7 +140,7 @@ private void registerItemPipeType(PipeColor color) { public void registerCableType(String englishName, String name, int color, CableTier tier) { String cableId = name + "_cable"; PipeNetworkType type = PipeNetworkType.register(MI.id(cableId), (id, data) -> new ElectricityNetwork(id, data, tier), - ElectricityNetworkNode::new, color, false); + ElectricityNetworkData.CODEC, ElectricityNetworkNode::new, color, false); var itemDef = MIItem.item( englishName, cableId, diff --git a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetwork.java b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetwork.java index d349835ca..3a67529c5 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetwork.java +++ b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetwork.java @@ -50,17 +50,6 @@ public PipeNetwork(int id, PipeNetworkData data) { this.data = data; } - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { - id = tag.getInt("id"); - data.fromTag(tag.getCompound("data"), registries); - } - - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - tag.putInt("id", id); - tag.put("data", data.toTag(new CompoundTag(), registries)); - return tag; - } - /** * Only access nodes that are ticking, for example with {@link #iterateTickingNodes}! */ @@ -93,13 +82,13 @@ public PipeNetworkNode getNode(BlockPos pos) { public void setNode(BlockPos pos, @Nullable PipeNetworkNode node) { this.nodes.put(pos.immutable(), node); - this.nodesByChunk.computeIfAbsent(ChunkPos.asLong(pos), p -> new HashMap<>()).put(pos.immutable(), node); + this.nodesByChunk.computeIfAbsent(ChunkPos.pack(pos), p -> new HashMap<>()).put(pos.immutable(), node); } public void removeNode(BlockPos pos) { this.nodes.remove(pos); - long chunk = ChunkPos.asLong(pos); + long chunk = ChunkPos.pack(pos); Map map = nodesByChunk.get(chunk); map.remove(pos); if (map.size() == 0) { diff --git a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkData.java b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkData.java index 6a64c75a4..bd8120c40 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkData.java +++ b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkData.java @@ -27,10 +27,6 @@ import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -public abstract class PipeNetworkData { - public abstract PipeNetworkData clone(); - - public abstract void fromTag(CompoundTag tag, HolderLookup.Provider registries); - - public abstract CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries); +public interface PipeNetworkData { + PipeNetworkData clone(); } diff --git a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkManager.java b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkManager.java index 4a01233b8..8ee65d7fb 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkManager.java +++ b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkManager.java @@ -28,7 +28,12 @@ import aztech.modern_industrialization.util.NbtHelper; import aztech.modern_industrialization.util.WorldHelper; import com.google.common.base.Preconditions; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.longs.*; + +import java.io.Serial; import java.util.*; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -37,13 +42,16 @@ import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.chunk.status.ChunkStatus; +import net.neoforged.fml.loading.FMLConfig; import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLLoader; import org.jspecify.annotations.Nullable; public class PipeNetworkManager { - private static final boolean DEBUG_CHECKS = !FMLEnvironment.production; + private static final boolean DEBUG_CHECKS = !FMLLoader.getCurrent().isProduction(); private final Map networkByBlock = new HashMap<>(); private final Map> links = new HashMap<>(); @@ -59,6 +67,54 @@ public PipeNetworkManager(PipeNetworkType type) { this.type = type; } + public static Codec codec(PipeNetworkType type) { + return SerializedManager.codec(type.dataCodec()) + .xmap(serialized -> new PipeNetworkManager(type, serialized), PipeNetworkManager::serialize); + } + + private PipeNetworkManager(PipeNetworkType type, SerializedManager serialized) { + this(type); + + // networks + for (var serializedNetwork : serialized.networks()) { + PipeNetwork network = type.getNetworkCtor().apply(serializedNetwork.id(), serializedNetwork.data()); + network.manager = this; + networks.add(network); + } + + // networkByBlock and links + Map networkIds = new HashMap<>(); + for (PipeNetwork network : networks) { + networkIds.put(network.id, network); + } + for (var serializedNode : serialized.nodes()) { + PipeNetwork network = networkIds.get(serializedNode.networkId()); + var pos = serializedNode.pos().immutable(); + networkByBlock.put(pos, network); + network.setNode(pos, null); + links.put(pos, new HashSet<>(serializedNode.directions())); + } + + // nextNetworkId + nextNetworkId = serialized.nextNetworkId; + } + + private SerializedManager serialize() { + // networks + var serializedNetworks = new ArrayList(); + for (PipeNetwork network : networks) { + serializedNetworks.add(new SerializedNetwork(network.id, network.data)); + } + + // networkByBlock and links + var serializedNodes = new ArrayList(); + for (Map.Entry entry : networkByBlock.entrySet()) { + serializedNodes.add(new SerializedNode(entry.getKey(), entry.getValue().id, links.get(entry.getKey()))); + } + + return new SerializedManager(serializedNetworks, serializedNodes, nextNetworkId); + } + /** * Tick networks */ @@ -77,7 +133,7 @@ public void tickNetworks(ServerLevel world) { int chunkZ = ChunkPos.getZ(chunkPos); var chunk = world.getChunk(chunkX, chunkZ, ChunkStatus.FULL, false); if (chunk != null) { - chunk.setUnsaved(true); + chunk.markUnsaved(); } else { // This is not supposed to happen. var sb = new StringBuilder(); @@ -332,11 +388,11 @@ private PipeNetwork createNetwork(PipeNetworkData data) { } private void incrementSpanned(BlockPos pos) { - spannedChunks.computeIfAbsent(ChunkPos.asLong(pos), p -> new HashSet<>()).add(pos.immutable()); + spannedChunks.computeIfAbsent(ChunkPos.pack(pos), p -> new HashSet<>()).add(pos.immutable()); } private void decrementSpanned(BlockPos pos) { - long chunkPos = ChunkPos.asLong(pos); + long chunkPos = ChunkPos.pack(pos); Set set = spannedChunks.get(chunkPos); set.remove(pos); if (set.size() == 0) { @@ -344,64 +400,6 @@ private void decrementSpanned(BlockPos pos) { } } - public void fromNbt(CompoundTag tag, HolderLookup.Provider registries) { - // networks - ListTag networksTag = tag.getList("networks", new CompoundTag().getId()); - for (Tag networkTag : networksTag) { - PipeNetwork network = type.getNetworkCtor().apply(-1, null); - network.manager = this; - network.fromTag((CompoundTag) networkTag, registries); - networks.add(network); - } - - // networkByBlock and links - Map networkIds = new HashMap<>(); - for (PipeNetwork network : networks) { - networkIds.put(network.id, network); - } - int[] data = tag.getIntArray("networkByBlock"); - for (int i = 0; i < data.length / 5; i++) { - PipeNetwork network = networkIds.get(data[5 * i + 3]); - BlockPos pos = new BlockPos(data[5 * i], data[5 * i + 1], data[5 * i + 2]); - networkByBlock.put(pos, network); - network.setNode(pos, null); - links.put(pos, new HashSet<>(Arrays.asList(NbtHelper.decodeDirections((byte) data[5 * i + 4])))); - } - - // nextNetworkId - nextNetworkId = tag.getInt("nextNetworkId"); - checkStateCoherence(); - } - - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - // networks - List networksTags = new ArrayList<>(); - for (PipeNetwork network : networks) { - networksTags.add(network.toTag(new CompoundTag(), registries)); - } - ListTag networksTag = new ListTag(); - networksTag.addAll(networksTags); - tag.put("networks", networksTag); - - // networkByBlock and links, every entry is identified by five consecutive - // integers: x, y, z, network id, encoded links - int[] networkByBlockData = new int[networkByBlock.size() * 5]; - int i = 0; - for (Map.Entry entry : networkByBlock.entrySet()) { - networkByBlockData[i++] = entry.getKey().getX(); - networkByBlockData[i++] = entry.getKey().getY(); - networkByBlockData[i++] = entry.getKey().getZ(); - networkByBlockData[i++] = entry.getValue().id; - networkByBlockData[i++] = NbtHelper.encodeDirections(links.get(entry.getKey())); - } - tag.putIntArray("networkByBlock", networkByBlockData); - - // nextNetworkId - tag.putInt("nextNetworkId", nextNetworkId); - checkStateCoherence(); - return tag; - } - public PipeNetworkType getType() { return type; } @@ -439,4 +437,35 @@ private void customAssert(boolean predicate) { if (!predicate) throw new NullPointerException("Predicate was false"); } + + private record SerializedNetwork(int id, PipeNetworkData data) { + private static Codec codec(MapCodec dataCodec) { + return RecordCodecBuilder.create(i -> i.group( + Codec.INT.fieldOf("id").forGetter(SerializedNetwork::id), + dataCodec.forGetter(SerializedNetwork::data) + ).apply(i, SerializedNetwork::new)); + } + } + + private record SerializedNode(BlockPos pos, int networkId, Set directions) { + private static Codec CODEC = RecordCodecBuilder.create(i -> i.group( + BlockPos.CODEC.fieldOf("pos").forGetter(SerializedNode::pos), + Codec.INT.fieldOf("networkId").forGetter(SerializedNode::networkId), + Direction.CODEC.listOf(0, Direction.values().length).xmap(Set::copyOf, List::copyOf) + .fieldOf("directions").forGetter(SerializedNode::directions) + ).apply(i, SerializedNode::new)); + } + + private record SerializedManager( + List networks, + List nodes, + int nextNetworkId) { + private static Codec codec(MapCodec dataCodec) { + return RecordCodecBuilder.create(i -> i.group( + SerializedNetwork.codec(dataCodec).listOf().fieldOf("networks").forGetter(SerializedManager::networks), + SerializedNode.CODEC.listOf().fieldOf("nodes").forGetter(SerializedManager::nodes), + Codec.INT.fieldOf("nextNetworkId").forGetter(SerializedManager::nextNetworkId) + ).apply(i, SerializedManager::new)); + } + } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkNode.java b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkNode.java index e85cae6db..b8081948d 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkNode.java +++ b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkNode.java @@ -35,6 +35,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import org.jspecify.annotations.Nullable; public abstract class PipeNetworkNode { @@ -63,9 +65,9 @@ public PipeMenuProvider getConnectionGui(Direction direction, PipeScreenHandlerH return null; } - public abstract CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries); + public abstract void save(ValueOutput output); - public abstract void fromTag(CompoundTag tag, HolderLookup.Provider registries); + public abstract void read(ValueInput input); public final PipeNetworkType getType() { return network.manager.getType(); diff --git a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkType.java b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkType.java index c8a2906a1..a7324fba9 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkType.java +++ b/src/main/java/aztech/modern_industrialization/pipes/api/PipeNetworkType.java @@ -28,15 +28,28 @@ import java.util.Map; import java.util.function.BiFunction; import java.util.function.Supplier; -import net.minecraft.resources.ResourceLocation; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; +import com.mojang.serialization.MapCodec; +import net.minecraft.resources.Identifier; import org.jspecify.annotations.Nullable; /** * A pipe network type. */ public final class PipeNetworkType implements Comparable { - private final ResourceLocation identifier; + public static final Codec CODEC = Identifier.CODEC.comapFlatMap(id -> { + var type = get(id); + if (type == null) { + return DataResult.error(() -> "Unknown pipe network type: " + id); + } + return DataResult.success(type); + }, type -> type.identifier); + + private final Identifier identifier; private final BiFunction networkCtor; + private final MapCodec dataCodec; private final Supplier nodeCtor; /** * A "serial number" allowing type comparison for rendering. @@ -46,27 +59,38 @@ public final class PipeNetworkType implements Comparable { private final boolean opensGui; public Object renderer; - private static final Map types = new HashMap<>(); + private static final Map types = new HashMap<>(); private static int nextSerialNumber = 0; - private PipeNetworkType(ResourceLocation identifier, BiFunction networkCtor, - Supplier nodeCtor, int color, boolean opensGui, int serialNumber) { + private PipeNetworkType( + Identifier identifier, + BiFunction networkCtor, + MapCodec dataCodec, + Supplier nodeCtor, + int color, + boolean opensGui, + int serialNumber) { this.identifier = identifier; this.networkCtor = networkCtor; + this.dataCodec = dataCodec; this.nodeCtor = nodeCtor; this.color = color; this.opensGui = opensGui; this.serialNumber = serialNumber; } - public ResourceLocation getIdentifier() { + public Identifier getIdentifier() { return identifier; } - BiFunction getNetworkCtor() { + BiFunction getNetworkCtor() { return networkCtor; } + public MapCodec dataCodec() { + return dataCodec; + } + public Supplier getNodeCtor() { return nodeCtor; } @@ -80,18 +104,23 @@ public boolean opensGui() { } @Nullable - public static PipeNetworkType get(ResourceLocation identifier) { + public static PipeNetworkType get(Identifier identifier) { return types.get(identifier); } - public static Map getTypes() { + public static Map getTypes() { return new HashMap<>(types); } - public static PipeNetworkType register(ResourceLocation identifier, BiFunction networkCtor, - Supplier nodeCtor, int color, boolean opensGui) { + public static PipeNetworkType register( + Identifier identifier, + BiFunction networkCtor, + MapCodec dataCodec, + Supplier nodeCtor, + int color, + boolean opensGui) { color |= 0xff000000; - PipeNetworkType type = new PipeNetworkType(identifier, networkCtor, nodeCtor, color, opensGui, nextSerialNumber++); + PipeNetworkType type = new PipeNetworkType(identifier, (BiFunction) networkCtor, (MapCodec) dataCodec, nodeCtor, color, opensGui, nextSerialNumber++); PipeNetworkType previousType = types.put(identifier, type); if (previousType != null) { throw new IllegalArgumentException("Attempting to register another PipeNetworkType with the same identifier."); diff --git a/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetwork.java b/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetwork.java index 815d32015..9241a721d 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetwork.java +++ b/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetwork.java @@ -30,7 +30,11 @@ import aztech.modern_industrialization.pipes.api.PipeNetwork; import aztech.modern_industrialization.pipes.api.PipeNetworkData; import java.util.*; + +import com.google.common.primitives.Ints; import net.minecraft.server.level.ServerLevel; +import net.neoforged.neoforge.transfer.transaction.Transaction; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import org.jspecify.annotations.Nullable; public class ElectricityNetwork extends PipeNetwork { @@ -39,8 +43,8 @@ public class ElectricityNetwork extends PipeNetwork { final CableTier tier; final PipeStatsCollector stats = new PipeStatsCollector(); - public ElectricityNetwork(int id, @Nullable PipeNetworkData data, CableTier tier) { - super(id, data == null ? new ElectricityNetworkData() : data); + public ElectricityNetwork(int id, ElectricityNetworkData data, CableTier tier) { + super(id, data); this.tier = tier; } @@ -62,15 +66,18 @@ public void tick(ServerLevel world) { // Do the transfer long networkCapacity = loadedNodeCount * tier.getMaxTransfer(); - long extractMaxAmount = Math.min(tier.getMaxTransfer(), networkCapacity - networkAmount); - long extracted = transferForTargets(MIEnergyStorage::extract, storages, extractMaxAmount); - networkAmount += extracted; + try (var tx = Transaction.openRoot()) { + long extractMaxAmount = Math.min(tier.getMaxTransfer(), networkCapacity - networkAmount); + long extracted = transferForTargets(MIEnergyStorage::extract, storages, extractMaxAmount, tx); + networkAmount += extracted; - long insertMaxAmount = Math.min(tier.getMaxTransfer(), networkAmount); - long inserted = transferForTargets(MIEnergyStorage::receive, storages, insertMaxAmount); - networkAmount -= inserted; + long insertMaxAmount = Math.min(tier.getMaxTransfer(), networkAmount); + long inserted = transferForTargets(MIEnergyStorage::insert, storages, insertMaxAmount, tx); + networkAmount -= inserted; - stats.addValue(Math.max(extracted, inserted)); + tx.commit(); + stats.addValue(Math.max(extracted, inserted)); + } // Split energy evenly across the nodes for (var entry : iterateTickingNodes()) { @@ -88,7 +95,7 @@ public void tick(ServerLevel world) { * Perform a transfer operation across a list of targets. Will not mutate the * list. Does not check for the network's max transfer rate specifically. */ - private static long transferForTargets(TransferOperation operation, List targets, long maxAmount) { + private static long transferForTargets(TransferOperation operation, List targets, long maxAmount, TransactionContext transaction) { // Build target list List sortableTargets = new ArrayList<>(targets.size()); for (var target : targets) { @@ -98,7 +105,9 @@ private static long transferForTargets(TransferOperation operation, List t.simulationResult)); @@ -110,19 +119,19 @@ private static long transferForTargets(TransferOperation operation, List CODEC = MapCodec.unit(INSTANCE); @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - return tag; - } - - @Override - public boolean equals(Object obj) { - return obj instanceof ElectricityNetworkData; + public ElectricityNetworkData clone() { + return new ElectricityNetworkData(); } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetworkNode.java b/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetworkNode.java index a6eb8810b..6dcf1686d 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetworkNode.java +++ b/src/main/java/aztech/modern_industrialization/pipes/electricity/ElectricityNetworkNode.java @@ -36,11 +36,11 @@ import java.util.List; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.capabilities.BlockCapabilityCache; import org.jspecify.annotations.Nullable; @@ -128,22 +128,21 @@ public void addConnection(PipeBlockEntity pipe, Player player, Level world, Bloc } @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - tag.putByte("connections", NbtHelper.encodeDirections(connections)); - tag.putLong("eu", eu); - return tag; + public void save(ValueOutput output) { + output.putByte("connections", NbtHelper.encodeDirections(connections)); + output.putLong("eu", eu); } @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { - connections = new ArrayList<>(Arrays.asList(NbtHelper.decodeDirections(tag.getByte("connections")))); + public void read(ValueInput input) { + connections = new ArrayList<>(Arrays.asList(NbtHelper.decodeDirections(input.getByteOr("connections", (byte) 0)))); caches.clear(); - eu = tag.getLong("eu"); + eu = input.getLongOr("eu", 0); } private boolean canConnect(Level world, BlockPos pos, Direction direction) { var storage = world.getCapability(EnergyApi.SIDED, pos.relative(direction), direction.getOpposite()); - return storage != null && (storage.canReceive() || storage.canExtract()) && storage.canConnect(((ElectricityNetwork) network).tier); + return storage != null && /*(storage.supportsInsertion() || storage.supportsExtraction()) &&*/ storage.canConnect(((ElectricityNetwork) network).tier); } // Used in the Waila plugin diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetwork.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetwork.java index 45a15a2d1..b32729472 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetwork.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetwork.java @@ -28,7 +28,6 @@ import aztech.modern_industrialization.pipes.api.PipeNetwork; import aztech.modern_industrialization.pipes.api.PipeNetworkData; import aztech.modern_industrialization.pipes.api.PipeNetworkNode; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import com.google.common.primitives.Ints; import com.mojang.logging.LogUtils; import java.util.ArrayList; @@ -36,7 +35,10 @@ import java.util.Comparator; import java.util.List; import net.minecraft.server.level.ServerLevel; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; import org.jspecify.annotations.Nullable; import org.slf4j.Logger; @@ -47,8 +49,8 @@ public class FluidNetwork extends PipeNetwork { final PipeStatsCollector stats = new PipeStatsCollector(); final PipeStatsCollector capacityStats = new PipeStatsCollector(); - public FluidNetwork(int id, @Nullable PipeNetworkData data, int nodeCapacity) { - super(id, data == null ? new FluidNetworkData(FluidVariant.blank()) : data); + public FluidNetwork(int id, FluidNetworkData data, int nodeCapacity) { + super(id, data); this.nodeCapacity = nodeCapacity; } @@ -68,16 +70,16 @@ public void tick(ServerLevel world) { loadedNodeCount++; } long networkCapacity = (long) loadedNodeCount * nodeCapacity; - FluidVariant fluid = ((FluidNetworkData) data).fluid; + FluidResource fluid = ((FluidNetworkData) data).fluid(); long extracted = 0, inserted = 0; - if (!fluid.isBlank()) { + if (!fluid.isEmpty()) { var it = extensions.iterator(); while (it.hasNext()) { var extension = it.next(); if (extension.tryClaimForNetwork(world, fluid)) { - networkAmount += extension.storage().getAmount(); + networkAmount += extension.getAmount(); networkCapacity += extension.getCapacity(); extension.clear(); } else { @@ -86,11 +88,15 @@ public void tick(ServerLevel world) { } // Extract from targets into the network - extracted = transferByPriority(TransferOperation.EXTRACT, targets, fluid, networkCapacity - networkAmount); - networkAmount += extracted; - // Insert into the targets from the network - inserted = transferByPriority(TransferOperation.INSERT, targets, fluid, networkAmount); - networkAmount -= inserted; + try (var tx = Transaction.openRoot()) { + extracted = transferByPriority(TransferOperation.EXTRACT, targets, fluid, networkCapacity - networkAmount, tx); + networkAmount += extracted; + // Insert into the targets from the network + inserted = transferByPriority(TransferOperation.INSERT, targets, fluid, networkAmount, tx); + networkAmount -= inserted; + + tx.commit(); + } // Rebalance fluid inside the extensions and nodes var sortedExtensions = new ArrayList<>(extensions); @@ -99,7 +105,7 @@ public void tick(ServerLevel world) { long removedCapacity = 0; for (var extension : sortedExtensions) { var capacity = extension.getCapacity(); - long toInsert = (long) Math.ceil((double) networkAmount * capacity / (networkCapacity - removedCapacity)); + int toInsert = Ints.saturatedCast((long) Math.ceil((double) networkAmount * capacity / (networkCapacity - removedCapacity))); extension.releaseFromNetwork(fluid, toInsert); networkAmount -= toInsert; removedCapacity += capacity; @@ -127,7 +133,7 @@ public void tick(ServerLevel world) { * * @return The amount that was successfully transferred. */ - private static long transferByPriority(TransferOperation operation, List targets, FluidVariant fluid, long maxAmount) { + private static long transferByPriority(TransferOperation operation, List targets, FluidResource fluid, long maxAmount, TransactionContext transaction) { // Sort by decreasing priority targets.sort(Comparator.comparingInt(target -> -target.priority)); // Transfer for each bucket @@ -135,7 +141,7 @@ private static long transferByPriority(TransferOperation operation, List bucket, FluidVariant fluid, long maxAmount) { + private static long transferForBucket(TransferOperation operation, List bucket, FluidResource fluid, long maxAmount, TransactionContext transaction) { // Shuffle the bucket for better average transfer when simulation returns the // same result every time Collections.shuffle(bucket); // Simulate the transfer for every target + int maxAmountInt = Ints.saturatedCast(maxAmount); for (FluidTarget target : bucket) { - target.simulationResult = operation.transfer(target.storage, fluid, maxAmount, true); + try (var nested = Transaction.open(transaction)) { + target.simulationResult = operation.transfer(target.storage, fluid, maxAmountInt, nested); + } } // Sort from low result to high result bucket.sort(Comparator.comparingLong(target -> target.simulationResult)); @@ -164,9 +173,9 @@ private static long transferForBucket(TransferOperation operation, List handler, FluidResource fluid, int maxAmount, TransactionContext transaction) { + return handler.insert(fluid, maxAmount, transaction); } }, EXTRACT { @Override - long internalTransfer(IFluidHandler handler, FluidVariant fluid, long maxAmount, boolean simulate) { - return handler.drain( - fluid.toStack(Ints.saturatedCast(maxAmount)), - simulate ? IFluidHandler.FluidAction.SIMULATE : IFluidHandler.FluidAction.EXECUTE).getAmount(); + int internalTransfer(ResourceHandler handler, FluidResource fluid, int maxAmount, TransactionContext transaction) { + return handler.extract(fluid, maxAmount, transaction); } }; - abstract long internalTransfer(IFluidHandler handler, FluidVariant fluid, long maxAmount, boolean simulate); + abstract int internalTransfer(ResourceHandler handler, FluidResource fluid, int maxAmount, TransactionContext transaction); - long transfer(IFluidHandler handler, FluidVariant fluid, long maxAmount, boolean simulate) { - long ret = internalTransfer(handler, fluid, maxAmount, simulate); + int transfer(ResourceHandler handler, FluidResource fluid, int maxAmount, TransactionContext transaction) { + int ret = internalTransfer(handler, fluid, maxAmount, transaction); if (ret < 0) { - LOGGER.error("Transfer operation {}({}, {}, {}) on fluid handler {} returned negative amount: {}", this, fluid, maxAmount, simulate, + LOGGER.error("Transfer operation {}({}, {}, {}) on fluid handler {} returned negative amount: {}", this, fluid, maxAmount, transaction, handler, ret); return 0; } if (ret > maxAmount) { LOGGER.error("Transfer operation {}({}, {}, {}) on fluid handler {} returned more than requested: {}", this, fluid, maxAmount, - simulate, handler, ret); + transaction, handler, ret); return maxAmount; } return ret; @@ -226,7 +231,7 @@ public PipeNetworkData merge(PipeNetwork other) { } private boolean isEmpty(boolean onlyFluid) { - if (((FluidNetworkData) data).fluid.isBlank()) + if (((FluidNetworkData) data).fluid().isEmpty()) return true; if (onlyFluid) return false; @@ -241,9 +246,9 @@ private boolean isEmpty(boolean onlyFluid) { /** * Set this network's fluid if this network has an empty fluid. */ - protected void setFluid(FluidVariant fluid) { - if (((FluidNetworkData) data).fluid.isBlank()) { - ((FluidNetworkData) data).fluid = fluid; + protected void setFluid(FluidResource fluid) { + if (((FluidNetworkData) data).fluid().isEmpty()) { + data = new FluidNetworkData(fluid); } } @@ -261,6 +266,6 @@ protected void clearFluid() { for (PipeNetworkNode node : getRawNodeMap().values()) { ((FluidNetworkNode) node).amount = 0; } - ((FluidNetworkData) data).fluid = FluidVariant.blank(); + data = new FluidNetworkData(FluidResource.EMPTY); } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkData.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkData.java index bb6c353ad..97f5dabd3 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkData.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkData.java @@ -25,41 +25,20 @@ package aztech.modern_industrialization.pipes.fluid; import aztech.modern_industrialization.pipes.api.PipeNetworkData; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.util.NbtHelper; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; +import net.neoforged.neoforge.transfer.fluid.FluidResource; -public class FluidNetworkData extends PipeNetworkData { - FluidVariant fluid; - - public FluidNetworkData(FluidVariant fluid) { - this.fluid = fluid; - } +public record FluidNetworkData(FluidResource fluid) implements PipeNetworkData { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(i -> i.group( + FluidResource.OPTIONAL_CODEC.fieldOf("fluid").forGetter(FluidNetworkData::fluid) + ).apply(i, FluidNetworkData::new)); @Override public FluidNetworkData clone() { return new FluidNetworkData(fluid); } - - @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { - fluid = NbtHelper.getFluidCompatible(tag, "fluid", registries); - } - - @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - NbtHelper.putFluid(tag, "fluid", fluid, registries); - return tag; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof FluidNetworkData) { - FluidNetworkData otherData = (FluidNetworkData) obj; - return otherData.fluid == fluid; - } else { - return false; - } - } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkExtensionTank.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkExtensionTank.java index 2eda3c282..b8051a2b0 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkExtensionTank.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkExtensionTank.java @@ -24,32 +24,40 @@ package aztech.modern_industrialization.pipes.fluid; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge.SlotFluidHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; +import net.neoforged.neoforge.transfer.DelegatingResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; import net.minecraft.world.level.Level; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; /** * Act as a pipe network extension when connected to a fluid pipe in I/O mode. */ -public class FluidNetworkExtensionTank extends SlotFluidHandler { +public class FluidNetworkExtensionTank extends DelegatingResourceHandler { private static final int NOT_CLAIMED = -1; private int lastClaimTick = NOT_CLAIMED; - public FluidNetworkExtensionTank(SingleSlotStorage storage) { - super(storage); + public FluidNetworkExtensionTank(ResourceHandler handler) { + if (handler.size() != 1) { + throw new IllegalArgumentException("Can only have a handler of size 1, received: " + handler.size()); + } + if (handler.getCapacityAsLong(0, FluidResource.EMPTY) > Integer.MAX_VALUE) { + throw new IllegalArgumentException("Can only have a handler with int capacity"); + } + super(handler); } - public boolean tryClaimForNetwork(Level level, FluidVariant networkFluid) { - if (storage.getAmount() != 0 && !storage.getResource().equals(networkFluid)) { + public boolean tryClaimForNetwork(Level level, FluidResource networkFluid) { + var handler = delegate.get(); + if (handler.getAmountAsLong(0) != 0 && !handler.getResource(0).equals(networkFluid)) { return false; } try (var tx = Transaction.openRoot()) { - storage.extract(networkFluid, storage.getAmount(), tx); - long inserted = storage.insert(networkFluid, storage.getCapacity(), tx); - if (inserted != storage.getCapacity()) { + handler.extract(networkFluid, handler.getAmountAsInt(0), tx); + long inserted = handler.insert(networkFluid, handler.getCapacityAsInt(0, FluidResource.EMPTY), tx); + if (inserted != handler.getCapacityAsInt(0, FluidResource.EMPTY)) { // Tank locked to a different fluid return false; } @@ -65,30 +73,32 @@ public boolean tryClaimForNetwork(Level level, FluidVariant networkFluid) { } public void clear() { - if (storage.getAmount() == 0) { + var handler = delegate.get(); + if (handler.getAmountAsLong(0) == 0) { return; } try (var tx = Transaction.openRoot()) { - storage.extract(storage.getResource(), storage.getAmount(), tx); + handler.extract(handler.getResource(0), handler.getAmountAsInt(0), tx); tx.commit(); } - if (storage.getAmount() > 0) { + if (handler.getAmountAsInt(0) > 0) { throw new IllegalStateException("Internal MI error: extension %s should be empty after clearing it.".formatted(this)); } } - public void releaseFromNetwork(FluidVariant fluid, long amount) { - if (storage.getAmount() > 0) { + public void releaseFromNetwork(FluidResource fluid, int amount) { + var handler = delegate.get(); + if (handler.getAmountAsLong(0) > 0) { throw new IllegalStateException("Internal MI error: extension %s should be empty when being released.".formatted(this)); } lastClaimTick = NOT_CLAIMED; - if (fluid.isBlank()) { - if (storage.getAmount() != 0) { + if (fluid.isEmpty()) { + if (handler.getAmountAsLong(0) != 0) { throw new IllegalStateException("Internal MI error: releasing extension %s from network with non-empty tank.".formatted(this)); } } try (var tx = Transaction.openRoot()) { - long inserted = storage.insert(fluid, amount, tx); + long inserted = handler.insert(fluid, amount, tx); tx.commit(); if (inserted != amount) { throw new IllegalStateException( @@ -97,17 +107,52 @@ public void releaseFromNetwork(FluidVariant fluid, long amount) { } } + public long getAmount() { + return getAmountAsLong(0); + } + public long getCapacity() { - return storage.getCapacity(); + return getCapacityAsLong(0, FluidResource.EMPTY); + } + + @Override + public int insert(FluidResource resource, int amount, TransactionContext transaction) { + if (disallowIo()) { + return 0; + } + return super.insert(resource, amount, transaction); } @Override + public int insert(int index, FluidResource resource, int amount, TransactionContext transaction) { + if (disallowIo()) { + return 0; + } + return super.insert(index, resource, amount, transaction); + } + + @Override + public int extract(FluidResource resource, int amount, TransactionContext transaction) { + if (disallowIo()) { + return 0; + } + return super.extract(resource, amount, transaction); + } + + @Override + public int extract(int index, FluidResource resource, int amount, TransactionContext transaction) { + if (disallowIo()) { + return 0; + } + return super.extract(index, resource, amount, transaction); + } + protected boolean disallowIo() { return lastClaimTick != NOT_CLAIMED; } @Override public String toString() { - return "FluidNetworkExtensionTank{" + storage + '}'; + return "FluidNetworkExtensionTank{" + delegate.get() + '}'; } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkNode.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkNode.java index cfc179df5..fadc7e859 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkNode.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidNetworkNode.java @@ -34,7 +34,7 @@ import aztech.modern_industrialization.pipes.gui.PipeScreenHandlerHelper; import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; import aztech.modern_industrialization.pipes.impl.PipeNetworks; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; +import aztech.modern_industrialization.transfer.IOResourceHandler; import aztech.modern_industrialization.util.IOFluidHandler; import aztech.modern_industrialization.util.NbtHelper; import java.util.*; @@ -45,22 +45,26 @@ import net.minecraft.nbt.Tag; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.capabilities.BlockCapabilityCache; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; -import net.neoforged.neoforge.fluids.capability.templates.EmptyFluidHandler; +import net.neoforged.neoforge.transfer.EmptyResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jspecify.annotations.Nullable; public class FluidNetworkNode extends PipeNetworkNode { long amount = 0; private final List connections = new ArrayList<>(); - private FluidVariant cachedFluid = FluidVariant.blank(); + private FluidResource cachedFluid = FluidResource.EMPTY; /** * Add all valid targets to the target list, and pick the fluid for the network @@ -74,32 +78,35 @@ void gatherTargetsAndPickFluid(ServerLevel world, BlockPos pos, List nodeCapacity, deleting some fluid!"); amount = network.nodeCapacity; } - if (amount > 0 && data.fluid.isBlank()) { - MI.LOGGER.warn("Amount > 0 but fluid is blank, deleting some fluid!"); + if (amount > 0 && data.fluid().isEmpty()) { + MI.LOGGER.warn("Amount > 0 but fluid is empty, deleting some fluid!"); amount = 0; } for (FluidConnection connection : connections) { var storage = getNeighborStorage(world, pos, connection); - if (data.fluid.isBlank() && connection.canExtract()) { + if (data.fluid().isEmpty() && connection.canExtract()) { // Try to set fluid, will return null if none could be found. - data.fluid = FluidVariant.of(storage.drain(Integer.MAX_VALUE, IFluidHandler.FluidAction.SIMULATE)); + var extractableResource = ResourceHandlerUtil.findExtractableResource(storage, fr -> true, null); + if (extractableResource != null) { + network.data = data = new FluidNetworkData(extractableResource); + } } if (connection.canInsert() && connection.canExtract() && storage instanceof FluidNetworkExtensionTank extension) { extensions.add(extension); } else { - targets.add(new FluidTarget(connection.priority, new IOFluidHandler(storage, connection.canInsert(), connection.canExtract()))); + targets.add(new FluidTarget(connection.priority, new IOResourceHandler<>(storage, connection.canInsert(), connection.canExtract()))); } } } - private IFluidHandler getNeighborStorage(ServerLevel world, BlockPos pos, FluidConnection connection) { + private ResourceHandler getNeighborStorage(ServerLevel world, BlockPos pos, FluidConnection connection) { if (connection.cache == null) { - connection.cache = BlockCapabilityCache.create(Capabilities.FluidHandler.BLOCK, world, pos.relative(connection.direction), + connection.cache = BlockCapabilityCache.create(Capabilities.Fluid.BLOCK, world, pos.relative(connection.direction), connection.direction.getOpposite()); } var storage = connection.cache.getCapability(); - return Objects.requireNonNullElse(storage, EmptyFluidHandler.INSTANCE); + return Objects.requireNonNullElse(storage, EmptyResourceHandler.instance()); } @Override @@ -130,7 +137,9 @@ public void updateConnections(Level world, BlockPos pos) { } private boolean canConnect(Level world, BlockPos pos, Direction direction) { - return world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite()) != null; + // TODO 26.1 +// return world.getCapability(Capabilities.FluidHandler.BLOCK, pos.relative(direction), direction.getOpposite()) != null; + return false; } @Override @@ -165,30 +174,25 @@ public void addConnection(PipeBlockEntity pipe, Player player, Level world, Bloc } @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - tag.putLong("amount_ftl", amount); + public void save(ValueOutput output) { + output.putLong("amount", amount); for (FluidConnection connection : connections) { CompoundTag connectionTag = new CompoundTag(); connectionTag.putByte("connections", (byte) encodeConnectionType(connection.type)); connectionTag.putInt("priority", connection.priority); - tag.put(connection.direction.toString(), connectionTag); + output.store(connection.direction.toString(), CompoundTag.CODEC, connectionTag); } - return tag; } @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { - amount = tag.getLong("amount_ftl"); + public void read(ValueInput input) { + amount = input.getLongOr("amount", 0); + var keys = input.keySet(); for (Direction direction : Direction.values()) { - if (tag.contains(direction.toString())) { - if (tag.getTagType(direction.toString()) == Tag.TAG_BYTE) { - // Old format (before fluid pipe priorities) - connections.add(new FluidConnection(direction, decodeConnectionType(tag.getByte(direction.toString())), 0)); - } else { - CompoundTag connectionTag = tag.getCompound(direction.toString()); - connections.add(new FluidConnection(direction, decodeConnectionType(connectionTag.getByte("connections")), - connectionTag.getInt("priority"))); - } + if (keys.contains(direction.toString())) { + CompoundTag connectionTag = input.read(direction.toString(), CompoundTag.CODEC).orElseThrow(); + connections.add(new FluidConnection(direction, decodeConnectionType(connectionTag.getByteOr("connections", (byte) 0)), + connectionTag.getIntOr("priority", 0))); } } } @@ -215,7 +219,7 @@ private class FluidConnection { private final Direction direction; private PipeEndpointType type; private int priority; - private @Nullable BlockCapabilityCache cache; + private @Nullable BlockCapabilityCache, @Nullable Direction> cache; private FluidConnection(Direction direction, PipeEndpointType type, int priority) { this.direction = direction; @@ -233,25 +237,25 @@ private boolean canExtract() { private class ScreenHandlerFactory implements PipeMenuProvider { private final FluidPipeInterface iface; - private final ResourceLocation pipeType; + private final Identifier pipeType; - private ScreenHandlerFactory(PipeScreenHandlerHelper helper, ResourceLocation pipeType) { + private ScreenHandlerFactory(PipeScreenHandlerHelper helper, Identifier pipeType) { this.iface = new FluidPipeInterface() { @Override - public FluidVariant getNetworkFluid() { + public FluidResource getNetworkFluid() { if (network != null) { return getFluid(); } else { - return FluidVariant.blank(); + return FluidResource.EMPTY; } } @Override - public void setNetworkFluid(FluidVariant fluid) { + public void setNetworkFluid(FluidResource fluid) { FluidNetwork network = (FluidNetwork) FluidNetworkNode.this.network; if (network != null && !getNetworkFluid().equals(fluid)) { network.clearFluid(); - if (!fluid.isBlank()) { + if (!fluid.isEmpty()) { network.setFluid(fluid); } helper.callMarkDirty(); @@ -316,12 +320,12 @@ public void writeAdditionalData(RegistryFriendlyByteBuf buf) { @Override public CompoundTag writeCustomData(HolderLookup.Provider registries) { CompoundTag tag = new CompoundTag(); - NbtHelper.putFluid(tag, "fluid", ((FluidNetworkData) network.data).fluid, registries); + tag.store("fluid", FluidResource.OPTIONAL_CODEC, ((FluidNetworkData) network.data).fluid()); return tag; } public void afterTick(ServerLevel world, BlockPos pos) { - FluidVariant networkFluid = ((FluidNetworkData) network.data).fluid; + FluidResource networkFluid = ((FluidNetworkData) network.data).fluid(); if (!networkFluid.equals(cachedFluid)) { cachedFluid = networkFluid; // Equivalent to calling sync() @@ -334,8 +338,8 @@ public long getAmount() { } // Used in the Waila plugin - private FluidVariant getFluid() { - return ((FluidNetworkData) network.data).fluid; + private FluidResource getFluid() { + return ((FluidNetworkData) network.data).fluid(); } public InGameInfo collectNetworkInfo() { @@ -349,5 +353,5 @@ public InGameInfo collectNetworkInfo() { return new InGameInfo(getFluid(), stored, capacity, fluidNetwork.stats.getValue(), fluidNetwork.capacityStats.getValue()); } - public record InGameInfo(FluidVariant fluid, long stored, long capacity, long transfer, long maxTransfer) {} + public record InGameInfo(FluidResource fluid, long stored, long capacity, long transfer, long maxTransfer) {} } diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeInterface.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeInterface.java index f42c9845d..02881dc62 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeInterface.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeInterface.java @@ -26,29 +26,29 @@ import aztech.modern_industrialization.pipes.gui.iface.ConnectionTypeInterface; import aztech.modern_industrialization.pipes.gui.iface.PriorityInterface; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.world.entity.player.Player; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public interface FluidPipeInterface extends ConnectionTypeInterface, PriorityInterface { - FluidVariant getNetworkFluid(); + FluidResource getNetworkFluid(); - void setNetworkFluid(FluidVariant fluid); + void setNetworkFluid(FluidResource fluid); boolean canUse(Player player); static FluidPipeInterface ofBuf(RegistryFriendlyByteBuf buf) { - FluidVariant[] networkFluid = new FluidVariant[] { FluidVariant.fromPacket(buf) }; + FluidResource[] networkFluid = new FluidResource[] { FluidResource.STREAM_CODEC.decode(buf) }; int[] type = new int[] { buf.readInt() }; int[] priority = new int[] { buf.readInt() }; return new FluidPipeInterface() { @Override - public FluidVariant getNetworkFluid() { + public FluidResource getNetworkFluid() { return networkFluid[0]; } @Override - public void setNetworkFluid(FluidVariant fluid) { + public void setNetworkFluid(FluidResource fluid) { networkFluid[0] = fluid; } @@ -80,7 +80,7 @@ public boolean canUse(Player player) { } default void toBuf(RegistryFriendlyByteBuf buf) { - getNetworkFluid().toPacket(buf); + FluidResource.STREAM_CODEC.encode(buf, getNetworkFluid()); buf.writeInt(getConnectionType()); buf.writeInt(getPriority(0)); } diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeScreenHandler.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeScreenHandler.java index 74b6d6a0c..eb7fd3d32 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeScreenHandler.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidPipeScreenHandler.java @@ -29,19 +29,19 @@ import aztech.modern_industrialization.network.pipes.SetPriorityPacket; import aztech.modern_industrialization.pipes.MIPipes; import aztech.modern_industrialization.pipes.gui.PipeScreenHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class FluidPipeScreenHandler extends PipeScreenHandler { public static final int HEIGHT = 153; public final FluidPipeInterface iface; private final Inventory playerInventory; - private FluidVariant trackedNetworkFluid; + private FluidResource trackedNetworkFluid; private int trackedPriority; private int trackedType; diff --git a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidTarget.java b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidTarget.java index d79f40adf..0fa200756 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidTarget.java +++ b/src/main/java/aztech/modern_industrialization/pipes/fluid/FluidTarget.java @@ -24,19 +24,20 @@ package aztech.modern_industrialization.pipes.fluid; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; /** * A target to be used during a transfer operation. */ class FluidTarget { final int priority; - final IFluidHandler storage; + final ResourceHandler storage; // A temporary value used to sort fluid targets long simulationResult; - public FluidTarget(int priority, IFluidHandler storage) { + public FluidTarget(int priority, ResourceHandler storage) { this.priority = priority; this.storage = storage; } diff --git a/src/main/java/aztech/modern_industrialization/pipes/gui/PipeGuiHelper.java b/src/main/java/aztech/modern_industrialization/pipes/gui/PipeGuiHelper.java index ebb516f8e..a5a218e06 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/gui/PipeGuiHelper.java +++ b/src/main/java/aztech/modern_industrialization/pipes/gui/PipeGuiHelper.java @@ -25,10 +25,10 @@ package aztech.modern_industrialization.pipes.gui; import aztech.modern_industrialization.MI; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class PipeGuiHelper { - public static final ResourceLocation BUTTON_TEXTURE = MI.id("textures/gui/pipe/buttons.png"); + public static final Identifier BUTTON_TEXTURE = MI.id("textures/gui/pipe/buttons.png"); /** * Return the starting y of the first inventory slots given the GUI height. diff --git a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlock.java b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlock.java index a77dbda56..74e035805 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlock.java +++ b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlock.java @@ -36,8 +36,10 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; +import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.ItemInteractionResult; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -48,6 +50,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.ScheduledTickAccess; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.EntityBlock; @@ -62,6 +65,7 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.level.redstone.Orientation; import net.minecraft.world.level.storage.loot.LootParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.AABB; @@ -112,18 +116,16 @@ public FluidState getFluidState(BlockState state) { } @Override - public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor level, BlockPos currentPos, - BlockPos neighborPos) { + protected BlockState updateShape(BlockState state, LevelReader level, ScheduledTickAccess ticks, BlockPos pos, Direction directionToNeighbour, BlockPos neighbourPos, BlockState neighbourState, RandomSource random) { if (state.getValue(WATERLOGGED)) { - level.scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(level)); + ticks.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(level)); } - - return super.updateShape(state, direction, neighborState, level, currentPos, neighborPos); + return super.updateShape(state, level, ticks, pos, directionToNeighbour, neighbourPos, neighbourState, random); } @Override - public boolean canPlaceLiquid(@Nullable Player player, BlockGetter level, BlockPos pos, BlockState state, Fluid fluid) { - return !state.getValue(CAMOUFLAGED) && SimpleWaterloggedBlock.super.canPlaceLiquid(player, level, pos, state, fluid); + public boolean canPlaceLiquid(@Nullable LivingEntity user, BlockGetter level, BlockPos pos, BlockState state, Fluid type) { + return !state.getValue(CAMOUFLAGED) && SimpleWaterloggedBlock.super.canPlaceLiquid(user, level, pos, state, type); } @Override @@ -180,14 +182,14 @@ static boolean useWrench(PipeBlockEntity pipe, Player player, InteractionHand ha if (player.isShiftKeyDown()) { boolean removeBlock = pipe.connections.size() == 1; - if (!world.isClientSide) { + if (!world.isClientSide()) { pipe.removePipeAndDropContainedItems(partShape.type); } if (removeBlock) { world.setBlockAndUpdate(blockPos, Blocks.AIR.defaultBlockState()); } // update adjacent blocks - world.blockUpdated(blockPos, Blocks.AIR); + world.updateNeighborsAt(blockPos, Blocks.AIR); // spawn pipe item world.addFreshEntity(new ItemEntity(world, hitPos.x, hitPos.y, hitPos.z, new ItemStack(MIPipes.INSTANCE.getPipeItem(partShape.type)))); // play break sound @@ -196,19 +198,19 @@ static boolean useWrench(PipeBlockEntity pipe, Player player, InteractionHand ha } else { SoundEvent sound = null; if (partShape.direction == null) { - if (!world.isClientSide) { + if (!world.isClientSide()) { pipe.addConnection(player, partShape.type, hit.getDirection()); } else { sound = group.getPlaceSound(); } } else { - if (!world.isClientSide) { + if (!world.isClientSide()) { pipe.removeConnection(partShape.type, partShape.direction); } else { sound = group.getBreakSound(); } } - world.blockUpdated(blockPos, Blocks.AIR); + world.updateNeighborsAt(blockPos, Blocks.AIR); if (sound != null) { world.playSound(player, blockPos, sound, SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 4.0F, group.getPitch() * 0.8F); } @@ -219,26 +221,26 @@ static boolean useWrench(PipeBlockEntity pipe, Player player, InteractionHand ha @SuppressWarnings("deprecation") @Override - public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos blockPos, Player player, InteractionHand hand, - BlockHitResult hit) { + public InteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos blockPos, Player player, InteractionHand hand, + BlockHitResult hit) { PipeBlockEntity pipeEntity = (PipeBlockEntity) world.getBlockEntity(blockPos); if (pipeEntity.tryApplyCamouflage(player, hand)) { - return ItemInteractionResult.sidedSuccess(world.isClientSide()); + return InteractionResult.SUCCESS; } PipeVoxelShape partShape = getHitPart(pipeEntity, hit); if (partShape == null || !partShape.opensGui || pipeEntity.hasCamouflage()) { - return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION; + return InteractionResult.TRY_WITH_EMPTY_HAND; } - if (!world.isClientSide) { + if (!world.isClientSide()) { if (!pipeEntity.customUse(partShape, player, hand) && !player.isShiftKeyDown()) { var menuOpener = pipeEntity.getGui(partShape.type, partShape.direction); - ((ServerPlayer) player).openMenu(menuOpener, menuOpener::writeAdditionalData); + player.openMenu(menuOpener, menuOpener::writeAdditionalData); } } - return ItemInteractionResult.sidedSuccess(world.isClientSide); + return InteractionResult.SUCCESS; } @SuppressWarnings("deprecation") @@ -256,19 +258,18 @@ public List getDrops(BlockState state, LootParams.Builder builder) { return droppedStacks; } - @SuppressWarnings("deprecation") @Override - public void neighborChanged(BlockState state, Level world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) { - if (!world.isClientSide) { - ((PipeBlockEntity) world.getBlockEntity(pos)).updateConnections(); + protected void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, @Nullable Orientation orientation, boolean movedByPiston) { + if (!level.isClientSide()) { + ((PipeBlockEntity) level.getBlockEntity(pos)).updateConnections(); } - super.neighborChanged(state, world, pos, block, fromPos, notify); + super.neighborChanged(state, level, pos, block, orientation, movedByPiston); } @SuppressWarnings("deprecation") @Override - public int getLightBlock(BlockState state, BlockGetter world, BlockPos pos) { - return state.getValue(CAMOUFLAGED) ? world.getMaxLightLevel() : 0; + protected int getLightBlock(BlockState state) { + return state.getValue(CAMOUFLAGED) ? Level.MAX_BRIGHTNESS : 0; } @Override @@ -286,7 +287,7 @@ public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, Co } @Override - public VoxelShape getOcclusionShape(BlockState state, BlockGetter level, BlockPos pos) { + protected VoxelShape getOcclusionShape(BlockState state) { return state.getValue(CAMOUFLAGED) ? Shapes.block() : Shapes.empty(); } @@ -295,13 +296,11 @@ protected boolean isPathfindable(BlockState state, PathComputationType type) { return false; } + // TODO 26.1: audit this @Override - protected void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) { - if (!state.is(newState.getBlock())) { - if (world.getBlockEntity(pos) instanceof PipeBlockEntity pipe) { - pipe.stateReplaced = true; - } - world.removeBlockEntity(pos); + protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) { + if (level.getBlockEntity(pos) instanceof PipeBlockEntity pipe) { + pipe.stateReplaced = true; } } @@ -321,21 +320,22 @@ public BlockState getAppearance(BlockState state, BlockAndTintGetter renderView, return state; } - @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { - if (target instanceof BlockHitResult bhr) { - if (player.level().getBlockEntity(bhr.getBlockPos()) instanceof PipeBlockEntity pipe) { - if (pipe.hasCamouflage()) { - return pipe.getCamouflageStack(); - } - - var targetedPart = PipeBlock.getHitPart(player.level(), bhr.getBlockPos(), bhr); - return new ItemStack(targetedPart == null ? Items.AIR : MIPipes.INSTANCE.getPipeItem(targetedPart.type)); - } - } - - return ItemStack.EMPTY; - } + // TODO 26.1 +// @Override +// public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) { +// if (target instanceof BlockHitResult bhr) { +// if (player.level().getBlockEntity(bhr.getBlockPos()) instanceof PipeBlockEntity pipe) { +// if (pipe.hasCamouflage()) { +// return pipe.getCamouflageStack(); +// } +// +// var targetedPart = PipeBlock.getHitPart(player.level(), bhr.getBlockPos(), bhr); +// return new ItemStack(targetedPart == null ? Items.AIR : MIPipes.INSTANCE.getPipeItem(targetedPart.type)); +// } +// } +// +// return ItemStack.EMPTY; +// } @Override public boolean hidesNeighborFace(BlockGetter level, BlockPos pos, BlockState state, BlockState neighborState, Direction dir) { diff --git a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlockEntity.java b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlockEntity.java index 94a6335a5..e6c724e8f 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlockEntity.java +++ b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeBlockEntity.java @@ -40,6 +40,8 @@ import aztech.modern_industrialization.util.TransferHelper; import aztech.modern_industrialization.util.WorldHelper; import java.util.*; + +import com.mojang.logging.LogUtils; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -50,9 +52,10 @@ import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; +import net.minecraft.util.ProblemReporter; import net.minecraft.util.Tuple; import net.minecraft.world.Container; import net.minecraft.world.Containers; @@ -61,18 +64,24 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.TagValueOutput; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.neoforged.neoforge.client.model.data.ModelData; -import net.neoforged.neoforge.client.model.data.ModelProperty; +import net.neoforged.neoforge.model.data.ModelData; +import net.neoforged.neoforge.model.data.ModelProperty; +import net.neoforged.neoforge.transfer.fluid.FluidResource; import org.jspecify.annotations.Nullable; +import org.slf4j.Logger; /** * The BlockEntity for a pipe. */ public class PipeBlockEntity extends FastBlockEntity implements PipeScreenHandlerHelper, WrenchableBlockEntity { + private static final Logger LOGGER = LogUtils.getLogger(); private static final int MAX_PIPES = 3; private static final VoxelShape[][][] SHAPE_CACHE; private static final VoxelShape[] ME_WIRE_CONNECTOR_SHAPES; @@ -109,7 +118,7 @@ public class PipeBlockEntity extends FastBlockEntity implements PipeScreenHandle boolean stateReplaced = false; public void loadPipes() { - if (level.isClientSide || unloadedPipes.size() == 0) + if (level.isClientSide() || unloadedPipes.size() == 0) return; for (Tuple unloaded : unloadedPipes) { @@ -148,7 +157,7 @@ public SortedSet getNodes() { */ boolean canAddPipe(PipeNetworkType type) { loadPipes(); - if (level.isClientSide) { + if (level.isClientSide()) { return connections.size() < MAX_PIPES && !connections.containsKey(type); } else { if (pipes.size() == MAX_PIPES) @@ -254,7 +263,7 @@ public ItemStack getCamouflageStack() { * Set the camouflage directly. The camouflage block should be consumed from the player before calling this. */ private void setCamouflage(@Nullable BlockState newCamouflage) { - if (level.isClientSide) { + if (level.isClientSide()) { throw new IllegalStateException("Cannot call setCamouflage on the client"); } @@ -310,7 +319,7 @@ public boolean tryRemoveCamouflage(Player player, InteractionHand hand) { return false; } - if (!player.level().isClientSide) { + if (!player.level().isClientSide()) { setCamouflage(null); } @@ -343,7 +352,7 @@ public boolean tryApplyCamouflage(Player player, InteractionHand hand) { } // Item capabilities shouldn't be messed with (and in some cases cannot - leading to inconsistent behavior) on the client side - if (player.level().isClientSide) { + if (player.level().isClientSide()) { return true; } @@ -401,48 +410,52 @@ public void setRemoved() { } @Override - public void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + public void saveAdditional(ValueOutput output) { int i = 0; for (PipeNetworkNode pipe : pipes) { - tag.putString("pipe_type_" + i, pipe.getType().getIdentifier().toString()); - tag.put("pipe_data_" + i, pipe.toTag(new CompoundTag(), registries)); + output.putString("pipe_type_" + i, pipe.getType().getIdentifier().toString()); + pipe.save(output.child("pipe_data_" + i)); i++; } for (Tuple entry : unloadedPipes) { - tag.putString("pipe_type_" + i, entry.getA().getIdentifier().toString()); - tag.put("pipe_data_" + i, entry.getB().toTag(new CompoundTag(), registries)); + output.putString("pipe_type_" + i, entry.getA().getIdentifier().toString()); + entry.getB().save(output.child("pipe_data_" + i)); i++; } if (camouflage != null) { - tag.put("camouflage", NbtUtils.writeBlockState(camouflage)); + output.store("camouflage", CompoundTag.CODEC, NbtUtils.writeBlockState(camouflage)); } } @Override - public void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { - camouflage = tag.contains("camouflage") ? NbtUtils.readBlockState(BuiltInRegistries.BLOCK.asLookup(), tag.getCompound("camouflage")) : null; + public void loadAdditional(ValueInput input) { + camouflage = input.read("camouflage", CompoundTag.CODEC) + .map(t -> NbtUtils.readBlockState(BuiltInRegistries.BLOCK, t)) + .orElse(null); + + var keySet = input.keySet(); - if (!tag.contains("pipes")) { + if (!keySet.contains("pipes")) { pipes.clear(); int i = 0; - while (tag.contains("pipe_type_" + i)) { - ResourceLocation typeId = ResourceLocation.parse(tag.getString("pipe_type_" + i)); + while (keySet.contains("pipe_type_" + i)) { + Identifier typeId = Identifier.parse(input.getString("pipe_type_" + i).orElseThrow()); PipeNetworkType type = PipeNetworkType.get(typeId); PipeNetworkNode node = type.getNodeCtor().get(); - node.fromTag(tag.getCompound("pipe_data_" + i), registries); + node.read(input.child("pipe_data_" + i).orElseThrow()); unloadedPipes.add(new Tuple<>(type, node)); i++; } } else { connections.clear(); customData.clear(); - CompoundTag pipesTag = tag.getCompound("pipes"); - for (String key : pipesTag.getAllKeys()) { - CompoundTag nodeTag = pipesTag.getCompound(key); - PipeNetworkType type = PipeNetworkType.get(ResourceLocation.parse(key)); - connections.put(type, NbtHelper.decodeConnections(nodeTag.getByteArray("connections"))); - customData.put(type, nodeTag.getCompound("custom").copy()); + var pipesTag = input.childOrEmpty("pipes"); + for (String key : pipesTag.keySet()) { + var nodeTag = pipesTag.read(key, CompoundTag.CODEC).orElseThrow(); + PipeNetworkType type = PipeNetworkType.get(Identifier.parse(key)); + connections.put(type, NbtHelper.decodeConnections(nodeTag.getByteArray("connections").orElseThrow())); + customData.put(type, nodeTag.getCompoundOrEmpty("custom")); } rebuildCollisionShape(); @@ -473,20 +486,21 @@ public void onConnectionsChanged() { @Override public CompoundTag getUpdateTag(HolderLookup.Provider registries) { - CompoundTag tag = new CompoundTag(); - loadPipes(); - CompoundTag pipesTag = new CompoundTag(); - for (PipeNetworkNode pipe : pipes) { - CompoundTag nodeTag = new CompoundTag(); - nodeTag.put("custom", pipe.writeCustomData(registries)); - nodeTag.putByteArray("connections", NbtHelper.encodeConnections(pipe.getConnections(worldPosition))); - pipesTag.put(pipe.getType().getIdentifier().toString(), nodeTag); - } - tag.put("pipes", pipesTag); - if (camouflage != null) { - tag.put("camouflage", NbtUtils.writeBlockState(camouflage)); + try (ProblemReporter.ScopedCollector reporter = new ProblemReporter.ScopedCollector(this.problemPath(), LOGGER)) { + TagValueOutput output = TagValueOutput.createWithContext(reporter, registries); + loadPipes(); + var pipesTag = output.child("pipes"); + for (PipeNetworkNode pipe : pipes) { + CompoundTag nodeTag = new CompoundTag(); + nodeTag.put("custom", pipe.writeCustomData(registries)); + nodeTag.putByteArray("connections", NbtHelper.encodeConnections(pipe.getConnections(worldPosition))); + pipesTag.store(pipe.getType().getIdentifier().toString(), CompoundTag.CODEC, nodeTag); + } + if (camouflage != null) { + output.store("camouflage", CompoundTag.CODEC, NbtUtils.writeBlockState(camouflage)); + } + return output.buildResult(); } - return tag; } @Nullable @@ -507,7 +521,7 @@ public ModelData getModelData() { renderedConnections[i] = Arrays.copyOf(entry.getValue(), 6); var data = this.customData.get(entry.getKey()); if (data.contains("fluid")) { - customData[i] = NbtHelper.getFluidCompatible(data, "fluid", level.registryAccess()); + customData[i] = data.read("fluid", FluidResource.OPTIONAL_CODEC).orElse(FluidResource.EMPTY); } i++; } diff --git a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeItem.java b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeItem.java index ee7d9d220..e4f0cd729 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeItem.java +++ b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeItem.java @@ -68,7 +68,7 @@ public InteractionResult useOn(UseOnContext context) { Player player = context.getPlayer(); // update adjacent pipes - world.blockUpdated(placingPos, Blocks.AIR); + world.updateNeighborsAt(placingPos, Blocks.AIR); // remove one from stack ItemStack placementStack = context.getItemInHand(); if (player != null && !player.getAbilities().instabuild) { @@ -80,7 +80,7 @@ public InteractionResult useOn(UseOnContext context) { world.playSound(player, placingPos, group.getPlaceSound(), SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 2.0F, group.getPitch() * 0.8F); - return InteractionResult.sidedSuccess(world.isClientSide); + return InteractionResult.SUCCESS; } else { // if we couldn't place a pipe, we try to add a connection instead placingPos = context.getClickedPos().relative(context.getClickedFace()); @@ -88,17 +88,17 @@ public InteractionResult useOn(UseOnContext context) { BlockEntity entity = world.getBlockEntity(placingPos); if (entity instanceof PipeBlockEntity pipeEntity) { if (pipeEntity.connections.containsKey(type)) { - if (!world.isClientSide) { + if (!world.isClientSide()) { pipeEntity.addConnection(context.getPlayer(), type, context.getClickedFace().getOpposite()); } // update adjacent pipes - world.blockUpdated(placingPos, Blocks.AIR); + world.updateNeighborsAt(placingPos, Blocks.AIR); // play placing sound BlockState newState = world.getBlockState(placingPos); SoundType group = newState.getSoundType(); world.playSound(context.getPlayer(), placingPos, group.getPlaceSound(), SoundSource.BLOCKS, (group.getVolume() + 1.0F) / 2.0F, group.getPitch() * 0.8F); - return InteractionResult.sidedSuccess(world.isClientSide); + return InteractionResult.SUCCESS; } } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeNetworks.java b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeNetworks.java index 9f501c721..4d7035cf7 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/impl/PipeNetworks.java +++ b/src/main/java/aztech/modern_industrialization/pipes/impl/PipeNetworks.java @@ -24,31 +24,47 @@ package aztech.modern_industrialization.pipes.impl; +import aztech.modern_industrialization.machines.gui.GuiComponentServer; import aztech.modern_industrialization.pipes.api.PipeNetworkManager; import aztech.modern_industrialization.pipes.api.PipeNetworkType; import aztech.modern_industrialization.util.WorldHelper; import java.util.*; + +import com.mojang.logging.LogUtils; +import com.mojang.serialization.Codec; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.ProblemReporter; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Level; import net.minecraft.world.level.saveddata.SavedData; +import net.minecraft.world.level.saveddata.SavedDataType; +import net.minecraft.world.level.storage.TagValueOutput; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.tick.LevelTickEvent; import org.jspecify.annotations.Nullable; +import org.slf4j.Logger; public class PipeNetworks extends SavedData { - private static final SavedData.Factory FACTORY = new SavedData.Factory<>(() -> new PipeNetworks(new HashMap<>()), - PipeNetworks::readNbt); - private static final String NAME = "modern_industrialization_pipe_networks"; + private static final Codec CODEC = Codec.dispatchedMap(PipeNetworkType.CODEC, PipeNetworkManager::codec) + .xmap(map -> new PipeNetworks(new HashMap<>(map)), n -> n.managers); + private static final SavedDataType TYPE = new SavedDataType<>( + "modern_industrialization_pipe_networks", + () -> new PipeNetworks(new HashMap<>()), + CODEC); private final Map managers; private final Map> loadPipesByChunk = new HashMap<>(); public PipeNetworks(Map managers) { this.managers = managers; + for (PipeNetworkType type : PipeNetworkType.getTypes().values()) { + if (!managers.containsKey(type)) { + managers.put(type, new PipeNetworkManager(type)); + } + } } public PipeNetworkManager getManager(PipeNetworkType type) { @@ -60,29 +76,8 @@ public PipeNetworkManager getOptionalManager(PipeNetworkType type) { return managers.get(type); } - @Override - public CompoundTag save(CompoundTag nbt, HolderLookup.Provider registries) { - for (Map.Entry entry : managers.entrySet()) { - nbt.put(entry.getKey().getIdentifier().toString(), entry.getValue().toTag(new CompoundTag(), registries)); - } - return nbt; - } - - public static PipeNetworks readNbt(CompoundTag nbt, HolderLookup.Provider registries) { - Map managers = new HashMap<>(); - for (Map.Entry entry : PipeNetworkType.getTypes().entrySet()) { - PipeNetworkManager manager = new PipeNetworkManager(entry.getValue()); - String tagKey = entry.getKey().toString(); - if (nbt.contains(tagKey)) { - manager.fromNbt(nbt.getCompound(tagKey), registries); - } - managers.put(entry.getValue(), manager); - } - return new PipeNetworks(managers); - } - public static PipeNetworks get(ServerLevel world) { - PipeNetworks networks = world.getDataStorage().computeIfAbsent(FACTORY, NAME); + PipeNetworks networks = world.getDataStorage().computeIfAbsent(TYPE); networks.setDirty(); return networks; } @@ -93,7 +88,7 @@ public static void scheduleLoadPipe(Level world, PipeBlockEntity pipe) { throw new IllegalStateException("Can only load pipe on server from the server thread."); } - PipeNetworks.get(sw).loadPipesByChunk.computeIfAbsent(ChunkPos.asLong(pipe.getBlockPos()), chunk -> new ArrayList<>()) + PipeNetworks.get(sw).loadPipesByChunk.computeIfAbsent(ChunkPos.pack(pipe.getBlockPos()), chunk -> new ArrayList<>()) .add(pipe::loadPipes); } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/impl/PipePartBuilder.java b/src/main/java/aztech/modern_industrialization/pipes/impl/PipePartBuilder.java index e2bbb888e..fe14d6c80 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/impl/PipePartBuilder.java +++ b/src/main/java/aztech/modern_industrialization/pipes/impl/PipePartBuilder.java @@ -52,14 +52,14 @@ public abstract class PipePartBuilder { protected Vec3 right; protected PipePartBuilder(int slotPos, Direction direction) { - this.facing = Vec3.atLowerCornerOf(direction.getNormal()); + this.facing = direction.getUnitVec3(); // initial position + half pipe + slotPos * width float position = (1.0f - 3 * SIDE - 2 * SPACING) / 2.0f + SIDE / 2.0f + slotPos * (SIDE + SPACING); this.pos = new Vec3(position, position, position); // Find a suitable right direction (both right and up must face inside of the // block). for (Direction d : Direction.values()) { - this.right = Vec3.atLowerCornerOf(d.getNormal()); + this.right = d.getUnitVec3(); if (isTowardsInside(this.right) && isTowardsInside(up())) break; } diff --git a/src/main/java/aztech/modern_industrialization/pipes/item/ExtractionSource.java b/src/main/java/aztech/modern_industrialization/pipes/item/ExtractionSource.java index 91a227e3b..bce864094 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/item/ExtractionSource.java +++ b/src/main/java/aztech/modern_industrialization/pipes/item/ExtractionSource.java @@ -26,10 +26,11 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.item.ItemResource; record ExtractionSource( ItemNetworkNode.ItemConnection connection, - IItemHandler storage, + ResourceHandler itemHandler, BlockPos queryPos, Direction querySide) {} diff --git a/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetwork.java b/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetwork.java index d00c47ef1..629235f91 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetwork.java +++ b/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetwork.java @@ -26,13 +26,15 @@ import aztech.modern_industrialization.inventory.WhitelistedItemStorage; import aztech.modern_industrialization.pipes.api.PipeNetwork; -import aztech.modern_industrialization.pipes.api.PipeNetworkData; +import aztech.modern_industrialization.transfer.CombinedInsertionHandler; +import aztech.modern_industrialization.transfer.InsertionHandler; +import aztech.modern_industrialization.transfer.MITransferUtil; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; import java.util.*; import java.util.concurrent.ThreadLocalRandom; -import java.util.function.Predicate; + import net.minecraft.CrashReport; import net.minecraft.ReportedException; import net.minecraft.core.BlockPos; @@ -41,8 +43,12 @@ import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.capabilities.BlockCapabilityCache; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.items.IItemHandler; -import org.jspecify.annotations.Nullable; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.item.ItemResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; +import org.jetbrains.annotations.Nullable; public class ItemNetwork extends PipeNetwork { public static final int TICK_RATE = 60; @@ -50,9 +56,11 @@ public class ItemNetwork extends PipeNetwork { int inactiveTicks = 0; long lastMovedItems = 0; + @Nullable + ExtractionSource currentExtractionSource; - public ItemNetwork(int id, @Nullable PipeNetworkData data) { - super(id, data == null ? new ItemNetworkData() : data); + public ItemNetwork(int id, ItemNetworkData data) { + super(id, data); } @Override @@ -75,7 +83,7 @@ private void doNetworkTransfer(ServerLevel world) { var queryPos = pos.relative(connection.direction); var querySide = connection.direction.getOpposite(); - var source = world.getCapability(Capabilities.ItemHandler.BLOCK, queryPos, querySide); + var source = world.getCapability(Capabilities.Item.BLOCK, queryPos, querySide); if (source != null) { extractionSources.add(new ExtractionSource(connection, source, queryPos, querySide)); @@ -88,48 +96,38 @@ private void doNetworkTransfer(ServerLevel world) { // Do the actual transfer. var insertTargets = getAggregatedInsertTargets(world); + var insertionHandler = new CombinedInsertionHandler<>(insertTargets); lastMovedItems = 0; - for (ExtractionSource target : extractionSources) { - // Lower priority extracts first, and pipes can only move items to things that have >= priorities. - // So we can just pop insert targets at the end of the list if they have a priority smaller than the current extraction target. - while (insertTargets.size() > 0 && target.connection().extractPriority > insertTargets.get(insertTargets.size() - 1).getPriority()) { - insertTargets.remove(insertTargets.size() - 1); - } - - try { - lastMovedItems += moveAll(world, target, insertTargets, target.connection()::canStackMoveThrough, - target.connection().getMoves()); - } catch (Exception exception) { - var crashReport = CrashReport.forThrowable(exception, "Moving items in a pipe network"); - crashReport.addCategory("Block being extracted from:") - .setDetail("Dimension", world.dimension()) - .setDetail("Position", target.queryPos()) - .setDetail("Accessed from side", target.querySide()); - throw new ReportedException(crashReport); - } - } - } - - private static int moveAll(ServerLevel world, ExtractionSource target, List sinks, Predicate filter, - int maxToMove) { - IItemHandler source = target.storage(); - int moved = 0; + try (var tx = Transaction.openRoot()) { + for (ExtractionSource source : extractionSources) { + currentExtractionSource = source; + // Lower priority extracts first, and pipes can only move items to things that have >= priorities. + // So we can just pop insert targets at the end of the list if they have a priority smaller than the current extraction target. + while (!insertTargets.isEmpty() && source.connection().extractPriority > insertTargets.getLast().getPriority()) { + insertTargets.removeLast(); + } - int sourceSlots = source.getSlots(); - for (int i = 0; i < sourceSlots; ++i) { - // Filter check - var stack = source.getStackInSlot(i); - if (stack.isEmpty() || !filter.test(stack)) { - continue; + try { + lastMovedItems += MITransferUtil.move( + source.itemHandler(), + insertionHandler, + source.connection()::canMoveThrough, + source.connection().getMoves(), + tx); + } catch (Exception exception) { + var crashReport = CrashReport.forThrowable(exception, "Moving items in a pipe network"); + crashReport.addCategory("Block being extracted from:") + .setDetail("Dimension", world.dimension()) + .setDetail("Position", source.queryPos()) + .setDetail("Accessed from side", source.querySide()); + throw new ReportedException(crashReport); + } } - moved += ItemSink.listMoveAll(sinks, world, target, i, maxToMove - moved); - if (moved >= maxToMove) { - break; - } + tx.commit(); + } finally { + currentExtractionSource = null; } - - return moved; } /** @@ -143,13 +141,13 @@ private List getAggregatedInsertTargets(ServerLevel world) { for (ItemNetworkNode.ItemConnection connection : node.connections) { if (connection.canInsert()) { if (connection.cache == null) { - connection.cache = BlockCapabilityCache.create(Capabilities.ItemHandler.BLOCK, world, + connection.cache = BlockCapabilityCache.create(Capabilities.Item.BLOCK, world, entry.getPos().relative(connection.direction), connection.direction.getOpposite()); } var target = connection.cache.getCapability(); - if (target != null && target.getSlots() > 0) { + if (target != null && target.size() > 0) { PriorityBucket bucket = priorityBuckets.computeIfAbsent(connection.insertPriority, PriorityBucket::new); - InsertTarget it = new InsertTarget(connection, new ItemSink.HandlerWrapper(target, entry.getPos(), connection.direction)); + InsertTarget it = new InsertTarget(connection, target); if (connection.whitelist || (target instanceof WhitelistedItemStorage wis && wis.currentlyWhitelisted())) { bucket.whitelist.add(it); @@ -201,14 +199,14 @@ private PriorityBucket(int priority) { } } - private interface Aggregate extends ItemSink { + private interface Aggregate extends InsertionHandler { int getPriority(); } - private static class WhitelistAggregate implements Aggregate { + private class WhitelistAggregate implements Aggregate { private final int priority; // Used when the inserted item doesn't have NBT - private final Map> map = new IdentityHashMap<>(); + private final Map> map = new IdentityHashMap<>(); // Used when the inserted item has NBT. private final List targets; @@ -220,14 +218,14 @@ private static class WhitelistAggregate implements Aggregate { ItemNetworkNode.ItemConnection conn = target.connection; for (ItemStack stack : conn.stacks) { if (stack.isComponentsPatchEmpty()) { - map.computeIfAbsent(stack.getItem(), v -> new ArrayList<>()).add(target.target); + map.computeIfAbsent(stack.getItem(), v -> new ArrayList<>()).add(target); } } - } else if (target.target.handler() instanceof WhitelistedItemStorage wis) { + } else if (target.target instanceof WhitelistedItemStorage wis) { WHITELIST_CACHED_SET.clear(); wis.getWhitelistedItems(WHITELIST_CACHED_SET); for (Item item : WHITELIST_CACHED_SET) { - map.computeIfAbsent(item, v -> new ArrayList<>()).add(target.target); + map.computeIfAbsent(item, v -> new ArrayList<>()).add(target); } } else { throw new IllegalStateException("Internal item pipe error! Should never happen!"); @@ -236,18 +234,9 @@ private static class WhitelistAggregate implements Aggregate { } @Override - public int moveAll(ServerLevel world, ExtractionSource source, int sourceSlot, int maxAmount) { - var stack = source.storage().getStackInSlot(sourceSlot); - - if (!stack.isComponentsPatchEmpty()) { - return insertTargets(targets, world, source, sourceSlot, maxAmount); - } - - List targets = map.get(stack.getItem()); - if (targets != null) { - return ItemSink.listMoveAll(targets, world, source, sourceSlot, maxAmount); - } - return 0; + public int insert(ItemResource resource, int amount, TransactionContext transaction) { + var insertionTargets = resource.isComponentsPatchEmpty() ? map.get(resource.getItem()) : targets; + return insertionTargets == null ? 0 : insertTargets(insertionTargets, resource, amount, transaction); } @Override @@ -256,7 +245,7 @@ public int getPriority() { } } - private static class BlacklistAggregate implements Aggregate { + private class BlacklistAggregate implements Aggregate { private final int priority; private final List targets; @@ -266,8 +255,8 @@ private BlacklistAggregate(int priority, List targets) { } @Override - public int moveAll(ServerLevel world, ExtractionSource source, int sourceSlot, int maxAmount) { - return insertTargets(targets, world, source, sourceSlot, maxAmount); + public int insert(ItemResource resource, int amount, TransactionContext transaction) { + return insertTargets(targets, resource, amount, transaction); } @Override @@ -276,28 +265,20 @@ public int getPriority() { } } - private static int insertTargets(List targets, ServerLevel world, ExtractionSource source, int sourceSlot, int maxAmount) { - int moved = 0; - - for (InsertTarget target : targets) { - if (source.connection() == target.connection()) { + private int insertTargets(List targets, ItemResource resource, int amount, TransactionContext transaction) { + int inserted = 0; + for (var target : targets) { + if (currentExtractionSource != null && currentExtractionSource.connection() == target.connection()) { + // Avoid self-insertion continue; } - var stack = source.storage().getStackInSlot(sourceSlot); - if (stack.isEmpty()) { - break; - } - - if (target.connection.canStackMoveThrough(stack)) { - moved += target.target.moveAll(world, source, sourceSlot, maxAmount - moved); - if (moved >= maxAmount) { - break; - } + if (target.connection.canMoveThrough(resource)) { + inserted += ResourceHandlerUtil.insertStacking(target.target, resource, amount - inserted, transaction); + if (inserted == amount) break; } } - - return moved; + return inserted; } - private record InsertTarget(ItemNetworkNode.ItemConnection connection, ItemSink.HandlerWrapper target) {} + private record InsertTarget(ItemNetworkNode.ItemConnection connection, ResourceHandler target) {} } diff --git a/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkData.java b/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkData.java index 3689d9b06..c1c844b90 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkData.java +++ b/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkData.java @@ -25,26 +25,18 @@ package aztech.modern_industrialization.pipes.item; import aztech.modern_industrialization.pipes.api.PipeNetworkData; +import aztech.modern_industrialization.pipes.electricity.ElectricityNetworkData; +import com.mojang.serialization.MapCodec; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; // There is no data for item networks, two pipes of the same type can always connect. -public class ItemNetworkData extends PipeNetworkData { - @Override - public PipeNetworkData clone() { - return new ItemNetworkData(); - } - - @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) {} +public record ItemNetworkData() implements PipeNetworkData { + public static final ItemNetworkData INSTANCE = new ItemNetworkData(); + public static final MapCodec CODEC = MapCodec.unit(INSTANCE); @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { - return tag; - } - - @Override - public boolean equals(Object obj) { - return obj instanceof ItemNetworkData; + public ItemNetworkData clone() { + return new ItemNetworkData(); } } diff --git a/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkNode.java b/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkNode.java index a9858098d..7e3ef3347 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkNode.java +++ b/src/main/java/aztech/modern_industrialization/pipes/item/ItemNetworkNode.java @@ -38,18 +38,16 @@ import aztech.modern_industrialization.pipes.gui.PipeScreenHandlerHelper; import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; import aztech.modern_industrialization.pipes.impl.PipeNetworks; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.TransferHelper; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; import java.util.*; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.item.ItemEntity; @@ -59,9 +57,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import net.neoforged.neoforge.capabilities.BlockCapabilityCache; import net.neoforged.neoforge.capabilities.Capabilities; -import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.item.ItemResource; import org.jspecify.annotations.Nullable; public class ItemNetworkNode extends PipeNetworkNode { @@ -86,7 +87,7 @@ public void updateConnections(Level world, BlockPos pos) { private boolean canConnect(Level world, BlockPos pos, Direction direction) { BlockPos adjPos = pos.relative(direction); - return world.getCapability(Capabilities.ItemHandler.BLOCK, adjPos, direction.getOpposite()) != null; + return world.getCapability(Capabilities.Item.BLOCK, adjPos, direction.getOpposite()) != null; } @Override @@ -141,7 +142,7 @@ public void addConnection(PipeBlockEntity pipe, Player player, Level world, Bloc } @Override - public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { + public void save(ValueOutput output) { for (ItemConnection connection : connections) { CompoundTag connectionTag = new CompoundTag(); connectionTag.putByte("connections", (byte) encodeConnectionType(connection.type)); @@ -149,37 +150,37 @@ public CompoundTag toTag(CompoundTag tag, HolderLookup.Provider registries) { connectionTag.putInt("insertPriority", connection.insertPriority); connectionTag.putInt("extractPriority", connection.extractPriority); for (int i = 0; i < ItemPipeInterface.SLOTS; i++) { - connectionTag.put(Integer.toString(i), connection.stacks[i].saveOptional(registries)); + connectionTag.store(Integer.toString(i), ItemStack.OPTIONAL_CODEC, connection.stacks[i]); } - connectionTag.put("upgradeStack", connection.upgradeStack.saveOptional(registries)); - tag.put(connection.direction.toString(), connectionTag); + connectionTag.store("upgradeStack", ItemStack.OPTIONAL_CODEC, connection.upgradeStack); + output.store(connection.direction.toString(), CompoundTag.CODEC, connectionTag); } - tag.putInt("inactiveTicks", inactiveTicks); - return tag; + output.putInt("inactiveTicks", inactiveTicks); } @Override - public void fromTag(CompoundTag tag, HolderLookup.Provider registries) { + public void read(ValueInput input) { + var keySet = input.keySet(); for (Direction direction : Direction.values()) { - if (tag.contains(direction.toString())) { - CompoundTag connectionTag = tag.getCompound(direction.toString()); - int insertPriority = connectionTag.getInt("insertPriority"); - int extractPriority = connectionTag.getInt("extractPriority"); - ItemConnection connection = new ItemConnection(direction, decodeConnectionType(connectionTag.getByte("connections")), + if (keySet.contains(direction.toString())) { + CompoundTag connectionTag = input.read(direction.toString(), CompoundTag.CODEC).orElseThrow(); + int insertPriority = connectionTag.getIntOr("insertPriority", 0); + int extractPriority = connectionTag.getIntOr("extractPriority", 0); + ItemConnection connection = new ItemConnection(direction, decodeConnectionType(connectionTag.getByteOr("connections", (byte) 0)), insertPriority, extractPriority); - connection.whitelist = connectionTag.getBoolean("whitelist"); + connection.whitelist = connectionTag.getBooleanOr("whitelist", false); for (int i = 0; i < ItemPipeInterface.SLOTS; i++) { - connection.stacks[i] = ItemStack.parseOptional(registries, connectionTag.getCompound(Integer.toString(i))); + connection.stacks[i] = connectionTag.read(Integer.toString(i), ItemStack.OPTIONAL_CODEC).orElse(ItemStack.EMPTY); if (!connection.stacks[i].isEmpty()) { connection.stacks[i].setCount(1); } } connection.refreshStacksCache(); - connection.upgradeStack = ItemStack.parseOptional(registries, connectionTag.getCompound("upgradeStack")); + connection.upgradeStack = connectionTag.read("upgradeStack", ItemStack.OPTIONAL_CODEC).orElse(ItemStack.EMPTY); connections.add(connection); } } - inactiveTicks = tag.getInt("inactiveTicks"); + inactiveTicks = input.getIntOr("inactiveTicks", 0); } public static PipeEndpointType decodeConnectionType(int i) { @@ -253,7 +254,7 @@ class ItemConnection { final Map> stacksCache = new IdentityHashMap<>(); private ItemStack upgradeStack = ItemStack.EMPTY; @Nullable - BlockCapabilityCache cache = null; + BlockCapabilityCache, @Nullable Direction> cache = null; private ItemConnection(Direction direction, PipeEndpointType type, int insertPriority, int extractPriority) { this.direction = direction; @@ -274,13 +275,13 @@ private void refreshStacksCache() { } } - private boolean isInCache(ItemStack stack) { - var list = stacksCache.get(stack.getItem()); + private boolean isInCache(ItemResource resource) { + var list = stacksCache.get(resource.getItem()); if (list == null) { return false; } for (ItemStack cachedStack : list) { - if (ItemStack.isSameItemSameComponents(cachedStack, stack)) { + if (resource.matches(cachedStack)) { return true; } } @@ -295,12 +296,12 @@ boolean canExtract() { return type == BLOCK_OUT || type == BLOCK_IN_OUT; } - boolean canStackMoveThrough(ItemStack stack) { - return isInCache(stack) == whitelist; + boolean canMoveThrough(ItemResource resource) { + return isInCache(resource) == whitelist; } int getMoves() { - var upgradeData = upgradeStack.getItemHolder().getData(MIDataMaps.ITEM_PIPE_UPGRADES); + var upgradeData = upgradeStack.typeHolder().getData(MIDataMaps.ITEM_PIPE_UPGRADES); int extraExtractedItems = upgradeData == null ? 0 : upgradeData.maxExtractedItems(); return MIServerConfig.INSTANCE.baseItemPipeTransfer.getAsInt() + (extraExtractedItems * upgradeStack.getCount()); } @@ -350,7 +351,7 @@ void applyConfig(PipeBlockEntity pipe, @Nullable SavedItemPipeConfig config, Pla upgradeStack = requestedUpgrade; } else { // Otherwise -> try to grab the upgrades from the player's inventory, and deposit the old one. - ItemVariant requestedVariant = ItemVariant.of(requestedUpgrade); + ItemResource requestedVariant = ItemResource.of(requestedUpgrade); if (requestedVariant.matches(upgradeStack)) { int delta = requestedUpgrade.getCount() - upgradeStack.getCount(); @@ -371,15 +372,15 @@ void applyConfig(PipeBlockEntity pipe, @Nullable SavedItemPipeConfig config, Pla } } - private int fetchItems(Player player, ItemVariant what, int maxAmount) { + private int fetchItems(Player player, ItemResource what, int maxAmount) { return TransferHelper.extractMatching(player.getInventory(), what::matches, maxAmount, false).getCount(); } private class ScreenHandlerFactory implements PipeMenuProvider { private final ItemPipeInterface iface; - private final ResourceLocation pipeType; + private final Identifier pipeType; - private ScreenHandlerFactory(PipeScreenHandlerHelper helper, ResourceLocation pipeType) { + private ScreenHandlerFactory(PipeScreenHandlerHelper helper, Identifier pipeType) { this.iface = new ItemPipeInterface() { @Override public boolean isWhitelist() { diff --git a/src/main/java/aztech/modern_industrialization/pipes/item/ItemPipeScreenHandler.java b/src/main/java/aztech/modern_industrialization/pipes/item/ItemPipeScreenHandler.java index a5f1b5cb5..7c3495754 100644 --- a/src/main/java/aztech/modern_industrialization/pipes/item/ItemPipeScreenHandler.java +++ b/src/main/java/aztech/modern_industrialization/pipes/item/ItemPipeScreenHandler.java @@ -31,17 +31,17 @@ import aztech.modern_industrialization.network.pipes.SetPriorityPacket; import aztech.modern_industrialization.pipes.MIPipes; import aztech.modern_industrialization.pipes.gui.PipeScreenHandler; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; import aztech.modern_industrialization.util.Simulation; import aztech.modern_industrialization.util.UnsupportedOperationInventory; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.ClickType; +import net.minecraft.world.inventory.ContainerInput; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.item.ItemResource; public class ItemPipeScreenHandler extends PipeScreenHandler { public static final int HEIGHT = 196; @@ -82,13 +82,13 @@ public ItemPipeScreenHandler(int syncId, Inventory playerInventory, ItemPipeInte } @Override - public void clicked(int i, int j, ClickType actionType, Player playerEntity) { + public void clicked(int i, int j, ContainerInput actionType, Player playerEntity) { if (i >= 0) { Slot slot = slots.get(i); if (slot instanceof FilterSlot) { - if (actionType == ClickType.PICKUP) { + if (actionType == ContainerInput.PICKUP) { slot.set(getCarried().copy()); - } else if (actionType == ClickType.QUICK_MOVE) { + } else if (actionType == ContainerInput.QUICK_MOVE) { slot.set(ItemStack.EMPTY); } return; @@ -196,14 +196,14 @@ public void set(ItemStack stack) { } @Override - public boolean dragFluid(FluidVariant fluidKey, Simulation simulation) { + public boolean dragFluid(FluidResource fluidResource, Simulation simulation) { return false; } @Override - public boolean dragItem(ItemVariant itemKey, Simulation simulation) { + public boolean dragItem(ItemResource itemResource, Simulation simulation) { if (simulation.isActing()) { - set(itemKey.toStack()); + set(itemResource.toStack()); } return true; } @@ -220,7 +220,7 @@ public boolean mayPlace(ItemStack stack) { // Prevent placing motors in `IN` pipes. return false; } - return stack.getItemHolder().getData(MIDataMaps.ITEM_PIPE_UPGRADES) != null; + return stack.typeHolder().getData(MIDataMaps.ITEM_PIPE_UPGRADES) != null; } @Override diff --git a/src/main/java/aztech/modern_industrialization/pipes/item/ItemSink.java b/src/main/java/aztech/modern_industrialization/pipes/item/ItemSink.java deleted file mode 100644 index 78b5a8a57..000000000 --- a/src/main/java/aztech/modern_industrialization/pipes/item/ItemSink.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.pipes.item; - -import aztech.modern_industrialization.MI; -import java.util.List; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.ItemHandlerHelper; - -interface ItemSink { - static int listMoveAll(List sinks, ServerLevel world, ExtractionSource target, int sourceSlot, int maxAmount) { - int moved = 0; - - for (var sink : sinks) { - moved += sink.moveAll(world, target, sourceSlot, maxAmount - moved); - if (moved >= maxAmount) { - break; - } - } - - return moved; - } - - /** - * Moves as many items as possible from an extraction target to this sink. - * - * @param world current level, for logging in case of errors - * @param source item source - * @param sourceSlot slot in the source to move from - * @param maxAmount maximum amount of items to move - * @return the amount of items moved - */ - int moveAll(ServerLevel world, ExtractionSource source, int sourceSlot, int maxAmount); - - record HandlerWrapper(IItemHandler handler, BlockPos pipePos, Direction direction) implements ItemSink { - @Override - public int moveAll(ServerLevel world, ExtractionSource source, int sourceSlot, int maxToMove) { - IItemHandler sourceHandler = source.storage(); - int moved = 0; - - // Repeated extraction because extractItem limits to max stack size - while (true) { - // Simulate first - var available = sourceHandler.extractItem(sourceSlot, maxToMove - moved, true); - if (available.isEmpty()) { - break; - } - - int availableCount = available.getCount(); - var simulateLeftover = ItemHandlerHelper.insertItemStacked(handler, available, true); - int canFit = availableCount - simulateLeftover.getCount(); - if (canFit <= 0) { - break; - } - - // Do! - var taken = sourceHandler.extractItem(sourceSlot, canFit, false); - int takenCount = taken.getCount(); - var leftover = ItemHandlerHelper.insertItemStacked(handler, taken, false); - - int movedThisTime = takenCount - leftover.getCount(); - moved += movedThisTime; - - if (!leftover.isEmpty()) { - // Be nice and try to give the overflow back - leftover = sourceHandler.insertItem(sourceSlot, leftover, false); - - // rest in pieces, little stacks - if (!leftover.isEmpty()) { - var targetPos = pipePos.relative(direction); - var targetSide = direction.getOpposite(); - var targetBlock = world.getBlockState(targetPos).getBlock(); - MI.LOGGER.error(""" - Discarding overflowing item {}, extracted from block at position {} in {}, accessed from {} side. - Trying to insert into block at position {}, accessed from {}, - of type {}.\ - It previously reported that it would accept {} items, but it only did accept {}.""", - leftover, source.queryPos(), world.dimension(), source.querySide(), - targetPos, targetSide, targetBlock, canFit, movedThisTime); - } - - break; - } - - if (movedThisTime == 0) { - break; - } - } - - return moved; - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/recipe/json/MIRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/recipe/json/MIRecipeBuilder.java index 8ae243b8e..4abad4570 100644 --- a/src/main/java/aztech/modern_industrialization/recipe/json/MIRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/recipe/json/MIRecipeBuilder.java @@ -26,6 +26,7 @@ import net.minecraft.data.recipes.RecipeOutput; +// TODO: replace by vanilla interface? public interface MIRecipeBuilder { void offerTo(RecipeOutput recipeOutput, String path); } diff --git a/src/main/java/aztech/modern_industrialization/recipe/json/ShapedRecipeJson.java b/src/main/java/aztech/modern_industrialization/recipe/json/ShapedRecipeJson.java index 9aff69651..2513c3b8b 100644 --- a/src/main/java/aztech/modern_industrialization/recipe/json/ShapedRecipeJson.java +++ b/src/main/java/aztech/modern_industrialization/recipe/json/ShapedRecipeJson.java @@ -30,35 +30,42 @@ import aztech.modern_industrialization.machines.recipe.MachineRecipeType; import java.util.HashMap; import java.util.Map; + +import aztech.modern_industrialization.util.EmptyHolderGetter; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.item.crafting.ShapedRecipePattern; +import net.minecraft.world.level.material.Fluid; +// TODO: remove in favor of vanilla's @SuppressWarnings({ "FieldCanBeLocal", "MismatchedQueryAndUpdateOfCollection", "UnusedDeclaration" }) public class ShapedRecipeJson implements MIRecipeBuilder { public final String type = "minecraft:crafting_shaped"; public final String[] pattern; public final Map key = new HashMap<>(); - public final ItemStack result; + public final ItemStackTemplate result; public ShapedRecipeJson(String resultItem, int count, String... pattern) { this.pattern = pattern; - this.result = new ItemStack(BuiltInRegistries.ITEM.get(ResourceLocation.parse(resultItem)), count); + this.result = new ItemStackTemplate(BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(resultItem))), count); } - public ShapedRecipeJson addInput(char key, String maybeTag) { - Ingredient input; - if (maybeTag.startsWith("#")) { - input = Ingredient.of(ItemTags.create(ResourceLocation.parse(maybeTag.substring(1)))); - } else { - input = Ingredient.of(BuiltInRegistries.ITEM.get(ResourceLocation.parse(maybeTag))); - } + public ShapedRecipeJson addInput(char key, String id) { + return addInput(key, Ingredient.of(BuiltInRegistries.ITEM.getValueOrThrow(ResourceKey.create(Registries.ITEM, Identifier.parse(id))))); + } + + public ShapedRecipeJson addInput(char key, Ingredient input) { if (this.key.put(key, input) != null) { throw new IllegalStateException("Key mapping is already registered: " + key); } @@ -104,11 +111,15 @@ public MachineRecipeBuilder exportToAssembler() { } public MachineRecipeBuilder exportToMachine(MachineRecipeType machine, int eu, int duration, int division) { - if (result.getCount() % division != 0) { + if (result.count() % division != 0) { throw new IllegalArgumentException("Output must be divisible by division"); } - var assemblerJson = new MachineRecipeBuilder(machine, eu, duration).addItemOutput(result.getItem(), result.getCount() / division); + var assemblerJson = new MachineRecipeBuilder( + EmptyHolderGetter.getInstance(), + EmptyHolderGetter.getInstance(), + machine, eu, duration) + .itemOut(result.item().value(), result.count() / division); for (Map.Entry entry : key.entrySet()) { int count = 0; for (String row : pattern) { @@ -123,7 +134,7 @@ public MachineRecipeBuilder exportToMachine(MachineRecipeType machine, int eu, i throw new IllegalArgumentException("Input must be divisible by division"); } - assemblerJson.addItemInput(entry.getValue(), count / division, 1); + assemblerJson.itemIn(entry.getValue(), count / division, 1); } return assemblerJson; @@ -131,7 +142,7 @@ public MachineRecipeBuilder exportToMachine(MachineRecipeType machine, int eu, i @Override public void offerTo(RecipeOutput recipeOutput, String path) { - recipeOutput.accept(MI.id(path), new ShapedRecipe( + recipeOutput.accept(ResourceKey.create(Registries.RECIPE, MI.id(path)), new ShapedRecipe( "", CraftingBookCategory.MISC, ShapedRecipePattern.of(key, pattern), diff --git a/src/main/java/aztech/modern_industrialization/recipe/json/ShapelessRecipeBuilder.java b/src/main/java/aztech/modern_industrialization/recipe/json/ShapelessRecipeBuilder.java index 841ba0bbf..f1b164fb1 100644 --- a/src/main/java/aztech/modern_industrialization/recipe/json/ShapelessRecipeBuilder.java +++ b/src/main/java/aztech/modern_industrialization/recipe/json/ShapelessRecipeBuilder.java @@ -26,24 +26,28 @@ import aztech.modern_industrialization.MI; import net.minecraft.core.NonNullList; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.tags.TagKey; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.ShapelessRecipe; import net.minecraft.world.level.ItemLike; +// TODO: remove in favor of vanilla's public class ShapelessRecipeBuilder implements MIRecipeBuilder { - private final ItemStack resultStack; + private final ItemStackTemplate resultStack; private final NonNullList ingredients = NonNullList.create(); public ShapelessRecipeBuilder(ItemLike pResult, int pCount) { - this(new ItemStack(pResult, pCount)); + this(new ItemStackTemplate(pResult.asItem(), pCount)); } - public ShapelessRecipeBuilder(ItemStack result) { + public ShapelessRecipeBuilder(ItemStackTemplate result) { this.resultStack = result; } @@ -61,17 +65,10 @@ public static ShapelessRecipeBuilder shapeless(ItemLike pResult, int pCount) { return new ShapelessRecipeBuilder(pResult, pCount); } - public static ShapelessRecipeBuilder shapeless(ItemStack result) { + public static ShapelessRecipeBuilder shapeless(ItemStackTemplate result) { return new ShapelessRecipeBuilder(result); } - /** - * Adds an ingredient that can be any item in the given tag. - */ - public ShapelessRecipeBuilder requires(TagKey pTag) { - return this.requires(Ingredient.of(pTag)); - } - /** * Adds an ingredient of the given item. */ @@ -114,6 +111,6 @@ public ShapelessRecipe buildRecipe() { @Override public void offerTo(RecipeOutput output, String path) { - output.accept(MI.id(path), buildRecipe(), null); + output.accept(ResourceKey.create(Registries.RECIPE, MI.id(path)), buildRecipe(), null); } } diff --git a/src/main/java/aztech/modern_industrialization/resource/FastPathPackResources.java b/src/main/java/aztech/modern_industrialization/resource/FastPathPackResources.java index 294885a4d..2bb03a7ad 100644 --- a/src/main/java/aztech/modern_industrialization/resource/FastPathPackResources.java +++ b/src/main/java/aztech/modern_industrialization/resource/FastPathPackResources.java @@ -31,8 +31,8 @@ import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; -import net.minecraft.FileUtil; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FileUtil; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.PackLocationInfo; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.PathPackResources; @@ -52,12 +52,12 @@ public FastPathPackResources(PackLocationInfo locationInfo, Path root) { @Nullable @Override - public IoSupplier getResource(PackType packType, ResourceLocation location) { + public IoSupplier getResource(PackType packType, Identifier location) { Path path = this.root.resolve(packType.getDirectory()).resolve(location.getNamespace()); return getResource(location, path); } - public static IoSupplier getResource(ResourceLocation location, Path path) { + public static IoSupplier getResource(Identifier location, Path path) { return FileUtil.decomposePath(location.getPath()).mapOrElse(list -> { Path path2 = FileUtil.resolvePath(path, list); return returnFileIfExists(path2); diff --git a/src/main/java/aztech/modern_industrialization/resource/GeneratedPathPackResources.java b/src/main/java/aztech/modern_industrialization/resource/GeneratedPathPackResources.java index 991b21be9..c5eedd304 100644 --- a/src/main/java/aztech/modern_industrialization/resource/GeneratedPathPackResources.java +++ b/src/main/java/aztech/modern_industrialization/resource/GeneratedPathPackResources.java @@ -56,7 +56,7 @@ public IoSupplier getRootResource(String... elements) { "pack_format": %d } } - """.formatted(SharedConstants.getCurrentVersion().getPackVersion(type)).getBytes()); + """.formatted(SharedConstants.getCurrentVersion().packVersion(type)).getBytes()); } return super.getRootResource(elements); } diff --git a/src/main/java/aztech/modern_industrialization/stats/PlayerStatistics.java b/src/main/java/aztech/modern_industrialization/stats/PlayerStatistics.java index 03736e52c..6d9b6fa5d 100644 --- a/src/main/java/aztech/modern_industrialization/stats/PlayerStatistics.java +++ b/src/main/java/aztech/modern_industrialization/stats/PlayerStatistics.java @@ -28,6 +28,8 @@ import aztech.modern_industrialization.compat.ftbquests.FTBQuestsFacade; import aztech.modern_industrialization.compat.ftbteams.FTBTeamsFacade; import com.google.common.primitives.Ints; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import it.unimi.dsi.fastutil.objects.Reference2LongMap; import it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap; import java.util.HashSet; @@ -39,53 +41,62 @@ import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; import org.jspecify.annotations.Nullable; public class PlayerStatistics { - public static final PlayerStatistics DUMMY = new PlayerStatistics(null, null); - - private final PlayerStatisticsData data; + public static final PlayerStatistics DUMMY = new PlayerStatistics(); + + public static final Codec CODEC = RecordCodecBuilder.create( + instance -> + instance + .group( + registryCodec(BuiltInRegistries.ITEM).fieldOf("usedItems").forGetter(s -> s.usedItems), + registryCodec(BuiltInRegistries.ITEM).fieldOf("producedItems").forGetter(s -> s.producedItems), + registryCodec(BuiltInRegistries.FLUID).fieldOf("usedFluids").forGetter(s -> s.usedFluids), + registryCodec(BuiltInRegistries.FLUID).fieldOf("producedFluids").forGetter(s -> s.producedFluids), + pendingCodec().fieldOf("pendingCraftedStats").forGetter(s -> s.pendingCraftedStats) + ) + .apply(instance, PlayerStatistics::new)); + + private PlayerStatisticsData data; @Nullable - private final UUID uuid; - private final Map usedItems = new IdentityHashMap<>(), producedItems = new IdentityHashMap<>(); - private final Map usedFluids = new IdentityHashMap<>(), producedFluids = new IdentityHashMap<>(); - - private static final Set uuidCache = new HashSet<>(); + private UUID uuid; + private final IdentityHashMap usedItems; + private final IdentityHashMap producedItems; + private final IdentityHashMap usedFluids; + private final IdentityHashMap producedFluids; // Items produced while the player was offline... this is used to award vanilla stats when the player comes back online. - private final Reference2LongMap pendingCraftedStats = new Reference2LongOpenHashMap<>(); + private final Reference2LongMap pendingCraftedStats; - PlayerStatistics(PlayerStatisticsData data, UUID uuid) { - this.data = data; - this.uuid = uuid; + private static final Set uuidCache = new HashSet<>(); + + PlayerStatistics() { + this(new IdentityHashMap<>(), new IdentityHashMap<>(), new IdentityHashMap<>(), new IdentityHashMap<>(), new Reference2LongOpenHashMap<>()); } - PlayerStatistics(PlayerStatisticsData data, UUID uuid, CompoundTag nbt) { - this(data, uuid); - readNbt(BuiltInRegistries.ITEM, usedItems, nbt.getCompound("usedItems")); - readNbt(BuiltInRegistries.ITEM, producedItems, nbt.getCompound("producedItems")); - readNbt(BuiltInRegistries.FLUID, usedFluids, nbt.getCompound("usedFluids")); - readNbt(BuiltInRegistries.FLUID, producedFluids, nbt.getCompound("producedFluids")); - pendingReadNbt(pendingCraftedStats, nbt.getCompound("pendingCraftedStats")); + PlayerStatistics( + IdentityHashMap usedItems, + IdentityHashMap producedItems, + IdentityHashMap usedFluids, + IdentityHashMap producedFluids, + Reference2LongMap pendingCraftedStats) { + this.usedItems = usedItems; + this.producedItems = producedItems; + this.usedFluids = usedFluids; + this.producedFluids = producedFluids; + this.pendingCraftedStats = pendingCraftedStats; } - public CompoundTag toTag() { - CompoundTag nbt = new CompoundTag(); - nbt.put("usedItems", toNbt(BuiltInRegistries.ITEM, usedItems)); - nbt.put("producedItems", toNbt(BuiltInRegistries.ITEM, producedItems)); - nbt.put("usedFluids", toNbt(BuiltInRegistries.FLUID, usedFluids)); - nbt.put("producedFluids", toNbt(BuiltInRegistries.FLUID, producedFluids)); - nbt.put("pendingCraftedStats", pendingToNbt(pendingCraftedStats)); - return nbt; + void setDataAndUuid(PlayerStatisticsData data, UUID uuid) { + this.data = data; + this.uuid = uuid; } public void addUsedItems(ItemLike what, long amount) { @@ -143,41 +154,17 @@ public void onPlayerJoin(ServerPlayer player) { } } - private static void readNbt(Registry registry, Map map, CompoundTag tag) { - for (var key : tag.getAllKeys()) { - try { - var val = registry.get(ResourceLocation.parse(key)); - if (val != Items.AIR && val != Fluids.EMPTY) { - map.put(val, new StatisticValue(tag.getCompound(key))); - } - } catch (Exception ignored) {} - } - } - - private static CompoundTag toNbt(Registry registry, Map map) { - CompoundTag tag = new CompoundTag(); - for (var entry : map.entrySet()) { - tag.put(registry.getKey(entry.getKey()).toString(), entry.getValue().toNbt()); - } - return tag; + private static Codec> registryCodec(Registry registry) { + return Codec.unboundedMap(registry.byNameCodec(), StatisticValue.CODEC) + // Ignore errored values + .promotePartial(err -> {}) + .xmap(IdentityHashMap::new, m -> m); } - private static void pendingReadNbt(Reference2LongMap map, CompoundTag tag) { - for (var key : tag.getAllKeys()) { - try { - var val = BuiltInRegistries.ITEM.get(ResourceLocation.parse(key)); - if (val != Items.AIR) { - map.put(val, tag.getLong(key)); - } - } catch (Exception ignored) {} - } - } - - private static CompoundTag pendingToNbt(Reference2LongMap map) { - CompoundTag tag = new CompoundTag(); - for (var entry : map.reference2LongEntrySet()) { - tag.putLong(BuiltInRegistries.ITEM.getKey(entry.getKey()).toString(), entry.getLongValue()); - } - return tag; + private static Codec> pendingCodec() { + return Codec.unboundedMap(BuiltInRegistries.ITEM.byNameCodec(), Codec.LONG) + // Ignore errored values + .promotePartial(err -> {}) + .xmap(Reference2LongOpenHashMap::new, m -> m); } } diff --git a/src/main/java/aztech/modern_industrialization/stats/PlayerStatisticsData.java b/src/main/java/aztech/modern_industrialization/stats/PlayerStatisticsData.java index bd3dc0f6a..84095f802 100644 --- a/src/main/java/aztech/modern_industrialization/stats/PlayerStatisticsData.java +++ b/src/main/java/aztech/modern_industrialization/stats/PlayerStatisticsData.java @@ -29,29 +29,48 @@ import java.util.Objects; import java.util.UUID; import java.util.function.Function; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.UnboundedMapCodec; import net.minecraft.core.HolderLookup; +import net.minecraft.core.UUIDUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.ExtraCodecs; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.saveddata.SavedData; +import net.minecraft.world.level.saveddata.SavedDataType; public class PlayerStatisticsData extends SavedData { - private final Map stats = new HashMap<>(); - private final Function statsFactory = uuid -> new PlayerStatistics(this, uuid); + private static final Codec CODEC = Codec.unboundedMap(UUIDUtil.STRING_CODEC, PlayerStatistics.CODEC) + .xmap(m -> new PlayerStatisticsData(new HashMap<>(m)), psd -> psd.stats); + private static final SavedDataType TYPE = new SavedDataType<>( + "modern_industrialization_player_stats", + PlayerStatisticsData::new, + CODEC); - private PlayerStatisticsData(CompoundTag tag, HolderLookup.Provider registries) { - for (var key : tag.getAllKeys()) { - var uuid = UUID.fromString(key); - stats.put(uuid, new PlayerStatistics(this, uuid, tag.getCompound(key))); - } + public static PlayerStatisticsData get(MinecraftServer server) { + var overworld = server.getLevel(ServerLevel.OVERWORLD); + Objects.requireNonNull(overworld, "Couldn't find overworld"); + return overworld.getDataStorage().computeIfAbsent(TYPE); } - private PlayerStatisticsData() {} + private final HashMap stats; + + private PlayerStatisticsData(HashMap stats) { + this.stats = stats; + } + + private PlayerStatisticsData() { + this(new HashMap<>()); + } public PlayerStatistics get(UUID uuid) { Objects.requireNonNull(uuid); - return stats.computeIfAbsent(uuid, statsFactory); + var ret = stats.computeIfAbsent(uuid, u -> new PlayerStatistics()); + ret.setDataAndUuid(this, uuid); + return ret; } public PlayerStatistics get(Player player) { @@ -62,21 +81,4 @@ public PlayerStatistics get(Player player) { public boolean isDirty() { return true; } - - @Override - public CompoundTag save(CompoundTag tag, HolderLookup.Provider registries) { - for (var entry : stats.entrySet()) { - tag.put(entry.getKey().toString(), entry.getValue().toTag()); - } - return tag; - } - - private static final String NAME = "modern_industrialization_player_stats"; - private static final Factory FACTORY = new Factory<>(PlayerStatisticsData::new, PlayerStatisticsData::new); - - public static PlayerStatisticsData get(MinecraftServer server) { - var overworld = server.getLevel(ServerLevel.OVERWORLD); - Objects.requireNonNull(overworld, "Couldn't find overworld"); - return overworld.getDataStorage().computeIfAbsent(FACTORY, NAME); - } } diff --git a/src/main/java/aztech/modern_industrialization/stats/StatisticValue.java b/src/main/java/aztech/modern_industrialization/stats/StatisticValue.java index 338a95c12..3d946ede1 100644 --- a/src/main/java/aztech/modern_industrialization/stats/StatisticValue.java +++ b/src/main/java/aztech/modern_industrialization/stats/StatisticValue.java @@ -25,9 +25,26 @@ package aztech.modern_industrialization.stats; import aztech.modern_industrialization.util.TickHelper; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.nbt.CompoundTag; public class StatisticValue { + public static final Codec CODEC = RecordCodecBuilder.create(instance -> + instance + .group( + Codec.LONG.fieldOf("at").forGetter(sv -> sv.allTime), + Codec.LONG.fieldOf("p0").forGetter(sv -> sv.pastRates[0]), + Codec.LONG.fieldOf("c0").forGetter(sv -> sv.currentRates[0]), + Codec.INT.fieldOf("r0").forGetter(sv -> sv.remainingTicks[0]), + Codec.LONG.fieldOf("p1").forGetter(sv -> sv.pastRates[1]), + Codec.LONG.fieldOf("c1").forGetter(sv -> sv.currentRates[1]), + Codec.INT.fieldOf("r1").forGetter(sv -> sv.remainingTicks[1]), + Codec.LONG.fieldOf("p2").forGetter(sv -> sv.pastRates[2]), + Codec.LONG.fieldOf("c2").forGetter(sv -> sv.currentRates[2]), + Codec.INT.fieldOf("r2").forGetter(sv -> sv.remainingTicks[2])) + .apply(instance, StatisticValue::new)); + private long allTime = 0; private final long[] pastRates = new long[StatisticsRate.COUNT]; private final long[] currentRates = new long[StatisticsRate.COUNT]; @@ -36,27 +53,20 @@ public class StatisticValue { public StatisticValue() {} - public StatisticValue(CompoundTag nbt) { - allTime = nbt.getLong("at"); - for (var rate : StatisticsRate.values()) { - pastRates[rate.id] = nbt.getLong("p" + rate.id); - currentRates[rate.id] = nbt.getLong("c" + rate.id); - remainingTicks[rate.id] = nbt.getInt("r" + rate.id); - } + public StatisticValue(long at, long p0, long c0, int r0, long p1, long c1, int r1, long p2, long c2, int r2) { + allTime = at; + pastRates[0] = p0; + currentRates[0] = c0; + remainingTicks[0] = r0; + pastRates[1] = p1; + currentRates[1] = c1; + remainingTicks[1] = r1; + pastRates[2] = p2; + currentRates[2] = c2; + remainingTicks[2] = r2; lastTick = TickHelper.getCurrentTick(); } - public CompoundTag toNbt() { - CompoundTag nbt = new CompoundTag(); - nbt.putLong("at", allTime); - for (var rate : StatisticsRate.values()) { - nbt.putLong("p" + rate.id, pastRates[rate.id]); - nbt.putLong("c" + rate.id, currentRates[rate.id]); - nbt.putInt("r" + rate.id, remainingTicks[rate.id]); - } - return nbt; - } - public void add(long toAdd) { updateRates(); diff --git a/src/main/java/aztech/modern_industrialization/test/FluidPipeTests.java b/src/main/java/aztech/modern_industrialization/test/FluidPipeTests.java index 7d1bf0a11..100618d3e 100644 --- a/src/main/java/aztech/modern_industrialization/test/FluidPipeTests.java +++ b/src/main/java/aztech/modern_industrialization/test/FluidPipeTests.java @@ -31,10 +31,11 @@ import aztech.modern_industrialization.pipes.fluid.FluidNetworkNode; import aztech.modern_industrialization.test.framework.MIGameTest; import aztech.modern_industrialization.test.framework.MIGameTestHelper; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.world.level.material.Fluids; public class FluidPipeTests { @@ -113,10 +114,10 @@ public void testTankExtendedThroughput(MIGameTestHelper helper) { // Replace by lava locked tank to make sure it gets ignored helper.destroyBlock(extensionTank); helper.emptyTank(extensionTank, MIMaterials.BRONZE); - var tank = (TankBlockEntity) helper.getBlockEntity(extensionTank); + var tank = helper.getBlockEntity(extensionTank, TankBlockEntity.class); try (var tx = Transaction.openRoot()) { // hacky way to toggle lock :P - tank.insert(FluidVariant.of(Fluids.LAVA), 1000, tx); + tank.insert(FluidResource.of(Fluids.LAVA), 1000, tx); tank.toggleLocked(); } }) diff --git a/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java b/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java index 44bb26d61..f16efb2f8 100644 --- a/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java +++ b/src/main/java/aztech/modern_industrialization/test/GeneratorTests.java @@ -29,7 +29,7 @@ import aztech.modern_industrialization.machines.blockentities.GeneratorMachineBlockEntity; import aztech.modern_industrialization.test.framework.MIGameTest; import aztech.modern_industrialization.test.framework.MIGameTestHelper; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; +import net.neoforged.neoforge.transfer.transaction.Transaction; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.registries.BuiltInRegistries; @@ -45,10 +45,10 @@ public void testGeneratorEmptiesEuBuffer(MIGameTestHelper helper) { var lvDieselGeneratorBlock = BuiltInRegistries.BLOCK.getOptional(MI.id("lv_diesel_generator")).orElseThrow(); helper.setBlock(generatorPos, lvDieselGeneratorBlock); - var dieselGenerator = (GeneratorMachineBlockEntity) helper.getBlockEntity(generatorPos); + var dieselGenerator = helper.getBlockEntity(generatorPos, GeneratorMachineBlockEntity.class); try (var tx = Transaction.openRoot()) { - long inserted = dieselGenerator.getInventory().fluidStorage.insert(MIFluids.BIODIESEL.variant(), 1, tx); + long inserted = dieselGenerator.getInventory().fluidStorage.insert(MIFluids.BIODIESEL.resource(), 1, tx); helper.assertValueEqual(inserted, 1L, "inserted biodiesel"); tx.commit(); } diff --git a/src/main/java/aztech/modern_industrialization/test/MultiblockTests.java b/src/main/java/aztech/modern_industrialization/test/MultiblockTests.java index 405e2e9a3..42375f8f1 100644 --- a/src/main/java/aztech/modern_industrialization/test/MultiblockTests.java +++ b/src/main/java/aztech/modern_industrialization/test/MultiblockTests.java @@ -35,8 +35,8 @@ import net.minecraft.world.level.block.ComparatorBlock; import net.minecraft.world.level.block.RedStoneWireBlock; import net.minecraft.world.level.material.Fluids; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.transaction.Transaction; public class MultiblockTests { @MIGameTest @@ -44,7 +44,7 @@ public void largeTankEmitsRedstone(MIGameTestHelper helper) { var controllerPos = new BlockPos(3, 1, 2); helper.setBlock(controllerPos, MultiblockMachines.LARGE_TANK.asBlock()); - LargeTankMultiblockBlockEntity largeTank = helper.getBlockEntity(controllerPos); + LargeTankMultiblockBlockEntity largeTank = helper.getBlockEntity(controllerPos, LargeTankMultiblockBlockEntity.class); largeTank.createShapeMatcher().buildMultiblock(helper.getLevel()); var comparatorPos0 = new BlockPos(3, 1, 1); @@ -72,7 +72,10 @@ public void largeTankEmitsRedstone(MIGameTestHelper helper) { helper.assertBlockProperty(redstonePos, RedStoneWireBlock.POWER, 0); }) .thenExecute(() -> { - largeTank.getExposedFluidHandler().fill(new FluidStack(Fluids.WATER, 1), IFluidHandler.FluidAction.EXECUTE); + try (var tx = Transaction.openRoot()) { + largeTank.getExposedFluidHandler().insert(FluidResource.of(Fluids.WATER), 1, tx); + tx.commit(); + } }) .thenIdle(3) // redstone update time (gametests run after the level tick so the delay is 1 more than usual) .thenExecute(() -> { @@ -82,7 +85,9 @@ public void largeTankEmitsRedstone(MIGameTestHelper helper) { helper.assertBlockProperty(redstonePos, RedStoneWireBlock.POWER, 1); }) .thenExecute(() -> { - largeTank.getExposedFluidHandler().fill(new FluidStack(Fluids.WATER, Integer.MAX_VALUE), IFluidHandler.FluidAction.EXECUTE); + try (var tx = Transaction.openRoot()) { + largeTank.getExposedFluidHandler().insert(FluidResource.of(Fluids.WATER), Integer.MAX_VALUE, tx); + } }) .thenIdle(3) // redstone update time .thenExecute(() -> { diff --git a/src/main/java/aztech/modern_industrialization/test/framework/MIGameTestHelper.java b/src/main/java/aztech/modern_industrialization/test/framework/MIGameTestHelper.java index 2dc8e3312..41f1efc00 100644 --- a/src/main/java/aztech/modern_industrialization/test/framework/MIGameTestHelper.java +++ b/src/main/java/aztech/modern_industrialization/test/framework/MIGameTestHelper.java @@ -34,17 +34,20 @@ import aztech.modern_industrialization.pipes.api.PipeNetworkNode; import aztech.modern_industrialization.pipes.api.PipeNetworkType; import aztech.modern_industrialization.pipes.impl.PipeBlockEntity; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import java.util.function.Consumer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.gametest.framework.GameTestInfo; +import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.Fluid; import net.neoforged.neoforge.capabilities.BlockCapability; import net.neoforged.neoforge.capabilities.Capabilities; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.fluid.FluidResource; +import net.neoforged.neoforge.transfer.fluid.FluidUtil; import org.jspecify.annotations.Nullable; public class MIGameTestHelper extends GameTestHelper { @@ -52,10 +55,15 @@ public MIGameTestHelper(GameTestInfo testInfo) { super(testInfo); } + // TODO 26.1 - neoforge should have it + public void fail(String message, BlockPos pos) { + fail(Component.literal(message), pos); + } + public void creativeTank(BlockPos pos, Fluid fluid) { setBlock(pos, MIBlock.CREATIVE_TANK.get()); - var tank = (CreativeTankBlockEntity) getBlockEntity(pos); - tank.setFluid(FluidVariant.of(fluid)); + var tank = getBlockEntity(pos, CreativeTankBlockEntity.class); + tank.setFluid(FluidResource.of(fluid)); } public void emptyTank(BlockPos pos) { @@ -74,15 +82,15 @@ public void pipe(BlockPos pos, PipeNetworkType type, Consumer T requireCapability(BlockCapability cap, BlockPos pos, C context) { var ret = getLevel().getCapability(cap, absolutePos(pos), context); if (ret == null) { @@ -101,19 +110,20 @@ public PipeNetworkNode getPipeNode(BlockPos pos, PipeNetworkType type) { } public void assertFluid(BlockPos pos, Fluid fluid, int amount) { - var fluidHandler = requireCapability(Capabilities.FluidHandler.BLOCK, pos, null); + var fluidHandler = requireCapability(Capabilities.Fluid.BLOCK, pos, null); boolean foundAny = false; var fluidName = BuiltInRegistries.FLUID.getKey(fluid); - for (int i = 0; i < fluidHandler.getTanks(); ++i) { - var stack = fluidHandler.getFluidInTank(i); - if (stack.isEmpty()) { + for (int i = 0; i < fluidHandler.size(); ++i) { + var storedResource = fluidHandler.getResource(i); + int storedAmount = fluidHandler.getAmountAsInt(i); + if (ResourceHandlerUtil.isEmpty(storedResource, storedAmount)) { continue; } - if (stack.is(fluid) && stack.getAmount() == amount) { + if (storedResource.is(fluid) && storedAmount == amount) { foundAny = true; continue; } - fail("Expected fluid %s and amount %d, got %s".formatted(fluidName, amount, stack), pos); + fail("Expected fluid %s and amount %d, got %dx%s".formatted(fluidName, amount, storedAmount, storedResource), pos); } if (!foundAny) { fail("Expected fluid %s and amount %d, got nothing".formatted(fluidName, amount), pos); @@ -121,9 +131,9 @@ public void assertFluid(BlockPos pos, Fluid fluid, int amount) { } public void assertNoFluid(BlockPos pos) { - var fluidHandler = requireCapability(Capabilities.FluidHandler.BLOCK, pos, null); - for (int i = 0; i < fluidHandler.getTanks(); ++i) { - var stack = fluidHandler.getFluidInTank(i); + var fluidHandler = requireCapability(Capabilities.Fluid.BLOCK, pos, null); + for (int i = 0; i < fluidHandler.size(); ++i) { + var stack = FluidUtil.getStack(fluidHandler, i); if (!stack.isEmpty()) { fail("Expected no fluid, got %s".formatted(stack), pos); } @@ -132,7 +142,7 @@ public void assertNoFluid(BlockPos pos) { public void assertEnergy(BlockPos pos, long energy, @Nullable Direction side) { var miEnergyHandler = requireCapability(EnergyApi.SIDED, pos, side); - long storedEnergy = miEnergyHandler.getAmount(); + long storedEnergy = miEnergyHandler.getAmountAsLong(); if (storedEnergy != energy) { fail("Expected energy to be " + energy + ", was " + storedEnergy, pos); } diff --git a/src/main/java/aztech/modern_industrialization/test/framework/MIGameTests.java b/src/main/java/aztech/modern_industrialization/test/framework/MIGameTests.java index 99773d71b..cc3a539ce 100644 --- a/src/main/java/aztech/modern_industrialization/test/framework/MIGameTests.java +++ b/src/main/java/aztech/modern_industrialization/test/framework/MIGameTests.java @@ -24,16 +24,10 @@ package aztech.modern_industrialization.test.framework; -import aztech.modern_industrialization.MI; import aztech.modern_industrialization.test.FluidPipeTests; import aztech.modern_industrialization.test.GeneratorTests; import aztech.modern_industrialization.test.MultiblockTests; -import java.util.ArrayList; import java.util.List; -import java.util.Locale; -import net.minecraft.gametest.framework.GameTestGenerator; -import net.minecraft.gametest.framework.StructureUtils; -import net.minecraft.gametest.framework.TestFunction; public final class MIGameTests { private MIGameTests() {} @@ -43,40 +37,41 @@ private MIGameTests() {} GeneratorTests.class, MultiblockTests.class); - @GameTestGenerator - public static List generateTests() { - var result = new ArrayList(); - - for (var testClass : TEST_CLASSES) { - for (var testMethod : testClass.getMethods()) { - var gametest = testMethod.getAnnotation(MIGameTest.class); - if (gametest == null) { - continue; - } - - result.add(new TestFunction( - gametest.batch(), - MI.ID + "." + testMethod.getName().toLowerCase(Locale.ROOT), - MI.id("empty").toString(), - StructureUtils.getRotationForRotationSteps(gametest.rotationSteps()), - gametest.timeoutTicks(), - gametest.setupTicks(), - gametest.required(), - gametest.manualOnly(), - gametest.attempts(), - gametest.requiredSuccesses(), - gametest.skyAccess(), - gameTestHelper -> { - try { - var testObject = testClass.getConstructor().newInstance(); - testMethod.invoke(testObject, new MIGameTestHelper(gameTestHelper.testInfo)); - } catch (ReflectiveOperationException e) { - throw new RuntimeException(e); - } - })); - } - } - - return result; - } + // TODO 26.1 +// @GameTestGenerator +// public static List generateTests() { +// var result = new ArrayList(); +// +// for (var testClass : TEST_CLASSES) { +// for (var testMethod : testClass.getMethods()) { +// var gametest = testMethod.getAnnotation(MIGameTest.class); +// if (gametest == null) { +// continue; +// } +// +// result.add(new TestFunction( +// gametest.batch(), +// MI.ID + "." + testMethod.getName().toLowerCase(Locale.ROOT), +// MI.id("empty").toString(), +// StructureUtils.getRotationForRotationSteps(gametest.rotationSteps()), +// gametest.timeoutTicks(), +// gametest.setupTicks(), +// gametest.required(), +// gametest.manualOnly(), +// gametest.attempts(), +// gametest.requiredSuccesses(), +// gametest.skyAccess(), +// gameTestHelper -> { +// try { +// var testObject = testClass.getConstructor().newInstance(); +// testMethod.invoke(testObject, new MIGameTestHelper(gameTestHelper.testInfo)); +// } catch (ReflectiveOperationException e) { +// throw new RuntimeException(e); +// } +// })); +// } +// } +// +// return result; +// } } diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/SlotFluidHandler.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/SlotFluidHandler.java deleted file mode 100644 index 127c6bec5..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/SlotFluidHandler.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import com.google.common.primitives.Ints; -import net.neoforged.neoforge.fluids.FluidStack; -import net.neoforged.neoforge.fluids.capability.IFluidHandler; - -public class SlotFluidHandler implements IFluidHandler { - protected final SingleSlotStorage storage; - - public SlotFluidHandler(SingleSlotStorage storage) { - this.storage = storage; - } - - @Override - public int getTanks() { - return 1; - } - - @Override - public FluidStack getFluidInTank(int slot) { - return storage.getResource().toStack(Ints.saturatedCast(storage.getAmount())); - } - - @Override - public int fill(FluidStack stack, FluidAction action) { - if (disallowIo() || stack.isEmpty()) { - return 0; - } - try (var tx = Transaction.hackyOpen()) { - var inserted = storage.insert(FluidVariant.of(stack), stack.getAmount(), tx); - if (action.execute()) { - tx.commit(); - } - return (int) inserted; - } - } - - @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - if (disallowIo() || resource.isEmpty() || storage.isResourceBlank() || !storage.getResource().matches(resource)) { - return FluidStack.EMPTY; - } - return drain(resource.getAmount(), action); - } - - @Override - public FluidStack drain(int amount, FluidAction action) { - if (disallowIo() || amount <= 0) { - return FluidStack.EMPTY; - } - try (var tx = Transaction.hackyOpen()) { - var resource = storage.getResource(); - if (resource.isBlank()) { - return FluidStack.EMPTY; - } - var extracted = storage.extract(resource, amount, tx); - if (action.execute()) { - tx.commit(); - } - return extracted == 0 ? FluidStack.EMPTY : resource.toStack((int) extracted); - } - } - - @Override - public int getTankCapacity(int slot) { - return Ints.saturatedCast(storage.getCapacity()); - } - - @Override - public boolean isFluidValid(int slot, FluidStack stack) { - return true; - } - - public SingleSlotStorage storage() { - return storage; - } - - protected boolean disallowIo() { - return false; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/SlotItemHandler.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/SlotItemHandler.java deleted file mode 100644 index 614f0776f..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/SlotItemHandler.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import com.google.common.primitives.Ints; -import net.minecraft.world.item.ItemStack; -import net.neoforged.neoforge.items.IItemHandler; - -public record SlotItemHandler(SingleSlotStorage storage) implements IItemHandler { - @Override - public int getSlots() { - return 1; - } - - @Override - public ItemStack getStackInSlot(int slot) { - return storage.getResource().toStack(Ints.saturatedCast(storage.getAmount())); - } - - @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if (stack.isEmpty()) { - return stack; - } - try (var tx = Transaction.hackyOpen()) { - var inserted = storage.insert(ItemVariant.of(stack), stack.getCount(), tx); - if (!simulate) { - tx.commit(); - } - return inserted == 0 ? stack : stack.copyWithCount(stack.getCount() - (int) inserted); - } - } - - @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - if (amount <= 0) { - return ItemStack.EMPTY; - } - try (var tx = Transaction.hackyOpen()) { - var resource = storage.getResource(); - if (resource.isBlank()) { - return ItemStack.EMPTY; - } - var extracted = storage.extract(resource, amount, tx); - if (!simulate) { - tx.commit(); - } - return extracted == 0 ? ItemStack.EMPTY : resource.toStack((int) extracted); - } - } - - @Override - public int getSlotLimit(int slot) { - return Ints.saturatedCast(storage.getCapacity()); - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - return true; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/package-info.java deleted file mode 100644 index cb2cf8cda..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/bridge/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.bridge; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/FluidVariant.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/FluidVariant.java deleted file mode 100644 index 591f6d474..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/FluidVariant.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.TransferApiImpl; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.fluid.FluidVariantImpl; -import com.mojang.serialization.Codec; -import java.util.Optional; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtOps; -import net.minecraft.nbt.Tag; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.util.ExtraCodecs; -import net.minecraft.world.level.material.FlowingFluid; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; -import net.neoforged.neoforge.fluids.FluidStack; -import org.jetbrains.annotations.ApiStatus; - -/** - * An immutable association of a still fluid and an optional NBT tag. - * - *

- * Do not extend this class. Use {@link #of(Fluid)} and {@link #of(Fluid, NbtCompound)} to create instances. - * - *

- * {@link aztech.modern_industrialization.thirdparty.fabrictransfer.api.client.fluid.FluidVariantRendering} can be used for client-side rendering of - * fluid variants. - * - *

- * Fluid variants must always be compared with {@code equals}, never by reference! - * {@code hashCode} is guaranteed to be correct and constant time independently of the size of the NBT. - */ -@ApiStatus.NonExtendable -public interface FluidVariant extends TransferVariant { - Codec CODEC = ExtraCodecs.optionalEmptyMap( - FluidStack.fixedAmountCodec(1).xmap(FluidVariant::of, fv -> fv.toStack(1))) - .xmap(o -> o.orElse(FluidVariant.blank()), fv -> fv.isBlank() ? Optional.empty() : Optional.of(fv)); - StreamCodec STREAM_CODEC = FluidStack.OPTIONAL_STREAM_CODEC.map(FluidVariant::of, fv -> fv.toStack(1)); - - /** - * Retrieve a blank FluidVariant. - */ - static FluidVariant blank() { - return of(Fluids.EMPTY); - } - - /** - * Retrieve an ItemVariant with the item and tag of a stack. - */ - static FluidVariant of(FluidStack stack) { - return FluidVariantImpl.of(stack); - } - - /** - * Retrieve a FluidVariant with a fluid, and a {@code null} tag. - * - *

- * The flowing and still variations of {@linkplain FlowingFluid flowable fluids} - * are normalized to always refer to the still variant. For example, - * {@code FluidVariant.of(Fluids.FLOWING_WATER).getFluid() == Fluids.WATER}. - */ - static FluidVariant of(Fluid fluid) { - return FluidVariantImpl.of(fluid); - } - - /** - * Return true if the item and tag of this variant match those of the passed stack, and false otherwise. - */ - boolean matches(FluidStack stack); - - /** - * Return the fluid of this variant. - */ - default Fluid getFluid() { - return getObject(); - } - - /** - * Create a new fluid stack from this variant. - */ - FluidStack toStack(int count); - - @Override - default Tag toNbt(HolderLookup.Provider registries) { - return CODEC.encodeStart(registries.createSerializationContext(NbtOps.INSTANCE), this).getOrThrow(); - } - - /** - * Deserialize a variant from an NBT compound tag, assuming it was serialized using {@link #toNbt}. - * - *

- * If an error occurs during deserialization, it will be logged with the DEBUG level, and a blank variant will be returned. - */ - static FluidVariant fromNbt(CompoundTag nbt, HolderLookup.Provider registries) { - return CODEC.parse(registries.createSerializationContext(NbtOps.INSTANCE), nbt).resultOrPartial(TransferApiImpl.LOGGER::error) - .orElse(blank()); - } - - @Override - default void toPacket(RegistryFriendlyByteBuf buf) { - STREAM_CODEC.encode(buf, this); - } - - /** - * Read a variant from a packet byte buffer, assuming it was serialized using {@link #toPacket}. - */ - static FluidVariant fromPacket(RegistryFriendlyByteBuf buf) { - return STREAM_CODEC.decode(buf); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/FluidVariantAttributes.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/FluidVariantAttributes.java deleted file mode 100644 index b160ff21a..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/FluidVariantAttributes.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid; - -import net.minecraft.network.chat.Component; - -/** - * Common fluid variant attributes, accessible both client-side and server-side. - */ -public final class FluidVariantAttributes { - private FluidVariantAttributes() {} - - /** - * Return the name that should be used for the passed fluid variant. - */ - public static Component getName(FluidVariant variant) { - return variant.getFluid().getFluidType().getDescription(variant.toStack(1)); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/package-info.java deleted file mode 100644 index 7391ad7a2..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/fluid/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/item/ItemVariant.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/item/ItemVariant.java deleted file mode 100644 index 09c93bce1..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/item/ItemVariant.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.item; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.TransferApiImpl; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.item.ItemVariantImpl; -import com.mojang.serialization.Codec; -import java.util.Optional; -import java.util.function.Predicate; -import net.minecraft.core.HolderLookup; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.NbtOps; -import net.minecraft.nbt.Tag; -import net.minecraft.network.RegistryFriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.util.ExtraCodecs; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.ItemLike; -import org.jetbrains.annotations.ApiStatus; - -/** - * An immutable count-less ItemStack, i.e. an immutable association of an item and an optional NBT compound tag. - * - *

- * Do not implement, use the static {@code of(...)} functions instead. - */ -@ApiStatus.NonExtendable -public interface ItemVariant extends TransferVariant { - Codec CODEC = ExtraCodecs.optionalEmptyMap( - ItemStack.SINGLE_ITEM_CODEC.xmap(ItemVariant::of, ItemVariant::toStack)) - .xmap(o -> o.orElse(ItemVariant.blank()), fv -> fv.isBlank() ? Optional.empty() : Optional.of(fv)); - StreamCodec STREAM_CODEC = ItemStack.OPTIONAL_STREAM_CODEC.map(ItemVariant::of, ItemVariant::toStack); - - /** - * Retrieve a blank ItemVariant. - */ - static ItemVariant blank() { - return of(Items.AIR); - } - - /** - * Retrieve an ItemVariant with the item and tag of a stack. - */ - static ItemVariant of(ItemStack stack) { - return ItemVariantImpl.of(stack); - } - - /** - * Retrieve an ItemVariant with an item and without a tag. - */ - static ItemVariant of(ItemLike item) { - return ItemVariantImpl.of(item.asItem()); - } - - /** - * Return true if the item and tag of this variant match those of the passed stack, and false otherwise. - */ - boolean matches(ItemStack stack); - - /** - * Tests an {@link ItemStack} predicate with the inner stack. - * - * @param predicate Predicate to perform the test with - * @return {@code true} if the test passed - */ - boolean test(Predicate predicate); - - /** - * Return the item of this variant. - */ - default Item getItem() { - return getObject(); - } - - /** - * Create a new item stack with count 1 from this variant. - */ - default ItemStack toStack() { - return toStack(1); - } - - /** - * Create a new item stack from this variant. - * - * @param count The count of the returned stack. It may lead to counts higher than maximum stack size. - */ - ItemStack toStack(int count); - - int getMaxStackSize(); - - @Override - default Tag toNbt(HolderLookup.Provider registries) { - return CODEC.encodeStart(registries.createSerializationContext(NbtOps.INSTANCE), this).getOrThrow(); - } - - /** - * Deserialize a variant from an NBT compound tag, assuming it was serialized using - * {@link #toNbt}. If an error occurs during deserialization, it will be logged - * with the DEBUG level, and a blank variant will be returned. - */ - static ItemVariant fromNbt(CompoundTag nbt, HolderLookup.Provider registries) { - return CODEC.parse(registries.createSerializationContext(NbtOps.INSTANCE), nbt).resultOrPartial(TransferApiImpl.LOGGER::error) - .orElse(blank()); - } - - @Override - default void toPacket(RegistryFriendlyByteBuf buf) { - STREAM_CODEC.encode(buf, this); - } - - /** - * Write a variant from a packet byte buffer, assuming it was serialized using - * {@link #toPacket}. - */ - static ItemVariant fromPacket(RegistryFriendlyByteBuf buf) { - return STREAM_CODEC.decode(buf); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/item/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/item/package-info.java deleted file mode 100644 index f4994f593..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/item/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.item; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/SlottedStorage.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/SlottedStorage.java deleted file mode 100644 index 6d3bc7037..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/SlottedStorage.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.TransferApiImpl; -import java.util.List; -import org.jetbrains.annotations.UnmodifiableView; - -/** - * A {@link Storage} implementation made of indexed slots. - * - *

- * Please note that some storages may not implement this interface. - * It is up to the storage implementation to decide whether to implement this interface or not. - * Checking whether a storage is slotted can be done using {@code instanceof}. - * - * @param The type of the stored resources. - */ -public interface SlottedStorage extends Storage { - /** - * Retrieve the number of slots in this storage. - */ - int getSlotCount(); - - /** - * Retrieve a specific slot of this storage. - * - * @throws IndexOutOfBoundsException If the slot index is out of bounds. - */ - SingleSlotStorage getSlot(int slot); - - /** - * Retrieve a list containing all the slots of this storage. The list must not be modified. - * - *

- * This function can be used to interface with code that requires a slot list, - * for example {@link StorageUtil#insertStacking} or {@link ContainerItemContext#getAdditionalSlots()}. - * - *

- * It is guaranteed that calling this function is fast. - * The default implementation returns a view over the storage that delegates to {@link #getSlotCount} and {@link #getSlot}. - */ - @UnmodifiableView - default List> getSlots() { - return TransferApiImpl.makeListView(this); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/Storage.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/Storage.java deleted file mode 100644 index 4fb9a03c1..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/Storage.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.TransferApiImpl; -import com.google.common.collect.Iterators; -import java.util.Iterator; - -/** - * An object that can store resources. - * - *

- * Most of the documentation that follows is quite technical. - * For an easier introduction to the API, see the wiki page. - * - *

- *

    - *
  • {@link #supportsInsertion} and {@link #supportsExtraction} can be used to tell if insertion and extraction - * functionality are possibly supported by this storage.
  • - *
  • {@link #insert} and {@link #extract} can be used to insert or extract resources from this storage.
  • - *
  • {@link #iterator} can be used to inspect the contents of this storage.
  • - *
  • {@link #getVersion()} can be used to quickly check if a storage has changed, without having to rescan its contents.
  • - *
- * - *

- * Users that wish to implement this interface can use the helpers in the {@code base} package: - *

    - *
  • {@link CombinedStorage} can be used to combine multiple instances, for example to combine multiple "slots" in one big storage.
  • - *
  • {@link ExtractionOnlyStorage} and {@link InsertionOnlyStorage} can be used when only extraction or insertion is needed.
  • - *
  • Resource-specific base implementations may also be available. - * For example, Fabric API provides {@link SingleVariantStorage} to accelerate implementations of transfer variant storages.
  • - *
- * - *

- * Important note: Unless otherwise specified, all transfer functions take a non-blank resource - * and a non-negative maximum amount as parameters. - * Implementations are encouraged to throw an exception if these preconditions are violated. - * {@link StoragePreconditions} can be used for these checks. - * - *

- * For transfer functions, the returned amount must be non-negative, and smaller than the passed maximum amount. - * Consumers of these functions are encourage to throw an exception if these postconditions are violated. - * - * @param The type of the stored resources. - * @see Transaction - */ -public interface Storage extends Iterable> { - /** - * Return an empty storage. - */ - @SuppressWarnings("unchecked") - static Storage empty() { - return (Storage) TransferApiImpl.EMPTY_STORAGE; - } - - /** - * Return false if calling {@link #insert} will absolutely always return 0, or true otherwise or in doubt. - * - *

- * Note: This function is meant to be used by pipes or other devices that can transfer resources to know if - * they should interact with this storage at all. - */ - default boolean supportsInsertion() { - return true; - } - - /** - * Try to insert up to some amount of a resource into this storage. - * - * @param resource The resource to insert. May not be blank. - * @param maxAmount The maximum amount of resource to insert. May not be negative. - * @param transaction The transaction this operation is part of. - * @return A non-negative integer not greater than maxAmount: the amount that was inserted. - */ - long insert(T resource, long maxAmount, TransactionContext transaction); - - /** - * Return false if calling {@link #extract} will absolutely always return 0, or true otherwise or in doubt. - * - *

- * Note: This function is meant to be used by pipes or other devices that can transfer resources to know if - * they should interact with this storage at all. - */ - default boolean supportsExtraction() { - return true; - } - - /** - * Try to extract up to some amount of a resource from this storage. - * - * @param resource The resource to extract. May not be blank. - * @param maxAmount The maximum amount of resource to extract. May not be negative. - * @param transaction The transaction this operation is part of. - * @return A non-negative integer not greater than maxAmount: the amount that was extracted. - */ - long extract(T resource, long maxAmount, TransactionContext transaction); - - /** - * Iterate through the contents of this storage. - * Every visited {@link StorageView} represents a stored resource and an amount. - * The iterator doesn't guarantee that a single resource only occurs once during an iteration. - * Calling {@linkplain Iterator#remove remove} on the iterator is not allowed. - * - *

- * {@link #insert} and {@link #extract} may be called safely during iteration. - * Extractions should be visible to an open iterator, but insertions are not required to. - * In particular, inventories with a fixed amount of slots may wish to make insertions visible to iterators, - * but inventories with a dynamic or very large amount of slots should not do that to ensure timely termination of - * the iteration. - * - *

- * If a modification is made to the storage during iteration, the iterator might become invalid at the end of the outermost transaction. - * In particular, if multiple storage views are extracted from, the entire iteration should be wrapped in a transaction. - * - * @return An iterator over the contents of this storage. Calling remove on the iterator is not allowed. - */ - @Override - Iterator> iterator(); - - /** - * Same as {@link #iterator()}, but the iterator is guaranteed to skip over empty views, - * i.e. views that {@linkplain StorageView#isResourceBlank() contain blank resources} or have a zero {@linkplain StorageView#getAmount() amount}. - * - *

- * This can provide a large performance benefit over {@link #iterator()} if the caller is only interested in non-empty views, - * for example because it is trying to extract resources from the storage. - * - *

- * This function should only be overridden if the storage is able to provide an optimized iterator over non-empty views, - * for example because it is keeping an index of non-empty views. - * Otherwise, the default implementation simply calls {@link #iterator()} and filters out empty views. - * - *

- * When implementing this function, note that the guarantees of {@link #iterator()} still apply. - * In particular, {@link #insert} and {@link #extract} may be called safely during iteration. - * - * @return An iterator over the non-empty views of this storage. Calling remove on the iterator is not allowed. - */ - default Iterator> nonEmptyIterator() { - return Iterators.filter(iterator(), view -> view.getAmount() > 0 && !view.isResourceBlank()); - } - - /** - * Convenient helper to get an {@link Iterable} over the {@linkplain #nonEmptyIterator() non-empty views} of this storage, for use in for-each - * loops. - * - *

- * - *

-     * {@code
-     * for (StorageView view : storage.nonEmptyViews()) {
-     *     // Do something with the view
-     * }
-     * }
-     * 
- */ - default Iterable> nonEmptyViews() { - return this::nonEmptyIterator; - } - - /** - * Return an integer representing the current version of this storage instance to allow for fast change detection: - * if the version hasn't changed since the last time, and the storage instance is the same, the storage has the same contents. - * This can be used to avoid re-scanning the contents of the storage, which could be an expensive operation. - * It may be used like that: - * - *
-     * {@code
-     * // Store storage and version:
-     * Storage firstStorage = // ...
-     * long firstVersion = firstStorage.getVersion();
-     *
-     * // Later, check if the secondStorage is the unchanged firstStorage:
-     * Storage secondStorage = // ...
-     * long secondVersion = secondStorage.getVersion();
-     * // We must check firstStorage == secondStorage first, otherwise versions may not be compared.
-     * if (firstStorage == secondStorage && firstVersion == secondVersion) {
-     *     // storage contents are the same.
-     * } else {
-     *     // storage contents might have changed.
-     * }
-     * }
-     * 
- * - *

- * The version must change if the state of the storage has changed, - * generally after a direct modification, or at the end of a modifying transaction. - * The version may also change even if the state of the storage hasn't changed. - * - *

- * It is not valid to call this during a transaction, - * and implementations are encouraged to throw an exception if that happens. - */ - default long getVersion() { - switch (Transaction.getLifecycle()) { - case OPEN, CLOSING -> { - throw new IllegalStateException("getVersion() may not be called during a transaction."); - } - } - - return TransferApiImpl.version.getAndIncrement(); - } - - /** - * Return a class instance of this interface with the desired generic type, - * to be used for easier registration with API lookups. - */ - @SuppressWarnings("unchecked") - static Class> asClass() { - return (Class>) (Object) Storage.class; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StoragePreconditions.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StoragePreconditions.java deleted file mode 100644 index f6ef84507..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StoragePreconditions.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -/** - * Preconditions that can be used when working with storages. - * - *

- * In particular, {@link #notNegative} or {@link #notBlankNotNegative} can be used by implementations of - * {@link Storage#insert} and {@link Storage#extract} to fail-fast if the arguments are invalid. - */ -public final class StoragePreconditions { - /** - * Ensure that the passed transfer variant is not blank. - * - * @throws IllegalArgumentException If the variant is blank. - */ - public static void notBlank(TransferVariant variant) { - if (variant.isBlank()) { - throw new IllegalArgumentException("Transfer variant may not be blank."); - } - } - - /** - * Ensure that the passed amount is not negative. That is, it must be {@code >= 0}. - * - * @throws IllegalArgumentException If the amount is negative. - */ - public static void notNegative(long amount) { - if (amount < 0) { - throw new IllegalArgumentException("Amount may not be negative, but it is: " + amount); - } - } - - /** - * Check both for a not blank transfer variant and a not negative amount. - */ - public static void notBlankNotNegative(TransferVariant variant, long amount) { - notBlank(variant); - notNegative(amount); - } - - private StoragePreconditions() {} -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StorageUtil.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StorageUtil.java deleted file mode 100644 index 0febabb9c..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StorageUtil.java +++ /dev/null @@ -1,437 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.ResourceAmount; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.Transaction; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; -import java.util.List; -import java.util.Objects; -import java.util.function.Predicate; -import net.minecraft.CrashReport; -import net.minecraft.ReportedException; -import net.minecraft.util.Mth; -import org.jspecify.annotations.Nullable; - -/** - * Helper functions to work with {@link Storage}s. - * - *

- * Note that the functions that take a predicate iterate over the entire inventory in the worst case. - * If the resource is known, there will generally be a more performance efficient way. - */ -public final class StorageUtil { - private StorageUtil() {} - - /** - * Move resources between two storages, matching the passed filter, and return the amount that was successfully transferred. - * - *

- * Here is a usage example with fluid variant storages: - * - *

-     * {
-     *     @code
-     * // Source
-     *     Storage source;
-     * // Target
-     *     Storage target;
-     *
-     * // Move up to one bucket in total from source to target, outside of a transaction:
-     *     long amountMoved = StorageUtil.move(source, target, variant -> true, FluidConstants.BUCKET, null);
-     * // Move exactly one bucket in total, only of water:
-     *     try (Transaction transaction = Transaction.openRoot()) {
-     *         Predicate filter = variant -> variant.isOf(Fluids.WATER);
-     *         long waterMoved = StorageUtil.move(source, target, filter, FluidConstants.BUCKET, transaction);
-     *         if (waterMoved == FluidConstants.BUCKET) {
-     *             // Only commit if exactly one bucket was moved (no less!).
-     *             transaction.commit();
-     *         }
-     *     }
-     * }
-     * 
- * - * @param from The source storage. May be null. - * @param to The target storage. May be null. - * @param filter The filter for transferred resources. - * Only resources for which this filter returns {@code true} will be transferred. - * This filter will never be tested with a blank resource, and filters are encouraged to throw an - * exception if this guarantee is violated. - * @param maxAmount The maximum amount that will be transferred. - * @param transaction The transaction this transfer is part of, or {@code null} if a transaction should be opened just for this transfer. - * @param The type of resources to move. - * @return The total amount of resources that was successfully transferred. - * @throws IllegalStateException If no transaction is passed and a transaction is already active on the current thread. - */ - public static long move(@Nullable Storage from, @Nullable Storage to, Predicate filter, long maxAmount, - @Nullable TransactionContext transaction) { - Objects.requireNonNull(filter, "Filter may not be null"); - if (from == null || to == null) - return 0; - - long totalMoved = 0; - - try (Transaction iterationTransaction = Transaction.open(transaction)) { - for (StorageView view : from.nonEmptyViews()) { - T resource = view.getResource(); - if (!filter.test(resource)) - continue; - - // check how much can be extracted - long maxExtracted = simulateExtract(view, resource, maxAmount - totalMoved, iterationTransaction); - - try (Transaction transferTransaction = Transaction.open(iterationTransaction)) { - // check how much can be inserted - long accepted = to.insert(resource, maxExtracted, transferTransaction); - - // extract it, or rollback if the amounts don't match - if (view.extract(resource, accepted, transferTransaction) == accepted) { - totalMoved += accepted; - transferTransaction.commit(); - } - } - - if (maxAmount == totalMoved) { - // early return if nothing can be moved anymore - iterationTransaction.commit(); - return totalMoved; - } - } - - iterationTransaction.commit(); - } catch (Exception e) { - CrashReport report = CrashReport.forThrowable(e, "Moving resources between storages"); - report.addCategory("Move details") - .setDetail("Input storage", from::toString) - .setDetail("Output storage", to::toString) - .setDetail("Filter", filter::toString) - .setDetail("Max amount", maxAmount) - .setDetail("Transaction", transaction); - throw new ReportedException(report); - } - - return totalMoved; - } - - /** - * Convenient helper to simulate an insertion, i.e. get the result of insert without modifying any state. - * The passed transaction may be null if a new transaction should be opened for the simulation. - * - * @see Storage#insert - */ - public static long simulateInsert(Storage storage, T resource, long maxAmount, @Nullable TransactionContext transaction) { - try (Transaction simulateTransaction = Transaction.open(transaction)) { - return storage.insert(resource, maxAmount, simulateTransaction); - } - } - - /** - * Convenient helper to simulate an extraction, i.e. get the result of extract without modifying any state. - * The passed transaction may be null if a new transaction should be opened for the simulation. - * - * @see Storage#insert - */ - public static long simulateExtract(Storage storage, T resource, long maxAmount, @Nullable TransactionContext transaction) { - try (Transaction simulateTransaction = Transaction.open(transaction)) { - return storage.extract(resource, maxAmount, simulateTransaction); - } - } - - /** - * Convenient helper to simulate an extraction, i.e. get the result of extract without modifying any state. - * The passed transaction may be null if a new transaction should be opened for the simulation. - * - * @see Storage#insert - */ - public static long simulateExtract(StorageView storageView, T resource, long maxAmount, @Nullable TransactionContext transaction) { - try (Transaction simulateTransaction = Transaction.open(transaction)) { - return storageView.extract(resource, maxAmount, simulateTransaction); - } - } - - /** - * Convenient helper to simulate an extraction, i.e. get the result of extract without modifying any state. - * The passed transaction may be null if a new transaction should be opened for the simulation. - * - * @see Storage#insert - * @apiNote This function handles the method overload conflict for objects that implement both {@link Storage} and {@link StorageView}. - */ - // Object & is used to have a different erasure than the other overloads. - public static & StorageView> long simulateExtract(S storage, T resource, long maxAmount, - @Nullable TransactionContext transaction) { - try (Transaction simulateTransaction = Transaction.open(transaction)) { - return storage.extract(resource, maxAmount, simulateTransaction); - } - } - - /** - * Try to extract any resource from a storage, up to a maximum amount. - * - *

- * This function will only ever pull from one storage view of the storage, even if multiple storage views contain the same resource. - * - * @param storage The storage, may be null. - * @param maxAmount The maximum to extract. - * @param transaction The transaction this operation is part of. - * @return A non-blank resource and the strictly positive amount of it that was extracted from the storage, - * or {@code null} if none could be found. - */ - @Nullable - public static ResourceAmount extractAny(@Nullable Storage storage, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notNegative(maxAmount); - - if (storage == null) - return null; - - try { - for (StorageView view : storage.nonEmptyViews()) { - T resource = view.getResource(); - long amount = view.extract(resource, maxAmount, transaction); - if (amount > 0) - return new ResourceAmount<>(resource, amount); - } - } catch (Exception e) { - CrashReport report = CrashReport.forThrowable(e, "Extracting resources from storage"); - report.addCategory("Extraction details") - .setDetail("Storage", storage::toString) - .setDetail("Max amount", maxAmount) - .setDetail("Transaction", transaction); - throw new ReportedException(report); - } - - return null; - } - - /** - * Try to insert up to some amount of a resource into a list of storage slots, trying to "stack" first, - * i.e. prioritizing slots that already contain the resource. - * - * @return How much was inserted. - * @see Storage#insert - */ - public static long insertStacking(List> slots, T resource, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notNegative(maxAmount); - long amount = 0; - - try { - for (SingleSlotStorage slot : slots) { - if (!slot.isResourceBlank()) { - amount += slot.insert(resource, maxAmount - amount, transaction); - if (amount == maxAmount) - return amount; - } - } - - for (SingleSlotStorage slot : slots) { - amount += slot.insert(resource, maxAmount - amount, transaction); - if (amount == maxAmount) - return amount; - } - } catch (Exception e) { - CrashReport report = CrashReport.forThrowable(e, "Inserting resources into slots"); - report.addCategory("Slotted insertion details") - .setDetail("Slots", () -> Objects.toString(slots, null)) - .setDetail("Resource", () -> Objects.toString(resource, null)) - .setDetail("Max amount", maxAmount) - .setDetail("Transaction", transaction); - throw new ReportedException(report); - } - - return amount; - } - - /** - * Insert resources in a storage, attempting to stack them with existing resources first if possible. - * - * @param storage The storage, may be null. - * @param resource The resource to insert. May not be blank. - * @param maxAmount The maximum amount of resource to insert. May not be negative. - * @param transaction The transaction this operation is part of. - * @return A nonnegative integer not greater than maxAmount: the amount that was inserted. - */ - public static long tryInsertStacking(@Nullable Storage storage, T resource, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notNegative(maxAmount); - - try { - if (storage instanceof SlottedStorage slottedStorage) { - return insertStacking(slottedStorage.getSlots(), resource, maxAmount, transaction); - } else if (storage != null) { - return storage.insert(resource, maxAmount, transaction); - } else { - return 0; - } - } catch (Exception e) { - CrashReport report = CrashReport.forThrowable(e, "Inserting resources into a storage"); - report.addCategory("Insertion details") - .setDetail("Storage", () -> Objects.toString(storage, null)) - .setDetail("Resource", () -> Objects.toString(resource, null)) - .setDetail("Max amount", maxAmount) - .setDetail("Transaction", transaction); - throw new ReportedException(report); - } - } - - /** - * Attempt to find a resource stored in the passed storage. - * - * @see #findStoredResource(Storage, Predicate) - * @return A non-blank resource stored in the storage, or {@code null} if none could be found. - */ - @Nullable - public static T findStoredResource(@Nullable Storage storage) { - return findStoredResource(storage, r -> true); - } - - /** - * Attempt to find a resource stored in the passed storage that matches the passed filter. - * - * @param storage The storage to inspect, may be null. - * @param filter The filter. Only a resource for which this filter returns {@code true} will be returned. - * @param The type of the stored resources. - * @return A non-blank resource stored in the storage that matches the filter, or {@code null} if none could be found. - */ - @Nullable - public static T findStoredResource(@Nullable Storage storage, Predicate filter) { - Objects.requireNonNull(filter, "Filter may not be null"); - if (storage == null) - return null; - - for (StorageView view : storage.nonEmptyViews()) { - if (filter.test(view.getResource())) { - return view.getResource(); - } - } - - return null; - } - - /** - * Attempt to find a resource stored in the passed storage that can be extracted. - * - * @see #findExtractableResource(Storage, Predicate, TransactionContext) - * @return A non-blank resource stored in the storage that can be extracted, or {@code null} if none could be found. - */ - @Nullable - public static T findExtractableResource(@Nullable Storage storage, @Nullable TransactionContext transaction) { - return findExtractableResource(storage, r -> true, transaction); - } - - /** - * Attempt to find a resource stored in the passed storage that matches the passed filter and can be extracted. - * - * @param storage The storage to inspect, may be null. - * @param filter The filter. Only a resource for which this filter returns {@code true} will be returned. - * @param transaction The current transaction, or {@code null} if a transaction should be opened for this query. - * @param The type of the stored resources. - * @return A non-blank resource stored in the storage that matches the filter and can be extracted, or {@code null} if none could be found. - */ - @Nullable - public static T findExtractableResource(@Nullable Storage storage, Predicate filter, @Nullable TransactionContext transaction) { - Objects.requireNonNull(filter, "Filter may not be null"); - if (storage == null) - return null; - - try (Transaction nested = Transaction.open(transaction)) { - for (StorageView view : storage.nonEmptyViews()) { - // Extract below could change the resource, so we have to query it before extracting. - T resource = view.getResource(); - - if (filter.test(resource) && view.extract(resource, Long.MAX_VALUE, nested) > 0) { - // Will abort the extraction. - return resource; - } - } - } - - return null; - } - - /** - * Attempt to find a resource stored in the passed storage that can be extracted, and how much of it can be extracted. - * - * @see #findExtractableContent(Storage, Predicate, TransactionContext) - * @return A non-blank resource stored in the storage that can be extracted, and the strictly positive amount of it that can be extracted, - * or {@code null} if none could be found. - */ - @Nullable - public static ResourceAmount findExtractableContent(@Nullable Storage storage, @Nullable TransactionContext transaction) { - return findExtractableContent(storage, r -> true, transaction); - } - - /** - * Attempt to find a resource stored in the passed storage that can be extracted and matches the filter, and how much of it can be extracted. - * - * @param storage The storage to inspect, may be null. - * @param filter The filter. Only a resource for which this filter returns {@code true} will be returned. - * @param transaction The current transaction, or {@code null} if a transaction should be opened for this query. - * @param The type of the stored resources. - * @return A non-blank resource stored in the storage that can be extracted and matches the filter, and the strictly positive amount of it that - * can be extracted, - * or {@code null} if none could be found. - */ - @Nullable - public static ResourceAmount findExtractableContent(@Nullable Storage storage, Predicate filter, - @Nullable TransactionContext transaction) { - T extractableResource = findExtractableResource(storage, filter, transaction); - - if (extractableResource != null) { - long extractableAmount = simulateExtract(storage, extractableResource, Long.MAX_VALUE, transaction); - - if (extractableAmount > 0) { - return new ResourceAmount<>(extractableResource, extractableAmount); - } - } - - return null; - } - - /** - * Compute the comparator output for a storage, similar to {@link ScreenHandler#calculateComparatorOutput(Inventory)}. - * - * @param storage The storage for which the comparator level should be computed. - * @param The type of the stored resources. - * @return An integer between 0 and 15 (inclusive): the comparator output for the passed storage. - */ - public static int calculateComparatorOutput(@Nullable Storage storage) { - if (storage == null) - return 0; - - double fillPercentage = 0; - int viewCount = 0; - boolean hasNonEmptyView = false; - - for (StorageView view : storage) { - viewCount++; - - if (view.getAmount() > 0) { - fillPercentage += (double) view.getAmount() / view.getCapacity(); - hasNonEmptyView = true; - } - } - - return Mth.floor(fillPercentage / viewCount * 14) + (hasNonEmptyView ? 1 : 0); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StorageView.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StorageView.java deleted file mode 100644 index d92e32d67..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/StorageView.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; - -/** - * A view of a single stored resource in a {@link Storage}, for use with {@link Storage#iterator}. - * - * @param The type of the stored resource. - */ -public interface StorageView { - /** - * Try to extract a resource from this view. - * - * @return The amount that was extracted. - */ - long extract(T resource, long maxAmount, TransactionContext transaction); - - /** - * Return {@code true} if the {@link #getResource} contained in this storage view is blank, or {@code false} otherwise. - * - *

- * This function is mostly useful when dealing with storages of arbitrary types. - * For transfer variant storages, this should always be equivalent to {@code getResource().isBlank()}. - */ - boolean isResourceBlank(); - - /** - * @return The resource stored in this view. May not be blank if {@link #isResourceBlank} is {@code false}. - */ - T getResource(); - - /** - * @return The amount of {@link #getResource} stored in this view. - */ - long getAmount(); - - /** - * @return The total amount of {@link #getResource} that could be stored in this view, - * or an estimated upper bound on the number of resources that could be stored if this view has a blank resource. - */ - long getCapacity(); - - /** - * If this is view is a delegate around another storage view, return the underlying view. - * This can be used to check if two views refer to the same inventory "slot". - * Do not try to extract from the underlying view, or you risk bypassing some checks. - * - *

- * It is expected that two storage views with the same underlying view ({@code a.getUnderlyingView() == b.getUnderlyingView()}) - * share the same content, and mutating one should mutate the other. However, one of them may allow extraction, and the other may not. - */ - default StorageView getUnderlyingView() { - return this; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/TransferVariant.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/TransferVariant.java deleted file mode 100644 index a5e42adf0..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/TransferVariant.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -import net.minecraft.core.HolderLookup; -import net.minecraft.core.component.DataComponentPatch; -import net.minecraft.nbt.Tag; -import net.minecraft.network.RegistryFriendlyByteBuf; - -/** - * An immutable association of an immutable object instance (for example {@code Item} or {@code Fluid}) and an optional NBT tag. - * - *

- * This is exposed for convenience for code that needs to be generic across multiple transfer variants, - * but note that a {@link Storage} is not necessarily bound to {@code TransferVariant}. Its generic parameter can be any immutable object. - * - *

- * Transfer variants must always be compared with {@code equals}, never by reference! - * {@code hashCode} is guaranteed to be correct and constant time independently of the size of the NBT. - * - * @param The type of the immutable object instance, for example {@code Item} or {@code Fluid}. - */ -public interface TransferVariant { - /** - * Return true if this variant is blank, and false otherwise. - */ - boolean isBlank(); - - /** - * Return the immutable object instance of this variant. - */ - O getObject(); - - /** - * Return {@code true} if the object of this variant matches the passed fluid. - */ - default boolean isOf(O object) { - return getObject() == object; - } - - DataComponentPatch getComponentsPatch(); - - /** - * Save this variant into an NBT compound tag. Subinterfaces should have a matching static {@code fromNbt}. - * - *

- * Note: This is safe to use for persisting data as objects are saved using their full Identifier. - */ - Tag toNbt(HolderLookup.Provider registries); - - /** - * Write this variant into a packet byte buffer. Subinterfaces should have a matching static {@code fromPacket}. - * - *

- * Implementation note: Objects are saved using their raw registry integer id. - */ - void toPacket(RegistryFriendlyByteBuf buf); -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/ResourceAmount.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/ResourceAmount.java deleted file mode 100644 index cb08aade0..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/ResourceAmount.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base; - -/** - * An immutable object storing both a resource and an amount, provided for convenience. - * - * @param The type of the stored resource. - */ -public record ResourceAmount(T resource, long amount) {} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/SingleSlotStorage.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/SingleSlotStorage.java deleted file mode 100644 index 6c1d88875..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/SingleSlotStorage.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.SlottedStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageView; -import aztech.modern_industrialization.thirdparty.fabrictransfer.impl.TransferApiImpl; -import java.util.Iterator; - -/** - * A storage that is also its only storage view. - * It can be used in APIs for storages that are wrappers around a single "slot", or for slightly more convenient implementation. - * - * @param The type of the stored resource. - */ -public interface SingleSlotStorage extends SlottedStorage, StorageView { - @Override - default Iterator> iterator() { - return TransferApiImpl.singletonIterator(this); - } - - @Override - default int getSlotCount() { - return 1; - } - - @Override - default SingleSlotStorage getSlot(int slot) { - if (slot != 0) { - throw new IndexOutOfBoundsException("Slot " + slot + " does not exist in a single-slot storage."); - } - - return this; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/SingleVariantStorage.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/SingleVariantStorage.java deleted file mode 100644 index 5e5d065ee..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/SingleVariantStorage.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StoragePreconditions; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.TransferVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.SnapshotJournal; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; - -/** - * A storage that can store a single transfer variant at any given time. - * Implementors should at least override {@link #getCapacity(TransferVariant)}, - * and probably {@link #onFinalCommit} as well for {@code markDirty()} and similar calls. - * - *

- * {@link #canInsert} and {@link #canExtract} can be used for more precise control over which variants may be inserted or extracted. - * If one of these two functions is overridden to always return false, implementors may also wish to override - * {@link #supportsInsertion} and/or {@link #supportsExtraction}. - * - * @see aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.base.SingleFluidStorage SingleFluidStorage for fluid variants. - * @see aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.base.SingleItemStorage SingleItemStorage for item variants. - */ -public abstract class SingleVariantStorage> extends SnapshotJournal> - implements SingleSlotStorage { - public T variant = getBlankVariant(); - public long amount = 0; - - /** - * Return the blank variant. - * - *

- * Note: this is called very early in the constructor. - * If fields need to be accessed from this function, make sure to re-initialize {@link #variant} yourself. - */ - protected abstract T getBlankVariant(); - - /** - * Return the maximum capacity of this storage for the passed transfer variant. - * If the passed variant is blank, an estimate should be returned. - */ - protected abstract long getCapacity(T variant); - - /** - * @return {@code true} if the passed non-blank variant can be inserted, {@code false} otherwise. - */ - protected boolean canInsert(T variant) { - return true; - } - - /** - * @return {@code true} if the passed non-blank variant can be extracted, {@code false} otherwise. - */ - protected boolean canExtract(T variant) { - return true; - } - - @Override - public long insert(T insertedVariant, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notBlankNotNegative(insertedVariant, maxAmount); - - if ((insertedVariant.equals(variant) || variant.isBlank()) && canInsert(insertedVariant)) { - long insertedAmount = Math.min(maxAmount, getCapacity(insertedVariant) - amount); - - if (insertedAmount > 0) { - updateSnapshots(transaction); - - if (variant.isBlank()) { - variant = insertedVariant; - amount = insertedAmount; - } else { - amount += insertedAmount; - } - - return insertedAmount; - } - } - - return 0; - } - - @Override - public long extract(T extractedVariant, long maxAmount, TransactionContext transaction) { - StoragePreconditions.notBlankNotNegative(extractedVariant, maxAmount); - - if (extractedVariant.equals(variant) && canExtract(extractedVariant)) { - long extractedAmount = Math.min(maxAmount, amount); - - if (extractedAmount > 0) { - updateSnapshots(transaction); - amount -= extractedAmount; - - if (amount == 0) { - variant = getBlankVariant(); - } - - return extractedAmount; - } - } - - return 0; - } - - @Override - public boolean isResourceBlank() { - return variant.isBlank(); - } - - @Override - public T getResource() { - return variant; - } - - @Override - public long getAmount() { - return amount; - } - - @Override - public long getCapacity() { - return getCapacity(variant); - } - - @Override - protected ResourceAmount createSnapshot() { - return new ResourceAmount<>(variant, amount); - } - - @Override - protected void revertToSnapshot(ResourceAmount snapshot) { - variant = snapshot.resource(); - amount = snapshot.amount(); - } - - @Override - public String toString() { - return "SingleVariantStorage[%d %s]".formatted(amount, variant); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/package-info.java deleted file mode 100644 index 9e40f33be..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/base/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/package-info.java deleted file mode 100644 index a9f9a4115..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/storage/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/SnapshotJournal.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/SnapshotJournal.java deleted file mode 100644 index 066d6b50c..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/SnapshotJournal.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction; - -import java.util.ArrayList; -import org.jspecify.annotations.Nullable; - -/** - * A journal that modifies itself during transactions, - * saving snapshots of its state in objects of type {@code T} in case it needs to revert to a previous state. - * - *

How to use from subclasses

- *
    - *
  • Call {@link #updateSnapshots} right before the state of your subclass is modified in a transaction.
  • - *
  • Override {@link #createSnapshot}: it is called when necessary to create an object representing the state of your subclass.
  • - *
  • Override {@link #revertToSnapshot}: it is called when necessary to revert to a previous state of your subclass.
  • - *
  • You may optionally override {@link #onRootCommit}: it is called at the end of a transaction that modified the state. - * For example, it could contain a call to {@code setChanged()}.
  • - *
  • (Advanced!) You may optionally override {@link #releaseSnapshot}: it is called once a snapshot object will not be used, - * for example you may wish to pool expensive state objects.
  • - *
- * - *

More technical explanation

- * - *

- * {@link #updateSnapshots} should be called before any modification. - * This will record the state in the journal using {@link #createSnapshot} if no state was already saved for that transaction. - * When the transaction is aborted and changes need to be rolled back, {@link #revertToSnapshot} will be called - * to signal that the current state should revert to that of the snapshot. - * The snapshot object is then {@linkplain #releaseSnapshot released}, and can be cached for subsequent use, or discarded. - * - *

- * When the root transaction is committed, {@link #revertToSnapshot} will not be called so that the current state of the journal - * is retained. {@link #onRootCommit} will be called after the transaction is closed - * and then {@link #releaseSnapshot} will be called because the snapshot is not necessary anymore. - * - * @param The objects that this journal uses to record its state snapshots. - */ -public abstract class SnapshotJournal { - /** - * Used for entries of {@link #snapshots} that do not correspond to a snapshot. - * {@code null} corresponds to a snapshot that happens to be {@code null}. - */ - private static final Object NO_SNAPSHOT = new Object(); - - private final ArrayList snapshots = new ArrayList<>(); - - @Nullable - private T originalState = null; - - /** - * Return a new nonnull object containing the current state of this journal. - * {@code null} may not be returned, or an exception will be thrown! - */ - protected abstract T createSnapshot(); - - /** - * Roll back to a state previously created by {@link #createSnapshot}. - */ - protected abstract void revertToSnapshot(T snapshot); - - /** - * Signals that the snapshot will not be used anymore, and is safe to cache for future calls to {@link #createSnapshot}, - * or discard entirely. - */ - protected void releaseSnapshot(T snapshot) {} - - /** - * Called after the root transaction was successfully committed, - * to perform irreversible actions such as {@code setChanged()} or neighbor updates. - * - *

- * When a root transaction is being closed, - * all journals for which {@code onRootCommit} will be called are stored in a global thread-local queue. - * The processing of this queue starts immediately after the root transaction is closed. - * As such, new root transactions can safely be opened from this method. - * - *

- * When a root transaction is opened from {@code onRootCommit}, - * any journal might be modified, leading to more {@code onRootCommit} callbacks being enqueued: - *

    - *
  • A journal that is already enqueued for {@code onRootCommit} will not be enqueued a second time. - * It will thus be notified a single time for changes that spanned multiple transactions. - * The {@code originalState} will be the state at the beginning of the first of these transactions.
  • - *
  • A journal whose {@code onRootCommit} was already processed will be enqueued again. - * The journal will be notified a second time, with {@code originalState} the state at the beginning of the second - * transaction.
  • - *
  • In particular, a journal is removed from the queue immediately before {@code onRootCommit} is called. - * Should the journal be modified again from its own {@code onRootCommit}, it will be added to the queue, - * and {@code onRootCommit} will be called again later.
  • - *
- * - *

- * Given the large amount of actions that can happen between the last modification and the call to {@code onRootCommit}, - * journals should not depend on {@code onRootCommit} being called immediately for correctness, - * and implementations of this method should be careful (e.g. in case the journal got removed from the level). - * For example, skipping block change notifications because the block was removed from the level - * is preferable than crashing or silently overwriting the block. - * - * @param originalState state of this journal before the transactional operations. - * This corresponds to the first {@link #createSnapshot() snapshot} that was created in the transactional operations. - */ - protected void onRootCommit(T originalState) {} - - /** - * Update the stored snapshots so that the changes happening as part of the passed transaction can be correctly - * committed or rolled back. - * This function should be called every time the journal is about to change its internal state as part of a transaction. - * However, only the first snapshot taken of that depth will be taken. - */ - @SuppressWarnings("unchecked") - public void updateSnapshots(TransactionContext transaction) { - int currentDepth = transaction.depth(); - - snapshots.ensureCapacity(currentDepth); - for (int i = snapshots.size(); i <= currentDepth; i++) { - snapshots.add((T) NO_SNAPSHOT); - } - - if (snapshots.get(currentDepth) == NO_SNAPSHOT) { - snapshots.set(currentDepth, createSnapshot()); - - // This is a special case where we need to cast to access internal Transaction methods. - // You should never, however, cast to call commit or close! - var transactionImpl = (Transaction) transaction; - transactionImpl.validateOpen(); - transactionImpl.journalsToClose.add(this); - } - } - - /** - * Perform the required state management when a transaction is closed. - */ - void onClose(Transaction transaction, boolean wasAborted) { - int currentDepth = transaction.depth(); - - // Get and remove the relevant snapshot. - T snapshot = snapshots.remove(currentDepth); - - if (wasAborted) { - // If the transaction was aborted, we just revert to the state of the snapshot. - revertToSnapshot(snapshot); - releaseSnapshot(snapshot); - } else if (currentDepth <= 0) { - // The transaction is the root. - if (originalState == null) { - originalState = snapshot; - transaction.manager.rootCommitQueue.add(this); - } else { - // If originalState was not null, it means that an onRootCommit callback is already scheduled. - // This means that this journal got modified in a transaction opened from some onRootCommit callback. - // In this case we just wait for the already-registered callback to run. - releaseSnapshot(snapshot); - } - } else if (snapshots.get(currentDepth - 1) == NO_SNAPSHOT) { - // No snapshot yet, so move the snapshot one depth up. - snapshots.set(currentDepth - 1, snapshot); - // This is the first snapshot at this level: we need to add the closing journal to the previous depth. - transaction.manager.getOpenTransaction(currentDepth - 1).journalsToClose.add(this); - } else { - // There is already an older snapshot at the depth above, just release the newer one. - releaseSnapshot(snapshot); - } - } - - void callOnRootCommit() { - // This is only scheduled during onClose() when the root transaction is successful, - // hence the originalState is known to correspond to the first snapshot even if nullable. - T originalState = this.originalState; - // Clear this.originalState immediately rather than later, because onRootCommit might trigger new transactions, - // which might write a new value to this.originalState and schedule this journal for a root commit again. - this.originalState = null; - onRootCommit(originalState); - releaseSnapshot(originalState); - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/Transaction.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/Transaction.java deleted file mode 100644 index 677591709..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/Transaction.java +++ /dev/null @@ -1,297 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction; - -import java.util.ArrayList; -import java.util.List; -import org.jspecify.annotations.Nullable; - -/** - * A global operation that guarantees either the whole operation succeeds, - * or it is completely aborted and rolls back. - * Generally when passed to a method, a {@link Transaction} should be passed as a {@link TransactionContext} to prevent misuse such as calling - * {@link #commit()} or {@link #close()} - * - *

- * One can imagine that transactions are like video game checkpoints. - *

    - *
  • {@linkplain Transaction#open Opening a transaction} with a try-with-resources block creates a checkpoint.
  • - *
  • Modifications to game state can then happen.
  • - *
  • Calling {@link #commit} validates the modifications that happened during the transaction, - * essentially discarding the checkpoint.
  • - *
  • Calling {@link #close()} or doing nothing and letting the transaction be {@linkplain #close() closed} at the end - * of the try-with-resources block cancels any modification that happened during the transaction, - * reverting to the checkpoint.
  • - *
  • Calling {@link Transaction#open} with a non-{@code null} parent creates a new inner transaction, i.e. a new checkpoint with the current state. - * Committing an inner transaction will validate the changes that happened, but they may - * still be cancelled later if a parent transaction is cancelled. - * Aborting an inner transaction immediately reverts the changes within that inner transaction - cancelling any modification made after the call - * to {@link Transaction#open}.
  • - *
- * - *

- * This is illustrated in the following example. - * - *

{@code
- * try (Transaction rootTransaction = Transaction.openRoot()) {
- *     // (A) some transaction operations
- *     try (Transaction innerTransaction = Transaction.open(rootTransaction)) {
- *         // (B) more operations
- *         innerTransaction.commit();
- *         // Commit the changes that happened in this transaction.
- *         // This is an inner transaction, so changes will only be applied if the root
- *         // transaction is committed too.
- *     }
- *     // (C) even more operations
- *     rootTransaction.commit();
- *     // This is a root transaction: changes (A), (B) and (C) are applied.
- * }
- * // If we hadn't committed the rootTransaction, all changes (A), (B) and (C) would have been reverted.
- * }
- * - *

- * Transaction-aware objects are responsible for upholding this contract themselves, - * by subclassing {@link SnapshotJournal} and using it to manage their state. - * See the documentation of {@link SnapshotJournal} for detailed instructions. - * - *

- * Every transaction is only valid on the thread it was opened on, - * and attempts to use it on another thread will throw an exception. - * Consequently, transactions can be concurrent across multiple threads, as long as they don't share any state. - */ -public final class Transaction implements AutoCloseable, TransactionContext { - /** - * Stack walker to provide a name for the opener of the transaction. This is used for debugging purposes such as - * {@link TransactionManager#validateCurrentTransaction}. - */ - private static final StackWalker STACK_WALKER = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE); - - /** - * Opens a new transaction without a parent: a root transaction. - * - *

- * For opening a transaction within an already running transaction, see {@link #open(TransactionContext)}. - * - * @throws IllegalStateException If a transaction is already open or closing on the current thread. - */ - public static Transaction openRoot() { - // Don't delegate to other method due to getCallerClass() - return TransactionManager.getManagerForThread().open(null, STACK_WALKER.getCallerClass()); - } - - /** - * Opens a new transaction with a specified parent. The example below, we open the outermost layer or the `root`. - * - *

-     * {@code
-     * try (var transaction = TransactionManager.open(null)) {
-     *     // do exchanges
-     * }
-     * }
- * - * @param parent the parent transaction, or null if this is the root transaction. Passing {@code null} is equivalent - * to calling {@link #openRoot()}. - * @throws IllegalStateException If no parent is passed, but a transaction is already open or closing on the current thread. - * @throws IllegalStateException If a parent is passed, but it's not the current transaction. - * @throws IllegalStateException If a parent is passed, but it was already closed. - */ - public static Transaction open(@Nullable TransactionContext parent) { - // Don't delegate to other method due to getCallerClass() - return TransactionManager.getManagerForThread().open(parent, STACK_WALKER.getCallerClass()); - } - - public static Transaction hackyOpen() { - return open(getCurrentOpenedTransaction()); - } - - /** - * {@return The current lifecycle of the transaction stack on this thread.} - */ - public static Lifecycle getLifecycle() { - TransactionManager manager = TransactionManager.getManagerForThread(); - int currentDepth = manager.currentDepth; - if (currentDepth == -1) { - return manager.processingRootCommitQueue ? Lifecycle.ROOT_CLOSING : Lifecycle.NONE; - } else { - return manager.stack.get(currentDepth).open ? Lifecycle.OPEN : Lifecycle.CLOSING; - } - } - - /** - * Intended to be used when a method will be part of a transaction chain, but the current transaction - * is not passed in with no way to change the method signature. - * - * @return Current {@link Transaction} on the current thread - * @deprecated Only intended to be used in the case you don't have the transaction context in the method you are in, - * while expecting a transaction to be open already. - * If you have access to a transaction context already, be sure to use that rather than using this method. - * @throws IllegalStateException when called while a transaction is closing. - */ - @SuppressWarnings("DeprecatedIsStillUsed") - @Nullable - @Deprecated - public static TransactionContext getCurrentOpenedTransaction() { - TransactionManager manager = TransactionManager.getManagerForThread(); - // This should also handle the case of LifeCycle is NONE without having to explicitly check - // We return null even though onRootCommit callbacks might still be running - if (manager.currentDepth == -1) - return null; - - Transaction transaction = manager.stack.get(manager.currentDepth); - if (transaction.open) - return transaction; - // The transaction is currently being closed - throw new IllegalStateException("`getCurrentOpenedTransaction()` cannot be called while a transaction is closing."); - } - - /** - * Close the current transaction, committing all the changes that happened during this transaction and its committed child transactions. - * If this transaction was opened with a {@code null} parent, all changes are applied. - * If this transaction was opened with a non-{@code null} parent, all changes will be applied when and if the changes of - * the parent transactions are applied. - * - * @throws IllegalStateException If this function is not called on the thread this transaction was opened in, - * this transaction is not the current transaction, or this transaction was closed. - */ - public void commit() { - close(false); - } - - /** - * Abort the current transaction if it was not closed already. - */ - @Override - public void close() { - // check that a transaction is open on this thread and that this transaction is open. - if (manager.currentDepth >= depth && open) { - close(true); - } - } - - @Override - public int depth() { - manager.validateCurrentThread(); - return depth; - } - - @Override - public String toString() { - return "Transaction[depth=%d, open=%s, thread=%s]".formatted(depth, open, manager.thread.getName()); - } - - // Internals - final TransactionManager manager; - private final int depth; - /** - * {@code true} when the transaction is open, {@code false} when it is closing or closed. - */ - boolean open = false; - final List> journalsToClose = new ArrayList<>(); - Class callerClass; - - Transaction(TransactionManager manager, int depth, Class callerClass) { - this.manager = manager; - this.depth = depth; - this.callerClass = callerClass; - } - - // Validate that this transaction is open. - void validateOpen() { - if (!open) { - throw new IllegalStateException("Transaction operation cannot be applied to a closed or closing transaction."); - } - } - - /** - * Gets what should be printed during exceptions to represent the caller class. This should include the package name as well. - */ - String getDebugName() { - return callerClass.toString(); - } - - /** - * @param wasAborted {@code true} if the transaction was aborted, {@code false} if it was committed - */ - private void close(boolean wasAborted) { - manager.validateCurrentTransaction(this); - validateOpen(); - // Block transaction operations - open = false; - - // Note: it is important that we don't let exceptions corrupt the global state of the transaction manager. - // That is why every callback has to run inside its own try-with-resources block. - RuntimeException closeException = null; - - // Invoke callbacks - for (SnapshotJournal journal : journalsToClose) { - try { - journal.onClose(this, wasAborted); - } catch (Exception exception) { - if (closeException == null) { - closeException = new RuntimeException("Encountered an exception while invoking a transaction close callback.", exception); - } else { - closeException.addSuppressed(exception); - } - } - } - - journalsToClose.clear(); - - // After this decrement, transactions can again be opened - manager.currentDepth--; - - // Root transaction: process all onRootCommit callbacks. - if (manager.currentDepth == -1) { - closeException = manager.processRootCommitQueue(closeException); - } - - // Throw exception if necessary - if (closeException != null) { - throw closeException; - } - } - - /** - * The different possible states of the transaction stack. - */ - public enum Lifecycle { - /** - * No transaction is currently open or closing. - */ - NONE, - /** - * A transaction is currently open. - */ - OPEN, - /** - * The current transaction is currently being closed. - */ - CLOSING, - /** - * {@link SnapshotJournal#onRootCommit} callbacks are being executed, and no transaction is currently open or being closed. - */ - ROOT_CLOSING; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/TransactionContext.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/TransactionContext.java deleted file mode 100644 index 53f8526ca..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/TransactionContext.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction; - -/** - * A subset of a {@link Transaction} that lets journals properly record, manage their state, - * or open inner transactions, but does not allow them to close the transaction they are passed. - *

- * Recording changes to a transaction can be done with an implementation of {@link SnapshotJournal} and calling - * {@link SnapshotJournal#updateSnapshots(TransactionContext) updateSnapshots(TransactionContext)} before having the state change. - * - * @see SnapshotJournal#updateSnapshots(TransactionContext) - */ -public sealed interface TransactionContext permits Transaction { - /** - * Gets the current depth of the transaction. - * - * @return The depth of this transaction: 0 if it is the root and has no parent; 1 or more otherwise indicating how far away from the root the - * transaction is. - * @throws IllegalStateException If this function is not called on the thread this transaction was opened in. - */ - int depth(); -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/TransactionManager.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/TransactionManager.java deleted file mode 100644 index d99cf0de4..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/TransactionManager.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import org.jspecify.annotations.Nullable; - -/** - * Manager for handling opening new {@link Transaction Transactions} or querying status of a transaction chain in a given thread. - * - * @see Transaction - */ -final class TransactionManager { - private static final ThreadLocal MANAGERS = ThreadLocal.withInitial(TransactionManager::new); - final Thread thread = Thread.currentThread(); - - final List stack = new ArrayList<>(); - int currentDepth = -1; - - final Queue> rootCommitQueue = new ArrayDeque<>(); - boolean processingRootCommitQueue = false; - - /** - * @return The manager for the current thread. - */ - static TransactionManager getManagerForThread() { - return MANAGERS.get(); - } - - Transaction open(@Nullable TransactionContext parent, Class callerClass) { - if (parent != null) { - Transaction parentImpl = (Transaction) parent; - validateCurrentTransaction(parentImpl); - parentImpl.validateOpen(); - } else if (currentDepth >= 0) { - String currentRoot = getOpenTransaction(0).getDebugName(); - throw new IllegalStateException("A root transaction of `" + currentRoot + "` is already active on this thread " + thread + " when `" - + callerClass + "` tried to open."); - } - - Transaction current; - if (stack.size() == ++currentDepth) { - current = new Transaction(this, currentDepth, callerClass); - stack.add(current); - } else { - current = stack.get(currentDepth); - current.callerClass = callerClass; - } - current.open = true; - return current; - } - - /** - * Return the transaction with the specified depth. - * - * @param depth Queried depth of the transaction desired. - * @throws IndexOutOfBoundsException If there is no open transaction with the requested depth. - * @throws IllegalStateException If this function is not called on the thread this transaction was opened in. - */ - Transaction getOpenTransaction(int depth) { - validateCurrentThread(); - - if (depth < 0) { - throw new IndexOutOfBoundsException("Depth may not be negative."); - } - - if (depth > this.currentDepth) { - throw new IndexOutOfBoundsException("There is no open transaction for depth `" + depth + "`"); - } - - Transaction transaction = this.stack.get(depth); - transaction.validateOpen(); - return transaction; - } - - void validateCurrentThread() { - if (Thread.currentThread() != thread) { - String errorMessage = String.format( - "Attempted to access transaction state from thread %s, but this transaction is only valid on thread %s.", - Thread.currentThread().getName(), - thread.getName()); - throw new IllegalStateException(errorMessage); - } - } - - void validateCurrentTransaction(Transaction transaction) { - validateCurrentThread(); - - if (currentDepth != -1 && stack.get(currentDepth) == transaction) - return; - - String errorMessage = String.format( - "Transaction function was called on a transaction (%s) with depth `%d`, " + - "but the current transaction (%s) has depth `%d`.", - transaction.getDebugName(), - transaction.depth(), - stack.get(currentDepth).getDebugName(), - currentDepth); - throw new IllegalStateException(errorMessage); - } - - @Nullable - RuntimeException processRootCommitQueue(@Nullable RuntimeException closeException) { - if (processingRootCommitQueue) { - // onRootCommit callbacks can trigger more transactions, which will trigger more onRootCommit callbacks. - // When this happens, the additional callbacks are added to the back of the queue of the transaction manager, - // such that they are eventually processed. - // The queue is already being processed higher up the call stack. - // Let control resume to queue processing of the "true" root transaction. - return closeException; - } - - processingRootCommitQueue = true; - - // Invoke root close callbacks - while (!rootCommitQueue.isEmpty()) { - SnapshotJournal journal = rootCommitQueue.remove(); - try { - journal.callOnRootCommit(); - } catch (Exception exception) { - if (closeException == null) { - closeException = new RuntimeException("Encountered an exception while invoking a journal's onRootCommit method.", exception); - } else { - closeException.addSuppressed(exception); - } - } - } - - processingRootCommitQueue = false; - return closeException; - } - - private TransactionManager() {} -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/package-info.java deleted file mode 100644 index ecdcb2b6c..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/api/transaction/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/DebugMessages.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/DebugMessages.java deleted file mode 100644 index c573bac10..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/DebugMessages.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.Container; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import org.jspecify.annotations.Nullable; - -public final class DebugMessages { - public static String forGlobalPos(@Nullable Level world, BlockPos pos) { - String dimension = world != null ? world.dimension().location().toString() : ""; - return dimension + "@" + pos.toShortString(); - } - - public static String forPlayer(Player player) { - return player.getName() + "/" + player.getStringUUID(); - } - - public static String forInventory(@Nullable Container inventory) { - if (inventory == null) { - return "~~NULL~~"; // like in crash reports - } else if (inventory instanceof Inventory playerInventory) { - return forPlayer(playerInventory.player); - } else { - String result = inventory.toString(); - - if (inventory instanceof BlockEntity blockEntity) { - result += " (%s, %s)".formatted(blockEntity.getBlockState(), forGlobalPos(blockEntity.getLevel(), blockEntity.getBlockPos())); - } - - return result; - } - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/TransferApiImpl.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/TransferApiImpl.java deleted file mode 100644 index c944b8fa7..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/TransferApiImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.SlottedStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.Storage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.StorageView; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.storage.base.SingleSlotStorage; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.transaction.TransactionContext; -import java.util.AbstractList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.concurrent.atomic.AtomicLong; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TransferApiImpl { - public static final Logger LOGGER = LoggerFactory.getLogger("fabric-transfer-api-v1"); - public static final AtomicLong version = new AtomicLong(); - @SuppressWarnings("rawtypes") - public static final Storage EMPTY_STORAGE = new Storage() { - @Override - public boolean supportsInsertion() { - return false; - } - - @Override - public long insert(Object resource, long maxAmount, TransactionContext transaction) { - return 0; - } - - @Override - public boolean supportsExtraction() { - return false; - } - - @Override - public long extract(Object resource, long maxAmount, TransactionContext transaction) { - return 0; - } - - @Override - public Iterator iterator() { - return Collections.emptyIterator(); - } - - @Override - public long getVersion() { - return 0; - } - - @Override - public String toString() { - return "EmptyStorage"; - } - }; - - public static Iterator singletonIterator(T it) { - return new Iterator() { - boolean hasNext = true; - - @Override - public boolean hasNext() { - return hasNext; - } - - @Override - public T next() { - if (!hasNext) { - throw new NoSuchElementException(); - } - - hasNext = false; - return it; - } - }; - } - - public static List> makeListView(SlottedStorage storage) { - return new AbstractList<>() { - @Override - public SingleSlotStorage get(int index) { - return storage.getSlot(index); - } - - @Override - public int size() { - return storage.getSlotCount(); - } - }; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/FluidVariantImpl.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/FluidVariantImpl.java deleted file mode 100644 index 09b82f139..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/FluidVariantImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl.fluid; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import net.minecraft.core.component.DataComponentPatch; -import net.minecraft.world.level.material.Fluid; -import net.neoforged.neoforge.fluids.FluidStack; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class FluidVariantImpl implements FluidVariant { - private static final Map noTagCache = new ConcurrentHashMap<>(); - - public static FluidVariant of(Fluid fluid) { - Objects.requireNonNull(fluid, "Fluid may not be null."); - - return noTagCache.computeIfAbsent(fluid, f -> new FluidVariantImpl(new FluidStack(f, 1))); - } - - public static FluidVariant of(FluidStack stack) { - Objects.requireNonNull(stack); - - if (stack.isComponentsPatchEmpty() || stack.isEmpty()) { - return of(stack.getFluid()); - } else { - return new FluidVariantImpl(stack); - } - } - - private static final Logger LOGGER = LoggerFactory.getLogger("fabric-transfer-api-v1/fluid"); - - private final FluidStack stack; - private final int hashCode; - - public FluidVariantImpl(FluidStack stack) { - this.stack = stack.copyWithAmount(1); // defensive copy - this.hashCode = FluidStack.hashFluidAndComponents(stack); - } - - @Override - public Fluid getObject() { - return this.stack.getFluid(); - } - - @Override - public DataComponentPatch getComponentsPatch() { - return this.stack.getComponentsPatch(); - } - - @Override - public boolean matches(FluidStack stack) { - return FluidStack.isSameFluidSameComponents(this.stack, stack); - } - - @Override - public FluidStack toStack(int count) { - return this.stack.copyWithAmount(count); - } - - @Override - public boolean isBlank() { - return this.stack.isEmpty(); - } - - @Override - public String toString() { - return "FluidVariant{stack=" + stack + '}'; - } - - @Override - public boolean equals(Object o) { - // succeed fast with == check - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - - FluidVariantImpl fluidVariant = (FluidVariantImpl) o; - // fail fast with hash code - return hashCode == fluidVariant.hashCode && matches(fluidVariant.stack); - } - - @Override - public int hashCode() { - return hashCode; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/package-info.java deleted file mode 100644 index f0f037f2a..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/fluid/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl.fluid; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/item/ItemVariantImpl.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/item/ItemVariantImpl.java deleted file mode 100644 index 17cccd49b..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/item/ItemVariantImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl.item; - -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Predicate; -import net.minecraft.core.component.DataComponentPatch; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ItemVariantImpl implements ItemVariant { - private static final Map noTagCache = new ConcurrentHashMap<>(); - - public static ItemVariant of(Item item) { - Objects.requireNonNull(item, "Item may not be null."); - - return noTagCache.computeIfAbsent(item, i -> new ItemVariantImpl(new ItemStack(i))); - } - - public static ItemVariant of(ItemStack stack) { - Objects.requireNonNull(stack); - - // Only tag-less or empty item variants are cached for now. - if (stack.isComponentsPatchEmpty() || stack.isEmpty()) { - return of(stack.getItem()); - } else { - return new ItemVariantImpl(stack); - } - } - - private static final Logger LOGGER = LoggerFactory.getLogger("fabric-transfer-api-v1/item"); - - private final ItemStack stack; - private final int hashCode; - - private ItemVariantImpl(ItemStack stack) { - this.stack = stack.copyWithCount(1); // defensive copy - hashCode = ItemStack.hashItemAndComponents(stack); - } - - @Override - public Item getObject() { - return stack.getItem(); - } - - @Override - public DataComponentPatch getComponentsPatch() { - return this.stack.getComponentsPatch(); - } - - @Override - public boolean matches(ItemStack stack) { - return ItemStack.isSameItemSameComponents(this.stack, stack); - } - - @Override - public boolean test(Predicate predicate) { - return predicate.test(this.stack); - } - - @Override - public ItemStack toStack(int count) { - return this.stack.copyWithCount(count); - } - - @Override - public int getMaxStackSize() { - return this.stack.getMaxStackSize(); - } - - @Override - public boolean isBlank() { - return this.stack.isEmpty(); - } - - @Override - public String toString() { - return "ItemVariant{stack=" + stack + '}'; - } - - @Override - public boolean equals(Object o) { - // succeed fast with == check - if (this == o) - return true; - if (o == null || getClass() != o.getClass()) - return false; - - ItemVariantImpl itemVariant = (ItemVariantImpl) o; - // fail fast with hash code - return hashCode == itemVariant.hashCode && matches(itemVariant.stack); - } - - @Override - public int hashCode() { - return hashCode; - } -} diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/item/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/item/package-info.java deleted file mode 100644 index d644f5ea1..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/item/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl.item; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/package-info.java b/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/package-info.java deleted file mode 100644 index afaa72e08..000000000 --- a/src/main/java/aztech/modern_industrialization/thirdparty/fabrictransfer/impl/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Azercoco & Technici4n - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@NullMarked -package aztech.modern_industrialization.thirdparty.fabrictransfer.impl; - -import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/trading/MITradeSets.java b/src/main/java/aztech/modern_industrialization/trading/MITradeSets.java new file mode 100644 index 000000000..e9bc4a3f4 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/trading/MITradeSets.java @@ -0,0 +1,28 @@ +package aztech.modern_industrialization.trading; + +import aztech.modern_industrialization.MI; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.trading.TradeSet; +import net.minecraft.world.item.trading.TradeSets; + +public class MITradeSets { + public static final ResourceKey INDUSTRIALIST_LEVEL_1 = resourceKey("industrialist/level_1"); + public static final ResourceKey INDUSTRIALIST_LEVEL_2 = resourceKey("industrialist/level_2"); + public static final ResourceKey INDUSTRIALIST_LEVEL_3 = resourceKey("industrialist/level_3"); + public static final ResourceKey INDUSTRIALIST_LEVEL_4 = resourceKey("industrialist/level_4"); + public static final ResourceKey INDUSTRIALIST_LEVEL_5 = resourceKey("industrialist/level_5"); + + public static void bootstrap(BootstrapContext context) { + TradeSets.register(context, INDUSTRIALIST_LEVEL_1, MITradeTags.INDUSTRIALIST_LEVEL_1); + TradeSets.register(context, INDUSTRIALIST_LEVEL_2, MITradeTags.INDUSTRIALIST_LEVEL_2); + TradeSets.register(context, INDUSTRIALIST_LEVEL_3, MITradeTags.INDUSTRIALIST_LEVEL_3); + TradeSets.register(context, INDUSTRIALIST_LEVEL_4, MITradeTags.INDUSTRIALIST_LEVEL_4); + TradeSets.register(context, INDUSTRIALIST_LEVEL_5, MITradeTags.INDUSTRIALIST_LEVEL_5); + } + + private static ResourceKey resourceKey(String path) { + return ResourceKey.create(Registries.TRADE_SET, MI.id(path)); + } +} diff --git a/src/main/java/aztech/modern_industrialization/trading/MITradeTags.java b/src/main/java/aztech/modern_industrialization/trading/MITradeTags.java new file mode 100644 index 000000000..eb60d46cc --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/trading/MITradeTags.java @@ -0,0 +1,42 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package aztech.modern_industrialization.trading; + +import aztech.modern_industrialization.MI; +import net.minecraft.core.registries.Registries; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.trading.VillagerTrade; + +public class MITradeTags { + public static final TagKey INDUSTRIALIST_LEVEL_1 = tag("industrialist/level_1"); + public static final TagKey INDUSTRIALIST_LEVEL_2 = tag("industrialist/level_2"); + public static final TagKey INDUSTRIALIST_LEVEL_3 = tag("industrialist/level_3"); + public static final TagKey INDUSTRIALIST_LEVEL_4 = tag("industrialist/level_4"); + public static final TagKey INDUSTRIALIST_LEVEL_5 = tag("industrialist/level_5"); + + private static TagKey tag(String path) { + return TagKey.create(Registries.VILLAGER_TRADE, MI.id(path)); + } +} diff --git a/src/main/java/aztech/modern_industrialization/trading/MITrades.java b/src/main/java/aztech/modern_industrialization/trading/MITrades.java new file mode 100644 index 000000000..dda502250 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/trading/MITrades.java @@ -0,0 +1,100 @@ +package aztech.modern_industrialization.trading; + +import aztech.modern_industrialization.MI; +import aztech.modern_industrialization.MIItem; +import aztech.modern_industrialization.materials.MIMaterials; +import aztech.modern_industrialization.materials.part.MIParts; +import net.minecraft.commands.arguments.item.ComponentPredicateParser; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.trading.TradeCost; +import net.minecraft.world.item.trading.VillagerTrade; +import net.minecraft.world.level.ItemLike; + +import java.util.List; +import java.util.Optional; + +public class MITrades { + public static final ResourceKey INDUSTRIALIST_1_LIGNITE_EMERALD = resourceKey(1, "lignite_emerald"); + public static final ResourceKey INDUSTRIALIST_1_EMERALD_FIRE_CLAY = resourceKey(1, "emerald_fire_clay"); + public static final ResourceKey INDUSTRIALIST_1_EMERALD_STEEL_HAMMER = resourceKey(1, "emerald_steel_hammer"); + public static final ResourceKey INDUSTRIALIST_1_EMERALD_COPPER = resourceKey(1, "emerald_copper"); + public static final ResourceKey INDUSTRIALIST_1_EMERALD_TIN = resourceKey(1, "emerald_tin"); + + public static final ResourceKey INDUSTRIALIST_2_EMERALD_COPPER_GEAR = resourceKey(2, "emerald_copper_gear"); + public static final ResourceKey INDUSTRIALIST_2_EMERALD_COPPER_ROTOR = resourceKey(2, "emerald_copper_rotor"); + public static final ResourceKey INDUSTRIALIST_2_EMERALD_BRONZE_INGOT = resourceKey(2, "emerald_bronze_ingot"); + public static final ResourceKey INDUSTRIALIST_2_EMERALD_RUBBER_SHEET = resourceKey(2, "emerald_rubber_sheet"); + public static final ResourceKey INDUSTRIALIST_2_SULFUR_DUST_EMERALD = resourceKey(2, "sulfur_dust_emerald"); + + public static final ResourceKey INDUSTRIALIST_3_EMERALD_BRONZE_GEAR = resourceKey(3, "emerald_bronze_gear"); + public static final ResourceKey INDUSTRIALIST_3_EMERALD_BRONZE_ROTOR = resourceKey(3, "emerald_bronze_rotor"); + public static final ResourceKey INDUSTRIALIST_3_EMERALD_STEEL_INGOT = resourceKey(3, "emerald_steel_ingot"); + public static final ResourceKey INDUSTRIALIST_3_ITEM_PIPE_EMERALD = resourceKey(3, "item_pipe_emerald"); + public static final ResourceKey INDUSTRIALIST_3_FLUID_PIPE_EMERALD = resourceKey(3, "fluid_pipe_emerald"); + + public static final ResourceKey INDUSTRIALIST_4_EMERALD_STEEL_GEAR = resourceKey(4, "emerald_steel_gear"); + public static final ResourceKey INDUSTRIALIST_4_EMERALD_STEEL_PLATE = resourceKey(4, "emerald_steel_plate"); + public static final ResourceKey INDUSTRIALIST_4_EMERALD_STEEL_UPGRADE = resourceKey(4, "emerald_steel_upgrade"); + public static final ResourceKey INDUSTRIALIST_4_COPPER_CABLE_EMERALD = resourceKey(4, "copper_cable_emerald"); + public static final ResourceKey INDUSTRIALIST_4_TIN_CABLE_EMERALD = resourceKey(4, "tin_cable_emerald"); + + public static final ResourceKey INDUSTRIALIST_5_EMERALD_ANALOG_CIRCUIT = resourceKey(5, "emerald_analog_circuit"); + public static final ResourceKey INDUSTRIALIST_5_EMERALD_MOTOR = resourceKey(5, "emerald_motor"); + public static final ResourceKey INDUSTRIALIST_5_EMERALD_BRONZE_DRILL = resourceKey(5, "emerald_bronze_drill"); + + private static ResourceKey resourceKey(int level, String tradeName) { + return ResourceKey.create(Registries.VILLAGER_TRADE, MI.id("industrialist/%d/%s".formatted(level, tradeName))); + } + + public static void bootstrap(BootstrapContext context) { + context.register(INDUSTRIALIST_1_LIGNITE_EMERALD, sellItemsToVillager(MIMaterials.LIGNITE_COAL.getPart(MIParts.GEM).asItem(), 15, 16, 2)); + context.register(INDUSTRIALIST_1_EMERALD_FIRE_CLAY, buyItemsFromVillager(MIMaterials.FIRE_CLAY.getPart(MIParts.INGOT), 2, 6, 2)); + context.register(INDUSTRIALIST_1_EMERALD_STEEL_HAMMER, buyItemsFromVillager(MIItem.STEEL_HAMMER, 8, 1, 10)); + context.register(INDUSTRIALIST_1_EMERALD_COPPER, buyItemsFromVillager(Items.COPPER_INGOT, 4, 8, 5)); + context.register(INDUSTRIALIST_1_EMERALD_TIN, buyItemsFromVillager(MIMaterials.TIN.getPart(MIParts.INGOT), 4, 3, 5)); + + context.register(INDUSTRIALIST_2_EMERALD_COPPER_GEAR, buyItemsFromVillager(MIMaterials.COPPER.getPart(MIParts.GEAR), 4, 1, 5)); + context.register(INDUSTRIALIST_2_EMERALD_COPPER_ROTOR, buyItemsFromVillager(MIMaterials.COPPER.getPart(MIParts.ROTOR), 4, 1, 5)); + context.register(INDUSTRIALIST_2_EMERALD_BRONZE_INGOT, buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.INGOT), 4, 3, 2)); + context.register(INDUSTRIALIST_2_EMERALD_RUBBER_SHEET, buyItemsFromVillager(MIItem.RUBBER_SHEET, 1, 6, 2)); + context.register(INDUSTRIALIST_2_SULFUR_DUST_EMERALD, sellItemsToVillager(MIMaterials.SULFUR.getPart(MIParts.DUST), 4, 16, 2)); + + context.register(INDUSTRIALIST_3_EMERALD_BRONZE_GEAR, buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.GEAR), 4, 1, 5)); + context.register(INDUSTRIALIST_3_EMERALD_BRONZE_ROTOR, buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.ROTOR), 4, 1, 5)); + context.register(INDUSTRIALIST_3_EMERALD_STEEL_INGOT, buyItemsFromVillager(MIMaterials.STEEL.getPart(MIParts.INGOT), 6, 3, 10)); + context.register(INDUSTRIALIST_3_ITEM_PIPE_EMERALD, sellItemsToVillager(BuiltInRegistries.ITEM.getValue(MI.id("item_pipe")), 4, 20, 10)); + context.register(INDUSTRIALIST_3_FLUID_PIPE_EMERALD, sellItemsToVillager(BuiltInRegistries.ITEM.getValue(MI.id("fluid_pipe")), 4, 20, 10)); + + context.register(INDUSTRIALIST_4_EMERALD_STEEL_GEAR, buyItemsFromVillager(MIMaterials.STEEL.getPart(MIParts.GEAR), 5, 1, 5)); + context.register(INDUSTRIALIST_4_EMERALD_STEEL_PLATE, buyItemsFromVillager(MIMaterials.STEEL.getPart(MIParts.PLATE), 6, 3, 10)); + context.register(INDUSTRIALIST_4_EMERALD_STEEL_UPGRADE, buyItemsFromVillager(MIItem.STEEL_UPGRADE, 20, 1, 20)); + context.register(INDUSTRIALIST_4_TIN_CABLE_EMERALD, sellItemsToVillager(MIMaterials.TIN.getPart(MIParts.CABLE), 8, 16, 5)); + context.register(INDUSTRIALIST_4_COPPER_CABLE_EMERALD, sellItemsToVillager(MIMaterials.COPPER.getPart(MIParts.CABLE), 8, 16, 5)); + + context.register(INDUSTRIALIST_5_EMERALD_ANALOG_CIRCUIT, buyItemsFromVillager(MIItem.ANALOG_CIRCUIT, 12, 1, 20)); + context.register(INDUSTRIALIST_5_EMERALD_MOTOR, buyItemsFromVillager(MIItem.MOTOR, 8, 2, 10)); + context.register(INDUSTRIALIST_5_EMERALD_BRONZE_DRILL, buyItemsFromVillager(MIMaterials.BRONZE.getPart(MIParts.DRILL), 18, 4, 20)); + } + + private static VillagerTrade sellItemsToVillager(ItemLike soldItem, int numberOfItems, int maxUses, int xp) { + return new VillagerTrade( + new TradeCost(soldItem.asItem(), numberOfItems), + new ItemStackTemplate(Items.EMERALD), + maxUses, xp, 0.05F, Optional.empty(), List.of()); + } + + private static VillagerTrade buyItemsFromVillager(ItemLike boughtItem, int emeraldCost, int numberOfItems, int xp) { + return new VillagerTrade( + new TradeCost(Items.EMERALD, emeraldCost), + new ItemStackTemplate(boughtItem.asItem(), numberOfItems), + 12, xp, 0.05F, Optional.empty(), List.of()); + } +} diff --git a/src/main/java/aztech/modern_industrialization/trading/package-info.java b/src/main/java/aztech/modern_industrialization/trading/package-info.java new file mode 100644 index 000000000..7ae7266e8 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/trading/package-info.java @@ -0,0 +1,28 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +@NullMarked +package aztech.modern_industrialization.trading; + +import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/transfer/CombinedInsertionHandler.java b/src/main/java/aztech/modern_industrialization/transfer/CombinedInsertionHandler.java new file mode 100644 index 000000000..8122f1972 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/CombinedInsertionHandler.java @@ -0,0 +1,27 @@ +package aztech.modern_industrialization.transfer; + +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; + +import java.util.List; + +public class CombinedInsertionHandler> implements InsertionHandler { + public final List handlers; + + public CombinedInsertionHandler(List handlers) { + this.handlers = handlers; + } + + @Override + public int insert(T resource, int amount, TransactionContext transaction) { + TransferPreconditions.checkNonEmptyNonNegative(resource, amount); + + int inserted = 0; + for (var handler : handlers) { + inserted += handler.insert(resource, amount - inserted, transaction); + if (inserted == amount) break; + } + return inserted; + } +} diff --git a/src/main/java/aztech/modern_industrialization/transfer/IOResourceHandler.java b/src/main/java/aztech/modern_industrialization/transfer/IOResourceHandler.java new file mode 100644 index 000000000..aff689b01 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/IOResourceHandler.java @@ -0,0 +1,53 @@ +package aztech.modern_industrialization.transfer; + +import net.neoforged.neoforge.transfer.DelegatingResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; + +public class IOResourceHandler extends DelegatingResourceHandler { + private final boolean allowInsert, allowExtract; + + public IOResourceHandler(ResourceHandler delegate, boolean allowInsert, boolean allowExtract) { + super(delegate); + this.allowInsert = allowInsert; + this.allowExtract = allowExtract; + } + + @Override + public boolean isValid(int index, T resource) { + return allowInsert && super.isValid(index, resource); + } + + @Override + public int insert(T resource, int amount, TransactionContext transaction) { + if (!allowInsert) { + return 0; + } + return super.insert(resource, amount, transaction); + } + + @Override + public int insert(int index, T resource, int amount, TransactionContext transaction) { + if (!allowInsert) { + return 0; + } + return super.insert(index, resource, amount, transaction); + } + + @Override + public int extract(T resource, int amount, TransactionContext transaction) { + if (!allowExtract) { + return 0; + } + return super.extract(resource, amount, transaction); + } + + @Override + public int extract(int index, T resource, int amount, TransactionContext transaction) { + if (!allowExtract) { + return 0; + } + return super.extract(index, resource, amount, transaction); + } +} diff --git a/src/main/java/aztech/modern_industrialization/transfer/InsertionHandler.java b/src/main/java/aztech/modern_industrialization/transfer/InsertionHandler.java new file mode 100644 index 000000000..471d61a88 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/InsertionHandler.java @@ -0,0 +1,9 @@ +package aztech.modern_industrialization.transfer; + +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; + +@FunctionalInterface +public interface InsertionHandler { + int insert(T resource, int amount, TransactionContext transaction); +} diff --git a/src/main/java/aztech/modern_industrialization/transfer/LongResourceStack.java b/src/main/java/aztech/modern_industrialization/transfer/LongResourceStack.java new file mode 100644 index 000000000..fc53c16cd --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/LongResourceStack.java @@ -0,0 +1,24 @@ +package aztech.modern_industrialization.transfer; + +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.resource.ResourceStack; + +/** + * Long version of {@link ResourceStack}. + */ +public record LongResourceStack(T resource, long amount) { + /** + * Checks if the resource stack is empty, meaning that the amount is zero + * or that the resource is {@link Resource#isEmpty() empty}. + * + * @return {@code true} if empty + */ + public boolean isEmpty() { + return amount <= 0 || resource.isEmpty(); + } + + @Override + public String toString() { + return amount + "x " + resource; + } +} diff --git a/src/main/java/aztech/modern_industrialization/transfer/MIPreconditions.java b/src/main/java/aztech/modern_industrialization/transfer/MIPreconditions.java new file mode 100644 index 000000000..b2e95f4e8 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/MIPreconditions.java @@ -0,0 +1,27 @@ +package aztech.modern_industrialization.transfer; + +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.resource.Resource; + +public class MIPreconditions { + /** + * Ensures the value is non-negative, throws otherwise. + * + * @throws IllegalArgumentException when value is negative. + */ + public static void checkNonNegative(long value) { + if (value < 0) { + throw new IllegalArgumentException("Expected value to be non-negative: " + value); + } + } + + /** + * Ensures the resource is non-empty and the value is non-negative, throws otherwise. + * + * @throws IllegalArgumentException when resource is empty or value is negative. + */ + public static void checkNonEmptyNonNegative(Resource resource, long value) { + TransferPreconditions.checkNonEmpty(resource); + checkNonNegative(value); + } +} diff --git a/src/main/java/aztech/modern_industrialization/transfer/MITransferUtil.java b/src/main/java/aztech/modern_industrialization/transfer/MITransferUtil.java new file mode 100644 index 000000000..730ba3e15 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/MITransferUtil.java @@ -0,0 +1,79 @@ +package aztech.modern_industrialization.transfer; + +import net.minecraft.CrashReport; +import net.minecraft.ReportedException; +import net.neoforged.neoforge.transfer.ResourceHandler; +import net.neoforged.neoforge.transfer.ResourceHandlerUtil; +import net.neoforged.neoforge.transfer.TransferPreconditions; +import net.neoforged.neoforge.transfer.resource.Resource; +import net.neoforged.neoforge.transfer.transaction.Transaction; +import net.neoforged.neoforge.transfer.transaction.TransactionContext; +import org.jspecify.annotations.Nullable; + +import java.util.Objects; +import java.util.function.Predicate; + +public class MITransferUtil { + /** + * @see ResourceHandlerUtil#move + */ + public static int move( + @Nullable ResourceHandler from, + @Nullable InsertionHandler to, + Predicate filter, + int amount, + @Nullable TransactionContext transaction) { + Objects.requireNonNull(filter, "Filter may not be null"); + TransferPreconditions.checkNonNegative(amount); + if (from == null || to == null || amount == 0) return 0; + + try (Transaction subTransaction = Transaction.open(transaction)) { + int totalMoved = 0; + int size = from.size(); + + for (int index = 0; index < size; ++index) { + T fromResource = from.getResource(index); + if (fromResource.isEmpty() || !filter.test(fromResource)) continue; + + // check how much can be extracted + int maxExtracted; + try (Transaction simulatedExtract = Transaction.open(subTransaction)) { + maxExtracted = from.extract(index, fromResource, amount - totalMoved, simulatedExtract); + } + + if (maxExtracted == 0) continue; + + try (Transaction transferTransaction = Transaction.open(subTransaction)) { + // check how much can be inserted + int inserted = to.insert(fromResource, maxExtracted, transferTransaction); + + // extract it, or rollback if we cannot actually extract the amount we inserted + // this can happen even for a well-behaving handler if it only supports extracting the exact + // amount we previously simulated, but the destination only accepted less. + if (inserted != from.extract(index, fromResource, inserted, transferTransaction)) + continue; + + totalMoved += inserted; + transferTransaction.commit(); + + //if we have the amount we are targeting exit the for-loop + if (totalMoved >= amount) break; + } + + } + + subTransaction.commit(); + return totalMoved; + } catch (Exception e) { + CrashReport report = CrashReport.forThrowable(e, "Moving resources between resource handlers"); + //noinspection DataFlowIssue + report.addCategory("Move details") + .setDetail("Input", from::toString) + .setDetail("Output", to::toString) + .setDetail("Filter", filter::toString) + .setDetail("Amount", amount) + .setDetail("Transaction", transaction); + throw new ReportedException(report); + } + } +} diff --git a/src/main/java/aztech/modern_industrialization/transfer/package-info.java b/src/main/java/aztech/modern_industrialization/transfer/package-info.java new file mode 100644 index 000000000..394d799b4 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/transfer/package-info.java @@ -0,0 +1,28 @@ +/* + * MIT License + * + * Copyright (c) 2020 Azercoco & Technici4n + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +@NullMarked +package aztech.modern_industrialization.transfer; + +import org.jspecify.annotations.NullMarked; diff --git a/src/main/java/aztech/modern_industrialization/util/EmptyHolderGetter.java b/src/main/java/aztech/modern_industrialization/util/EmptyHolderGetter.java new file mode 100644 index 000000000..8f6ad75c9 --- /dev/null +++ b/src/main/java/aztech/modern_industrialization/util/EmptyHolderGetter.java @@ -0,0 +1,29 @@ +package aztech.modern_industrialization.util; + +import net.minecraft.core.Holder; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.HolderSet; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; + +import java.util.Optional; + +public final class EmptyHolderGetter implements HolderGetter { + private static final EmptyHolderGetter INSTANCE = new EmptyHolderGetter<>(); + + public static EmptyHolderGetter getInstance() { + return (EmptyHolderGetter) INSTANCE; + } + + private EmptyHolderGetter() {} + + @Override + public Optional> get(ResourceKey id) { + return Optional.empty(); + } + + @Override + public Optional> get(TagKey id) { + return Optional.empty(); + } +} diff --git a/src/main/java/aztech/modern_industrialization/util/FluidHelper.java b/src/main/java/aztech/modern_industrialization/util/FluidHelper.java index 8aa26e72f..75f758abf 100644 --- a/src/main/java/aztech/modern_industrialization/util/FluidHelper.java +++ b/src/main/java/aztech/modern_industrialization/util/FluidHelper.java @@ -26,8 +26,6 @@ import aztech.modern_industrialization.MICommonProxy; import aztech.modern_industrialization.MIText; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariantAttributes; import java.util.ArrayList; import java.util.List; import net.minecraft.network.chat.Component; @@ -35,14 +33,15 @@ import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextColor; import net.neoforged.neoforge.fluids.FluidType; +import net.neoforged.neoforge.transfer.fluid.FluidResource; public class FluidHelper { - public static Component getFluidName(FluidVariant fluid, boolean grayIfEmpty) { - if (fluid.isBlank()) { + public static Component getFluidName(FluidResource fluid, boolean grayIfEmpty) { + if (fluid.isEmpty()) { Style style = grayIfEmpty ? Style.EMPTY.withColor(TextColor.fromRgb(0xa9a9a9)).withItalic(false) : Style.EMPTY; return MIText.Empty.text().setStyle(style); } else { - return FluidVariantAttributes.getName(fluid); + return fluid.toStack(1).getHoverName(); } } @@ -90,8 +89,8 @@ public static int getColorMinLuminance(int color) { } } - public static List getTooltip(FluidVariant fluid, boolean grayIfEmpty) { - if (fluid.isBlank()) { + public static List getTooltip(FluidResource fluid, boolean grayIfEmpty) { + if (fluid.isEmpty()) { ArrayList list = new ArrayList(); list.add(getFluidName(fluid, grayIfEmpty)); return list; @@ -99,13 +98,13 @@ public static List getTooltip(FluidVariant fluid, boolean grayIfEmpty return MICommonProxy.INSTANCE.getFluidTooltip(fluid); } - public static List getTooltipForFluidStorage(FluidVariant fluid, long amount, long capacity, boolean grayIfEmpty) { + public static List getTooltipForFluidStorage(FluidResource fluid, long amount, long capacity, boolean grayIfEmpty) { List tooltip = getTooltip(fluid, grayIfEmpty); tooltip.add(getFluidAmount(amount, capacity)); return tooltip; } - public static List getTooltipForFluidStorage(FluidVariant fluid, long amount, long capacity) { + public static List getTooltipForFluidStorage(FluidResource fluid, long amount, long capacity) { return getTooltipForFluidStorage(fluid, amount, capacity, true); } } diff --git a/src/main/java/aztech/modern_industrialization/util/ItemHandlerItem.java b/src/main/java/aztech/modern_industrialization/util/ItemHandlerItem.java index 4ce3d62d1..5a76c10d4 100644 --- a/src/main/java/aztech/modern_industrialization/util/ItemHandlerItem.java +++ b/src/main/java/aztech/modern_industrialization/util/ItemHandlerItem.java @@ -45,9 +45,10 @@ public ItemHandlerItem(SlotAccess slot, Function stack.getCapability(Capabilities.ItemHandler.ITEM)); - } + // TODO 26.1 +// public ItemHandlerItem(SlotAccess slot) { +// this(slot, stack -> stack.getCapability(Capabilities.ItemHandler.ITEM)); +// } @Override public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { diff --git a/src/main/java/aztech/modern_industrialization/util/ItemStackHelper.java b/src/main/java/aztech/modern_industrialization/util/ItemStackHelper.java index 0fc4135a9..c7f96f219 100644 --- a/src/main/java/aztech/modern_industrialization/util/ItemStackHelper.java +++ b/src/main/java/aztech/modern_industrialization/util/ItemStackHelper.java @@ -25,7 +25,7 @@ package aztech.modern_industrialization.util; import aztech.modern_industrialization.inventory.ConfigurableItemStack; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant; +import net.neoforged.neoforge.transfer.item.ItemResource; public class ItemStackHelper { /** @@ -36,11 +36,12 @@ public class ItemStackHelper { * @return false if the fuel could not be consumed, true otherwise */ public static boolean consumeFuel(ConfigurableItemStack stack, boolean simulate) { - if (stack.isResourceBlank()) + if (stack.isEmpty()) return false; var itemStack = stack.toStack(); - if (itemStack.hasCraftingRemainingItem()) { - var remainder = ItemVariant.of(itemStack.getCraftingRemainingItem()); + var remainderStack = itemStack.getCraftingRemainder(); + if (remainderStack != null) { + var remainder = ItemResource.of(remainderStack.create()); if (stack.getAmount() == 1 && stack.isResourceAllowedByLock(remainder)) { if (!simulate) { stack.setAmount(1); diff --git a/src/main/java/aztech/modern_industrialization/util/MIExtraCodecs.java b/src/main/java/aztech/modern_industrialization/util/MIExtraCodecs.java index f16c68aa0..4a05b9825 100644 --- a/src/main/java/aztech/modern_industrialization/util/MIExtraCodecs.java +++ b/src/main/java/aztech/modern_industrialization/util/MIExtraCodecs.java @@ -25,17 +25,41 @@ package aztech.modern_industrialization.util; import com.mojang.datafixers.util.Either; +import com.mojang.datafixers.util.Pair; +import com.mojang.logging.LogUtils; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; +import com.mojang.serialization.DynamicOps; import com.mojang.serialization.MapCodec; import java.util.List; import java.util.Optional; import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Stream; + +import com.mojang.serialization.MapLike; +import com.mojang.serialization.RecordBuilder; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.Registry; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtOps; +import net.minecraft.resources.RegistryOps; +import net.minecraft.resources.ResourceKey; +import net.minecraft.util.ExtraCodecs; +import net.minecraft.util.ProblemReporter; +import net.minecraft.world.level.storage.TagValueInput; +import net.minecraft.world.level.storage.TagValueOutput; +import net.neoforged.neoforge.common.CommonHooks; import net.neoforged.neoforge.common.conditions.ConditionalOps; import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs; +import net.neoforged.neoforge.common.util.ValueIOSerializable; +import org.slf4j.Logger; public class MIExtraCodecs { + private static final Logger LOGGER = LogUtils.getLogger(); + public static final Codec FLOAT_01 = Codec.floatRange(0, 1); + // TODO: remove in favor of ExtraCodecs equivalents public static final Codec NON_NEGATIVE_LONG = longRange(0, Long.MAX_VALUE); public static final Codec POSITIVE_LONG = longRange(1, Long.MAX_VALUE); @@ -70,4 +94,73 @@ public static MapCodec optionalFieldAlwaysWrite(Codec baseCodec, Strin return baseCodec.optionalFieldOf(field) .xmap(read -> read.orElse(defaultValue), Optional::of); } + + // TODO: PR to NeoForge? + public static DataResult retrieveRegistries(DynamicOps ops) { + if (!(ops instanceof RegistryOps registryOps)) + return DataResult.error(() -> "Not a registry ops"); + + try { + return DataResult.success(CommonHooks.extractLookupProvider(registryOps)); + } catch (IllegalArgumentException exception) { + return DataResult.error(() -> "Could not extract lookup provider: " + exception); + } + } + + // TODO: PR to NeoForge? + public static MapCodec valueSerializable(Supplier constructor) { + return new ValueIOSerializableCodec<>(constructor); + } + + private static class ValueIOSerializableCodec extends MapCodec { + private final Supplier constructor; + + private ValueIOSerializableCodec(Supplier constructor) { + this.constructor = constructor; + } + + @Override + public Stream keys(DynamicOps ops) { + throw new UnsupportedOperationException("Cannot retrieve keys of ValueIOSerializableCodec"); + } + + @Override + public DataResult decode(DynamicOps ops, MapLike input) { + return retrieveRegistries(ops) + .flatMap(registries -> { + var tag = ops.convertTo( + NbtOps.INSTANCE, + ops.createMap(input.entries())); + var compoundTag = (CompoundTag) tag; + + try (var reporter = new ProblemReporter.ScopedCollector(LOGGER)) { + var valueInput = TagValueInput.create(reporter, registries, compoundTag); + var output = constructor.get(); + output.deserialize(valueInput); + return DataResult.success(output); + } + }); + } + + @Override + public RecordBuilder encode(A input, DynamicOps ops, RecordBuilder prefix) { + var result = retrieveRegistries(ops) + .map(registries -> { + try (var reporter = new ProblemReporter.ScopedCollector(LOGGER)) { + var valueOutput = TagValueOutput.createWithContext(reporter, registries); + input.serialize(valueOutput); + var builtTag = valueOutput.buildResult(); + prefix.build(NbtOps.INSTANCE.convertTo(ops, builtTag)); + return prefix; + } + }); + prefix.withErrorsFrom(result); + return prefix; + } + + @Override + public String toString() { + return "ValueIOSerializable[" + constructor + "]"; + } + } } diff --git a/src/main/java/aztech/modern_industrialization/util/NbtHelper.java b/src/main/java/aztech/modern_industrialization/util/NbtHelper.java index 1eabd8e61..74fa2ba16 100644 --- a/src/main/java/aztech/modern_industrialization/util/NbtHelper.java +++ b/src/main/java/aztech/modern_industrialization/util/NbtHelper.java @@ -25,9 +25,10 @@ package aztech.modern_industrialization.util; import aztech.modern_industrialization.pipes.api.PipeEndpointType; -import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant; import java.util.List; import java.util.function.Function; + +import com.mojang.serialization.Codec; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; @@ -35,27 +36,15 @@ import net.minecraft.nbt.ListTag; import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.level.storage.ValueInput; +import net.minecraft.world.level.storage.ValueOutput; import org.jspecify.annotations.Nullable; public class NbtHelper { - public static void putFluid(CompoundTag tag, String key, FluidVariant fluid, HolderLookup.Provider registries) { - CompoundTag savedTag = new CompoundTag(); - savedTag.put("fk", fluid.toNbt(registries)); - tag.put(key, savedTag); - } - - public static Item getItem(CompoundTag tag, String key) { - return BuiltInRegistries.ITEM.get(ResourceLocation.parse(tag.getString(key))); - } - - public static void putItem(CompoundTag tag, String key, Item item) { - tag.putString(key, BuiltInRegistries.ITEM.getKey(item).toString()); - } - public static byte encodeDirections(Iterable directions) { byte mask = 0; for (Direction direction : directions) { @@ -93,52 +82,17 @@ public static byte[] encodeConnections(@Nullable PipeEndpointType[] connections) return connections; } - public static void putList(CompoundTag tag, String key, List list, Function encoder) { - ListTag listTag = new ListTag(); + public static void putList(ValueOutput output, String key, List list, Codec elementCodec) { + var outputList = output.list(key, elementCodec); for (T t : list) { - listTag.add(encoder.apply(t)); + outputList.add(t); } - tag.put(key, listTag); } - public static void getList(CompoundTag tag, String key, List list, Function decoder) { + public static void getList(ValueInput input, String key, List list, Codec elementCodec) { list.clear(); - ListTag listTag = tag.getList(key, Tag.TAG_COMPOUND); - for (int i = 0; i < listTag.size(); ++i) { - CompoundTag elementTag = listTag.getCompound(i); - list.add(decoder.apply(elementTag)); - } - } - - public static FluidVariant getFluidCompatible(@Nullable CompoundTag tag, String key, HolderLookup.Provider registries) { - if (tag == null || !tag.contains(key)) - return FluidVariant.blank(); - - if (tag.get(key) instanceof StringTag) { - return FluidVariant.of(BuiltInRegistries.FLUID.get(ResourceLocation.parse(tag.getString(key)))); - } else { - CompoundTag compound = tag.getCompound(key); - if (compound.contains("fk")) { - return FluidVariant.fromNbt(compound.getCompound("fk"), registries); - } else { - return FluidVariant.of(readLbaTag(tag.getCompound(key))); - } - } - } - - private static Fluid readLbaTag(CompoundTag tag) { - if (tag.contains("ObjName") && tag.getString("Registry").equals("f")) { - return BuiltInRegistries.FLUID.get(ResourceLocation.parse(tag.getString("ObjName"))); - } else { - return Fluids.EMPTY; - } - } - - public static void putNonzeroInt(CompoundTag tag, String key, int i) { - if (i == 0) { - tag.remove(key); - } else { - tag.putInt(key, i); + for (T t : input.listOrEmpty(key, elementCodec)) { + list.add(t); } } } diff --git a/src/main/java/aztech/modern_industrialization/util/TransferHelper.java b/src/main/java/aztech/modern_industrialization/util/TransferHelper.java index b811fe601..15d3ddcc9 100644 --- a/src/main/java/aztech/modern_industrialization/util/TransferHelper.java +++ b/src/main/java/aztech/modern_industrialization/util/TransferHelper.java @@ -26,6 +26,7 @@ import aztech.modern_industrialization.MI; import java.util.function.Predicate; + import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import net.neoforged.neoforge.capabilities.Capabilities; @@ -34,6 +35,7 @@ import net.neoforged.neoforge.items.IItemHandler; import net.neoforged.neoforge.items.ItemHandlerHelper; import net.neoforged.neoforge.items.wrapper.PlayerInvWrapper; +import net.neoforged.neoforge.transfer.access.ItemAccess; public class TransferHelper { public static void moveAll(IItemHandler src, IItemHandler target, boolean stackInTarget) { @@ -89,7 +91,8 @@ public static ItemStack extractMatching(Inventory inventory, Predicate(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V +protected net.minecraft.client.gui.components.Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Ljava/util/Optional;Lnet/minecraft/resources/Identifier;)V public-f net.minecraft.client.gui.components.AbstractWidget render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V +public net.minecraft.client.gui.GuiGraphics innerBlit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIIFFFFI)V # Used for menu interactions public net.minecraft.world.inventory.AbstractContainerMenu createCarriedSlotAccess()Lnet/minecraft/world/entity/SlotAccess; @@ -12,27 +13,22 @@ public net.minecraft.world.level.block.Blocks never(Lnet/minecraft/world/level/b # Used for ore registration public net.minecraft.data.worldgen.placement.OrePlacements commonOrePlacement(ILnet/minecraft/world/level/levelgen/placement/PlacementModifier;)Ljava/util/List; -# Used to render pipe highlight -public net.minecraft.client.renderer.LevelRenderer renderShape(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/shapes/VoxelShape;DDDFFFF)V - # Used to access all chunks public net.minecraft.server.level.ChunkMap updatingChunkMap # Used for datagen -# TODO: PR to NeoForge -public-f net.minecraft.data.recipes.RecipeProvider getName()Ljava/lang/String; # To convert shaped recipes to machine recipes public net.minecraft.world.item.crafting.ShapedRecipe pattern public net.minecraft.world.item.crafting.ShapedRecipe result public net.minecraft.world.item.crafting.ShapedRecipePattern data - -# Used to register villager trades -# TODO: PR to NeoForge -public net.minecraft.world.entity.npc.VillagerTrades$EmeraldForItems -public net.minecraft.world.entity.npc.VillagerTrades$ItemsForEmeralds +# To write textures to a byte[] +public com.mojang.blaze3d.platform.NativeImage writeToChannel(Ljava/nio/channels/WritableByteChannel;)Z # Used for jetpack public net.minecraft.server.network.ServerGamePacketListenerImpl aboveGroundTickCount # Used to delay attacks after a barrel interaction public net.minecraft.client.multiplayer.MultiPlayerGameMode destroyDelay + +# Used to easily get the server +public net.minecraft.server.level.ServerPlayer server diff --git a/src/main/resources/assets/modern_industrialization/ae2/parts/energy_p2p_tunnel.json b/src/main/resources/assets/modern_industrialization/ae2/parts/energy_p2p_tunnel.json new file mode 100644 index 000000000..03f85f91a --- /dev/null +++ b/src/main/resources/assets/modern_industrialization/ae2/parts/energy_p2p_tunnel.json @@ -0,0 +1,20 @@ +{ + "model": { + "type": "ae2:composite", + "models": [ + { + "type": "ae2:model", + "model": "modern_industrialization:part/energy_p2p_tunnel" + }, + { + "type": "ae2:p2p_tunnel_frequency" + }, + { + "type": "ae2:status_indicator", + "active": "ae2:part/p2p_tunnel_status_has_channel", + "powered": "ae2:part/p2p_tunnel_status_on", + "unpowered": "ae2:part/p2p_tunnel_status_off" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modern_industrialization/models/base/tank.json b/src/main/resources/assets/modern_industrialization/models/base/tank.json index 46e81f4ba..85c8dfffa 100644 --- a/src/main/resources/assets/modern_industrialization/models/base/tank.json +++ b/src/main/resources/assets/modern_industrialization/models/base/tank.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/block", "render_type": "cutout", "textures": { "particle": "#0" diff --git a/src/main/resources/assets/modern_industrialization/models/block/industrial_tnt.json b/src/main/resources/assets/modern_industrialization/models/block/industrial_tnt.json deleted file mode 100644 index 25c0e24b1..000000000 --- a/src/main/resources/assets/modern_industrialization/models/block/industrial_tnt.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "minecraft:block/tnt_top", - "bottom": "minecraft:block/tnt_bottom", - "side": "modern_industrialization:block/itnt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/modern_industrialization/models/block/nuke.json b/src/main/resources/assets/modern_industrialization/models/block/nuke.json deleted file mode 100644 index f2e90470a..000000000 --- a/src/main/resources/assets/modern_industrialization/models/block/nuke.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "minecraft:block/tnt_top", - "bottom": "minecraft:block/tnt_bottom", - "side": "modern_industrialization:block/nuke" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/modern_industrialization/models/item/redstone_control_module.json b/src/main/resources/assets/modern_industrialization/models/item/redstone_control_module.json deleted file mode 100644 index 70ef36f63..000000000 --- a/src/main/resources/assets/modern_industrialization/models/item/redstone_control_module.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "modern_industrialization:item/redstone_control_module_high" - }, - "overrides": [ - { - "predicate": { - "modern_industrialization:redstone_control_module": 0.5 - }, - "model": "modern_industrialization:item/redstone_control_module_low" - } - ] -} diff --git a/src/main/resources/assets/modern_industrialization/models/item/redstone_control_module_low.json b/src/main/resources/assets/modern_industrialization/models/item/redstone_control_module_low.json deleted file mode 100644 index 0fe205b52..000000000 --- a/src/main/resources/assets/modern_industrialization/models/item/redstone_control_module_low.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "modern_industrialization:item/redstone_control_module_low" - } -} diff --git a/src/main/resources/assets/modern_industrialization/models/part/energy_p2p_tunnel.json b/src/main/resources/assets/modern_industrialization/models/part/energy_p2p_tunnel.json index 04be83488..0ee5093c9 100644 --- a/src/main/resources/assets/modern_industrialization/models/part/energy_p2p_tunnel.json +++ b/src/main/resources/assets/modern_industrialization/models/part/energy_p2p_tunnel.json @@ -1,5 +1,5 @@ { - "parent": "ae2:part/p2p/p2p_tunnel_base", + "parent": "ae2:part/p2p_tunnel_base", "textures": { "type": "modern_industrialization:block/superconductor_coil_side" } diff --git a/src/main/resources/assets/modern_industrialization/models/part/me_wire_connector.json b/src/main/resources/assets/modern_industrialization/models/part/me_wire_connector.json index 31b2d05de..b491942fe 100644 --- a/src/main/resources/assets/modern_industrialization/models/part/me_wire_connector.json +++ b/src/main/resources/assets/modern_industrialization/models/part/me_wire_connector.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "textures": { "1": "ae2:part/import_bus", - "2": "ae2:part/import_bus_sides" + "2": "ae2:part/import_bus_sides", + "particle": "#1" }, "elements": [ { diff --git a/src/main/resources/assets/modern_industrialization/textures/block/itnt.png b/src/main/resources/assets/modern_industrialization/textures/block/industrial_tnt.png similarity index 100% rename from src/main/resources/assets/modern_industrialization/textures/block/itnt.png rename to src/main/resources/assets/modern_industrialization/textures/block/industrial_tnt.png diff --git a/src/main/resources/data/modern_industrialization/recipe/armor/diesel_jetpack.json b/src/main/resources/data/modern_industrialization/recipe/armor/diesel_jetpack.json deleted file mode 100644 index 5cdcbe9e5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/armor/diesel_jetpack.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "PtP", - "McM", - "R R" - ], - "key" : { - "P" : { - "item" : "modern_industrialization:large_pump" - }, - "M": { - "item" : "modern_industrialization:large_motor" - }, - "R" : { - "item" : "modern_industrialization:aluminum_rotor" - }, - "t" : { - "item" : "modern_industrialization:aluminum_tank" - }, - "c": { - "item" : "modern_industrialization:electronic_circuit" - } - }, - "result": { - "id" : "modern_industrialization:diesel_jetpack" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/armor/gravichestplate.json b/src/main/resources/data/modern_industrialization/recipe/armor/gravichestplate.json deleted file mode 100644 index 10421b1cc..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/armor/gravichestplate.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "PUP", - "PCP", - "cPc" - ], - "key": { - "P": { - "item": "modern_industrialization:superconductor_plate" - }, - "U" : { - "item" : "modern_industrialization:highly_advanced_upgrade" - }, - "C" : { - "item": "modern_industrialization:superconductor_coil" - }, - "c" : { - "item" : "modern_industrialization:cooling_cell" - } - }, - "result": { - "id": "modern_industrialization:gravichestplate" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/armor/rubber_boots.json b/src/main/resources/data/modern_industrialization/recipe/armor/rubber_boots.json deleted file mode 100644 index 75a2eaa87..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/armor/rubber_boots.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "S S", - "S S" - ], - "key": { - "S": { - "item": "modern_industrialization:rubber_sheet" - } - }, - "result": { - "id": "modern_industrialization:rubber_boots" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/armor/rubber_helmet.json b/src/main/resources/data/modern_industrialization/recipe/armor/rubber_helmet.json deleted file mode 100644 index 7e68553ad..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/armor/rubber_helmet.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "SSS", - "S S" - ], - "key": { - "S": { - "item": "modern_industrialization:rubber_sheet" - } - }, - "result": { - "id": "modern_industrialization:rubber_helmet" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ingot_to_dust.json b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ingot_to_dust.json index 10d7dc49f..2e364abc6 100644 --- a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ingot_to_dust.json +++ b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ingot_to_dust.json @@ -8,13 +8,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ingots/osmium" + "ingredient": "#c:ingots/osmium" } ], "item_outputs": [ { "amount": 1, - "item": "mekanism:dust_osmium" + "id": "mekanism:dust_osmium" } ] } diff --git a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ore_to_raw.json b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ore_to_raw.json index 5d415e7c2..cd5ce4799 100644 --- a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ore_to_raw.json +++ b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/osmium_ore_to_raw.json @@ -8,13 +8,13 @@ "item_inputs": [ { "amount": 1, - "tag": "c:ores/osmium" + "ingredient": "#c:ores/osmium" } ], "item_outputs": [ { "amount": 3, - "item": "mekanism:raw_osmium" + "id": "mekanism:raw_osmium" } ] } diff --git a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/quarry/digital_miner.json b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/quarry/digital_miner.json index b985b5b5d..6e14dd5cf 100644 --- a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/quarry/digital_miner.json +++ b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/quarry/digital_miner.json @@ -6,33 +6,33 @@ "eu": 128, "duration": 600, "item_inputs": { - "item": "mekanism:digital_miner", + "ingredient": "mekanism:digital_miner", "amount": 1, "probability": 0.05 }, "item_outputs": [ { - "item": "mekanism:osmium_ore", + "id": "mekanism:osmium_ore", "amount": 1, "probability": 0.5 }, { - "item": "minecraft:diamond_ore", + "id": "minecraft:diamond_ore", "amount": 1, "probability": 0.25 }, { - "item": "modern_industrialization:lead_ore", + "id": "modern_industrialization:lead_ore", "amount": 1, "probability": 0.5 }, { - "item": "mekanism:fluorite_ore", + "id": "mekanism:fluorite_ore", "amount": 1, "probability": 0.4 }, { - "item": "modern_industrialization:uranium_ore", + "id": "modern_industrialization:uranium_ore", "amount": 1, "probability": 0.2 } diff --git a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/raw_osmium_to_dust.json b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/raw_osmium_to_dust.json index ccf992dc2..91d47477c 100644 --- a/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/raw_osmium_to_dust.json +++ b/src/main/resources/data/modern_industrialization/recipe/compat/mekanism/raw_osmium_to_dust.json @@ -8,17 +8,17 @@ "item_inputs": [ { "amount": 1, - "tag": "c:raw_materials/osmium" + "ingredient": "#c:raw_materials/osmium" } ], "item_outputs": [ { "amount": 1, - "item": "mekanism:dust_osmium" + "id": "mekanism:dust_osmium" }, { "amount": 1, - "item": "mekanism:dust_osmium", + "id": "mekanism:dust_osmium", "probability": 0.5 } ] diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/cadmium_battery_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/cadmium_battery_asbl.json deleted file mode 100644 index 2b5125c5d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/cadmium_battery_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cac", - "BrB", - "BrB" - ], - "key": - { - "a" : { - "tag" : "c:plates/battery_alloy" - }, - "c" : { - "item" : "modern_industrialization:annealed_copper_cable" - }, - "B" : { - "item" : "modern_industrialization:battery_alloy_curved_plate" - }, - "r" :{ - "tag" : "c:dusts/cadmium" - } - }, - - "result": { - "id": "modern_industrialization:cadmium_battery" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/lv_battery_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/lv_battery_asbl.json deleted file mode 100644 index 528a9e415..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/lv_battery_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cac", - "BrB", - "BrB" - ], - "key": - { - "a" : { - "tag" : "c:plates/battery_alloy" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "B" : { - "item" : "modern_industrialization:battery_alloy_curved_plate" - }, - "r" :{ - "item" : "minecraft:redstone" - } - }, - - "result": { - "id": "modern_industrialization:redstone_battery" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/plutonium_battery_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/plutonium_battery_asbl.json deleted file mode 100644 index af77d6a13..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/plutonium_battery_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cac", - "BrB", - "BrB" - ], - "key": - { - "a" : { - "tag" : "c:plates/battery_alloy" - }, - "c" : { - "item" : "modern_industrialization:superconductor_cable" - }, - "B" : { - "item" : "modern_industrialization:battery_alloy_curved_plate" - }, - "r" :{ - "tag" : "c:dusts/plutonium" - } - }, - - "result": { - "id": "modern_industrialization:plutonium_battery" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit_asbl.json deleted file mode 100644 index 2dd4e2197..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/portable_storage_unit_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "aCa", - "crc", - "aCa" - ], - "key": - { - "a" : { - "tag" : "c:plates/battery_alloy" - }, - "c" : { - "item" : "modern_industrialization:battery_alloy_curved_plate" - }, - "C" : { - "item" : "modern_industrialization:tin_cable" - }, - "r" :{ - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:portable_storage_unit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/silicon_battery_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/silicon_battery_asbl.json deleted file mode 100644 index 5b5b09711..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/silicon_battery_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cac", - "BrB", - "BrB" - ], - "key": - { - "a" : { - "tag" : "c:plates/battery_alloy" - }, - "c" : { - "item" : "modern_industrialization:electrum_cable" - }, - "B" : { - "item" : "modern_industrialization:battery_alloy_curved_plate" - }, - "r" :{ - "tag" : "c:dusts/silicon" - } - }, - - "result": { - "id": "modern_industrialization:silicon_battery" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/sodium_battery_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/sodium_battery_asbl.json deleted file mode 100644 index 25e4d316f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/battery/sodium_battery_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cac", - "BrB", - "BrB" - ], - "key": - { - "a" : { - "tag" : "c:plates/battery_alloy" - }, - "c" : { - "item" : "modern_industrialization:aluminum_cable" - }, - "B" : { - "item" : "modern_industrialization:battery_alloy_curved_plate" - }, - "r" :{ - "tag" : "c:dusts/sodium" - } - }, - - "result": { - "id": "modern_industrialization:sodium_battery" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json deleted file mode 100644 index d6b7f662b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_barrel.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 1000, - "item_inputs": [ - { - "item": "modern_industrialization:quantum_machine_hull", - "amount": 1 - }, - { - "item": "modern_industrialization:singularity", - "amount": 1 - }, - { - "item": "modern_industrialization:quantum_circuit", - "amount": 2 - }, - { - "tag": "c:plates/iridium", - "amount": 16 - }, - { - "item": "modern_industrialization:large_advanced_motor", - "amount": 8 - }, - { - "item": "modern_industrialization:titanium_barrel", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:quantum_barrel", - "amount": 1 - } - ] -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json deleted file mode 100644 index bb36eb468..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/assembler/quantum_tank.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 1000, - "item_inputs": [ - { - "item": "modern_industrialization:quantum_machine_hull", - "amount": 1 - }, - { - "item": "modern_industrialization:singularity", - "amount": 1 - }, - { - "item": "modern_industrialization:quantum_circuit", - "amount": 2 - }, - { - "tag": "c:plates/iridium", - "amount": 16 - }, - { - "item": "modern_industrialization:large_advanced_pump", - "amount": 8 - }, - { - "item": "modern_industrialization:titanium_tank", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:quantum_tank", - "amount": 1 - } - ] -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber_asbl.json deleted file mode 100644 index b1ecddaad..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/blocks/fusion_chamber_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ChC", - "LHL", - "ChC" - ], - "key": { - "C" : { - "item" : "modern_industrialization:superconductor_coil" - }, - "h" : { - "item" : "modern_industrialization:large_heat_exchanger" - }, - "L" : { - "item" : "modern_industrialization:nuclear_alloy_large_plate" - }, - "H" : { - "item" : "modern_industrialization:plasma_handling_iridium_machine_casing" - } - }, - "result": { - "id": "modern_industrialization:fusion_chamber" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing_asbl.json deleted file mode 100644 index 8fb5df046..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/advanced_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "AHA", - "AAA" - ], - "key": { - "A" : { - "tag" : "c:plates/aluminum" - }, - "H" : { - "item" : "modern_industrialization:basic_machine_hull" - } - }, - "result": { - "id": "modern_industrialization:advanced_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/blastproof_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/blastproof_casing_asbl.json deleted file mode 100644 index 8aaf7a447..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/blastproof_casing_asbl.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "A A", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/blastproof_alloy" - } - }, - "result": { - "id": "modern_industrialization:blastproof_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks_asbl.json deleted file mode 100644 index 0b648a7f6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/bronze_plated_bricks_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "AHA", - "AAA" - ], - "key": { - "A" : { - "tag" : "c:plates/bronze" - }, - "H" : { - "item" : "modern_industrialization:fire_clay_bricks" - } - }, - "result": { - "id": "modern_industrialization:bronze_plated_bricks" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing_asbl.json deleted file mode 100644 index f13d01fff..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/clean_stainless_steel_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "AGA", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/stainless_steel" - }, - "G" : { - "tag": "c:gears/stainless_steel" - } - }, - "result": { - "id": "modern_industrialization:clean_stainless_steel_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing_asbl.json deleted file mode 100644 index 3b7642326..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/frostproof_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "AGA", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/aluminum" - }, - "G" : { - "tag" : "c:gears/aluminum" - } - }, - "result": { - "id": "modern_industrialization:frostproof_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing_asbl.json deleted file mode 100644 index 99016b0c1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/heatproof_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PPP", - "PGP", - "PPP" - ], - "key": { - "P": { - "tag": "c:plates/invar" - }, - "G" : { - "tag" : "c:gears/invar" - } - }, - "result": { - "id": "modern_industrialization:heatproof_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing_asbl.json deleted file mode 100644 index f00c70759..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/highly_advanced_machine_casing_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ACA", - "CHC", - "ACA" - ], - "key": { - "A" : { - "tag" : "c:plates/titanium" - }, - "C" : { - "tag" : "c:plates/chromium" - }, - "H" : { - "item" : "modern_industrialization:turbo_machine_hull" - } - }, - "result": { - "id": "modern_industrialization:highly_advanced_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe_asbl.json deleted file mode 100644 index 3fa0c2ab3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/iridium_machine_casing_pipe_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "pPp", - "p#p", - "pPp" - ], - "key": { - "#": { - "item": "modern_industrialization:plasma_handling_iridium_machine_casing" - }, - "p": { - "item": "modern_industrialization:iridium_curved_plate" - }, - "P" : { - "item" : "modern_industrialization:large_advanced_pump" - } - }, - "result": { - "id": "modern_industrialization:iridium_machine_casing_pipe", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_casing_asbl.json deleted file mode 100644 index f4120e417..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_casing_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "ACA", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/nuclear_alloy" - }, - - "C" : { - "item" : "modern_industrialization:turbo_machine_hull" - } - }, - "result": { - "id": "modern_industrialization:nuclear_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch_asbl.json deleted file mode 100644 index 5b9c1ce63..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_fluid_hatch_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "ACA", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/nuclear_alloy" - }, - - "C" : { - "item" : "modern_industrialization:highly_advanced_fluid_input_hatch" - } - }, - "result": { - "id": "modern_industrialization:nuclear_fluid_hatch" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch_asbl.json deleted file mode 100644 index c9e872bc7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_item_hatch_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "ACA", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/nuclear_alloy" - }, - - "C" : { - "item" : "modern_industrialization:highly_advanced_item_input_hatch" - } - }, - "result": { - "id": "modern_industrialization:nuclear_item_hatch" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing_asbl.json deleted file mode 100644 index 9fc67fa67..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/nuclear_pipe_casing_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cPc", - "cCc", - "cPc" - ], - "key": { - "c" : { - "item": "modern_industrialization:blastproof_alloy_curved_plate" - }, - "P" : { - "item": "modern_industrialization:advanced_pump" - }, - "C" : { - "item" : "modern_industrialization:nuclear_casing" - } - }, - "result": { - "id": "modern_industrialization:nuclear_alloy_machine_casing_pipe" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing_asbl.json deleted file mode 100644 index f5521f97b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/plasma_handling_iridium_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "AAA", - "ACA", - "AAA" - ], - "key": { - "A": { - "tag": "c:plates/iridium" - }, - "C": { - "item": "modern_industrialization:superconductor_coil" - } - }, - "result": { - "id": "modern_industrialization:plasma_handling_iridium_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing_asbl.json deleted file mode 100644 index 918eb282e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/quantum_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "AAA", - "AHA", - "AAA" - ], - "key": { - "A": { - "tag": "c:plates/iridium" - }, - "H": { - "item": "modern_industrialization:highly_advanced_machine_hull" - } - }, - "result": { - "id": "modern_industrialization:quantum_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing_asbl.json deleted file mode 100644 index 1fa101269..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/solid_titanium_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "AGA", - "AAA" - ], - "key": { - "A" : { - "tag": "c:plates/titanium" - }, - "G" : { - "tag" : "c:gears/titanium" - } - }, - "result": { - "id": "modern_industrialization:solid_titanium_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe_asbl.json deleted file mode 100644 index 64b6df35a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/stainless_steel_casing_pipe_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "p p", - "p#p", - "p p" - ], - "key": { - "#": { - "item": "modern_industrialization:clean_stainless_steel_machine_casing" - }, - "p": { - "item": "modern_industrialization:stainless_steel_curved_plate" - } - }, - "result": { - "id": "modern_industrialization:stainless_steel_machine_casing_pipe", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe_asbl.json deleted file mode 100644 index 1c17c1a6b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/titanium_casing_pipe_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "p p", - "p#p", - "p p" - ], - "key": { - "#": { - "item": "modern_industrialization:solid_titanium_machine_casing" - }, - "p": { - "item": "modern_industrialization:titanium_curved_plate" - } - }, - "result": { - "id": "modern_industrialization:titanium_machine_casing_pipe", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing_asbl.json deleted file mode 100644 index fdaf3bb35..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/casing/turbo_machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AAA", - "AHA", - "AAA" - ], - "key": { - "A" : { - "tag" : "c:plates/stainless_steel" - }, - "H" : { - "item" : "modern_industrialization:advanced_machine_hull" - } - }, - "result": { - "id": "modern_industrialization:turbo_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json deleted file mode 100644 index 36f962f3d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/digital_circuit_board.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 16, - "duration": 500, - "item_inputs": [ - { - "item": "modern_industrialization:aluminum_cable", - "amount": 6 - }, - { - "item": "modern_industrialization:silicon_battery", - "amount": 1 - }, - { - "item": "modern_industrialization:electronic_circuit_board", - "amount": 1 - }, - { - "item": "modern_industrialization:stainless_steel_plate", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid" : "modern_industrialization:polyethylene", - "amount" : 750 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:digital_circuit_board", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json deleted file mode 100644 index 237c6d1bf..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/processing_unit_board.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 1200, - "item_inputs": [ - { - "item": "modern_industrialization:annealed_copper_cable", - "amount": 8 - }, - { - "item": "modern_industrialization:cadmium_battery", - "amount": 2 - }, - { - "item": "modern_industrialization:digital_circuit_board", - "amount": 1 - }, - { - "tag": "c:plates/platinum", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid" : "modern_industrialization:polyvinyl_chloride", - "amount" : 1500 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:processing_unit_board", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json deleted file mode 100644 index 577e3f665..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/assembler/quantum_circuit_board.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 64, - "duration": 2000, - "item_inputs": [ - { - "item": "modern_industrialization:superconductor_cable", - "amount": 12 - }, - { - "item": "modern_industrialization:plutonium_battery", - "amount": 2 - }, - { - "item": "modern_industrialization:processing_unit_board", - "amount": 1 - }, - { - "tag": "c:plates/iridium", - "amount": 6 - } - ], - - "fluid_inputs": [ - { - "fluid": "modern_industrialization:helium_3", - "amount" : 50 - } - ], - - "item_outputs": [ - { - "item": "modern_industrialization:quantum_circuit_board", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit_asbl.json deleted file mode 100644 index b41811363..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/digital_circuit_asbl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "cOc", - "NbN", - "cAc" - ], - - "key": - { - "O" : { - "item" : "modern_industrialization:or_gate" - }, - "c" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "N" : { - "item" : "modern_industrialization:not_gate" - }, - "A" : { - "item" : "modern_industrialization:and_gate" - }, - "b" :{ - "item" : "modern_industrialization:digital_circuit_board" - } - }, - - "result": { - "id": "modern_industrialization:digital_circuit" - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_asbl.json deleted file mode 100644 index f279d3991..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "cdc", - "tbt", - "cdc" - ], - - "key": - { - "d" : { - "item" : "modern_industrialization:diode" - }, - "c" : { - "item" : "modern_industrialization:analog_circuit" - }, - "t" : { - "item" : "modern_industrialization:transistor" - }, - "b" :{ - "item" : "modern_industrialization:electronic_circuit_board" - } - }, - - "result": { - "id": "modern_industrialization:electronic_circuit" - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board_asbl.json deleted file mode 100644 index 6342227a4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/electronic_circuit_board_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "eAe", - "AbA", - "eBe" - ], - - "key": - { - "A" : { - "tag" : "c:plates/aluminum" - }, - "e" : { - "item" : "modern_industrialization:electrum_cable" - }, - "b" :{ - "item" : "modern_industrialization:analog_circuit_board" - }, - "B" : { - "item" : "modern_industrialization:redstone_battery" - } - }, - - "result": { - "id": "modern_industrialization:electronic_circuit_board" - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_asbl.json deleted file mode 100644 index daac551e9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "RLR", - "CBC", - "www" - ], - "key": - { - "L" : { - "item" : "modern_industrialization:inductor" - }, - "w" : { - "item" : "modern_industrialization:copper_wire" - }, - "R" : { - "item" : "modern_industrialization:resistor" - }, - "C" : { - "item" : "modern_industrialization:capacitor" - }, - "B": { - "item" : "modern_industrialization:analog_circuit_board" - } - }, - - "result": { - "id": "modern_industrialization:analog_circuit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board_asbl.json deleted file mode 100644 index 9a8ae09a4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/lv_circuit_board_asbl.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "r", - "c", - "r" - ], - "key": - { - "r" : { - "item" : "modern_industrialization:rubber_sheet" - }, - "c" : { - "tag" : "c:plates/copper" - } - }, - - "result": { - "id": "modern_industrialization:analog_circuit_board" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit_asbl.json deleted file mode 100644 index ff4fa9099..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/processing_unit_asbl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "DUD", - "MbM", - "DAD" - ], - - "key": - { - "D" : { - "item" : "modern_industrialization:digital_circuit" - }, - "M" : { - "item" : "modern_industrialization:random_access_memory" - }, - "U" : { - "item" : "modern_industrialization:memory_management_unit" - }, - "A" : { - "item" : "modern_industrialization:arithmetic_logic_unit" - }, - "b" :{ - "item" : "modern_industrialization:processing_unit_board" - } - }, - - "result": { - "id": "modern_industrialization:processing_unit" - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit_asbl.json deleted file mode 100644 index f286aa34e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/circuit/craft/quantum_circuit_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "PCP", - "QbQ", - "PCP" - ], - - "key": - { - "P" : { - "item" : "modern_industrialization:processing_unit" - }, - "C" : { - "item" : "modern_industrialization:cooling_cell" - }, - "Q" : { - "item" : "modern_industrialization:qubit" - }, - "b" :{ - "item" : "modern_industrialization:quantum_circuit_board" - } - }, - - "result": { - "id": "modern_industrialization:quantum_circuit" - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json deleted file mode 100644 index 8dd078ca8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/advanced_pump.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "modern_industrialization:fluid_pipes", - "amount": 3 - }, - { - "item": "modern_industrialization:stainless_steel_rotor", - "amount": 3 - }, - { - "item": "modern_industrialization:advanced_motor", - "amount": 1 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:soldering_alloy", - "amount": 200 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:advanced_pump", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json deleted file mode 100644 index 0e7e032c5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/capacitor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "c:plates/gold", - "amount": 2 - }, - { - "item": "modern_industrialization:copper_wire", - "amount": 2 - }, - { - "item": "modern_industrialization:rubber_sheet", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:capacitor", - "amount": 4 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json deleted file mode 100644 index 8aa644489..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/cooling_cell.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 16, - "duration": 400, - "item_inputs": [ - { - "tag": "modern_industrialization:fluid_pipes", - "amount": 3 - }, - { - "item": "modern_industrialization:small_heat_exchanger", - "amount": 2 - }, - { - "tag" : "c:plates/tin", - "amount": 6 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:cryofluid", - "amount": 1000 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:cooling_cell", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json deleted file mode 100644 index d094d5117..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/inductor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "item": "modern_industrialization:copper_wire", - "amount": 8 - }, - { - "tag": "c:rods/steel", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:inductor", - "amount": 4 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/pump.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/pump.json deleted file mode 100644 index 55bd627f2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/pump.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "modern_industrialization:fluid_pipes", - "amount": 3 - }, - { - "item": "modern_industrialization:tin_rotor", - "amount": 3 - }, - { - "item": "modern_industrialization:motor", - "amount": 1 - } - ], - - "fluid_inputs": [ - { - "fluid": "modern_industrialization:soldering_alloy", - "amount": 100 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:pump", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json deleted file mode 100644 index bc042d7d8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/qubit.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 20, - "duration": 400, - "item_inputs": [ - { - "item": "modern_industrialization:arithmetic_logic_unit", - "amount": 2 - }, - { - - "tag": "c:plates/carbon", - "amount": 2 - }, - { - "tag": "c:glass_panes", - "amount": 2 - }, - { - "item" : "modern_industrialization:superconductor_wire", - "amount": 6 - } - ], - - "fluid_inputs": [ - { - "fluid" : "modern_industrialization:cryofluid", - "amount": 250 - }, - - { - "fluid" : "modern_industrialization:tritium", - "amount": 50 - } - ], - - "item_outputs": [ - { - "item": "modern_industrialization:qubit", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json deleted file mode 100644 index 0aae5ffcc..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/assembler/resistor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "item": "modern_industrialization:copper_fine_wire", - "amount": 2 - }, - { - "tag": "c:dusts/coal", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:resistor", - "amount": 12 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json deleted file mode 100644 index ec86d1664..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/blast_furnace/monocrystalline_silicon.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 64, - "duration": 1500, - "item_inputs": [{ - "tag": "c:dusts/silicon", - "amount": 32 - }, - { - "tag": "c:tiny_dusts/iridium", - "amount": 1 - } - ], - "fluid_inputs":{ - "fluid" : "modern_industrialization:argon", - "amount": 1250 - }, - "item_outputs": { - "item": "modern_industrialization:monocrystalline_silicon", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json deleted file mode 100644 index 3ecccafc6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/n_doped_silicon.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 400, - "item_inputs": [ - { - "tag" : "c:plates/silicon", - "amount": 1 - }, - { - "tag" : "c:tiny_dusts/antimony", - "amount": 1 - } - ], - "item_outputs": { - "item" : "modern_industrialization:silicon_n_doped_plate", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json deleted file mode 100644 index 23b4e6288..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/p_doped_silicon.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 400, - "item_inputs": [ - { - "tag" : "c:plates/silicon", - "amount": 1 - }, - { - "tag" : "c:tiny_dusts/aluminum", - "amount": 1 - } - ], - "item_outputs": { - "item" : "modern_industrialization:silicon_p_doped_plate", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json deleted file mode 100644 index 7f69f71c4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/chemical_reactor/random_acces_memory.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 12, - "duration": 400, - "item_inputs": [ - { - "item" : "modern_industrialization:silicon_wafer", - "amount": 1 - }, - { - "tag" : "c:dusts/antimony", - "amount": 1 - }, - { - "tag" : "c:dusts/aluminum", - "amount": 1 - } - ], - - "fluid_inputs": [ - { - "fluid" : "modern_industrialization:argon", - "amount" : 250 - }, - { - "fluid" : "modern_industrialization:styrene_butadiene_rubber", - "amount" : 500 - } - ], - "item_outputs": { - "item" : "modern_industrialization:random_access_memory", - "amount": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor_asbl.json deleted file mode 100644 index dc490b18e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_motor_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cwr", - "wmw", - "rwc" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:stainless_steel_rod_magnetic" - }, - "r" : { - "tag" : "c:rods/stainless_steel" - }, - "c" : { - "item" : "modern_industrialization:aluminum_cable" - }, - "w" :{ - "item" : "modern_industrialization:annealed_copper_wire" - } - }, - - "result": { - "id": "modern_industrialization:advanced_motor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json deleted file mode 100644 index d502e7855..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/advanced_pump.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ppp", - "rmr", - "brb" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:advanced_motor" - }, - "r" : { - "item" : "modern_industrialization:stainless_steel_rotor" - }, - "p" :{ - "tag" : "modern_industrialization:fluid_pipes" - }, - "b" :{ - "item" : "modern_industrialization:stainless_steel_bolt" - } - }, - - "result": { - "id": "modern_industrialization:advanced_pump" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/air_intake_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/air_intake_asbl.json deleted file mode 100644 index ce2aa1501..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/air_intake_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ara", - "rRr", - "ara" - ], - "key": - { - "r" : { - "tag" : "c:plates/stainless_steel" - }, - "R" : { - "item" : "modern_industrialization:stainless_steel_rotor" - }, - "a" :{ - "tag" : "c:plates/aluminum" - } - }, - - "result": { - "id": "modern_industrialization:air_intake" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/and_gate_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/and_gate_asbl.json deleted file mode 100644 index 0869375d6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/and_gate_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "wr ", - "wAw", - "wr " - ], - "key": { - "r": { - "item" : "modern_industrialization:resistor" - }, - "A": { - "item" : "modern_industrialization:op_amp" - }, - "w":{ - "item" : "modern_industrialization:aluminum_wire" - } - }, - - "result": { - "id": "modern_industrialization:and_gate" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit_asbl.json deleted file mode 100644 index ee2f14659..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/arithmetic_logic_unit_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "NaN", - "oPo", - "NaN" - ], - - "key": - { - "P" : { - "tag" : "c:plates/diamond" - }, - "a" : { - "item" : "modern_industrialization:and_gate" - }, - "o" : { - "item" : "modern_industrialization:or_gate" - }, - "N" :{ - "item" : "modern_industrialization:not_gate" - } - }, - - "result": { - "id": "modern_industrialization:arithmetic_logic_unit", - "count": 1 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json deleted file mode 100644 index 050c72962..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/capacitor.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " P ", - "wSw", - " P " - ], - "key": - { - "P" : { - "tag" : "c:plates/gold" - }, - "w" : { - "item" : "modern_industrialization:copper_wire" - }, - "S" : { - "item" : "modern_industrialization:rubber_sheet" - } - }, - - "result": { - "id": "modern_industrialization:capacitor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/conveyor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/conveyor_asbl.json deleted file mode 100644 index 7dd39f696..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/conveyor_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "rrr", - "mcm", - "rrr" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:motor" - }, - "r" : { - "item" : "modern_industrialization:rubber_sheet" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - } - }, - - "result": { - "id": "modern_industrialization:conveyor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_asbl.json deleted file mode 100644 index c615ba6d5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "ePg", - "eSg", - "ePg" - ], - - "key": - { - "S" : { - "tag" : "c:plates/silicon" - }, - "g" : { - "tag" : "c:glass_blocks" - }, - "e" : { - "item" : "modern_industrialization:electrum_fine_wire" - }, - "P" :{ - "tag" : "c:plates/steel" - } - }, - - "result": { - "id": "modern_industrialization:diode" - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_doped_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_doped_asbl.json deleted file mode 100644 index f594a0d3a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/diode_doped_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "ePg", - "eSg", - "ePg" - ], - - "key": - { - "S" : { - "item" : "modern_industrialization:silicon_n_doped_plate" - }, - "g" : { - "tag" : "c:glass_blocks" - }, - "e" : { - "item" : "modern_industrialization:electrum_fine_wire" - }, - "P" :{ - "tag" : "c:plates/steel" - } - }, - - "result": { - "id": "modern_industrialization:diode", - "count": 2 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/inductor.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/inductor.json deleted file mode 100644 index 439f5c570..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/inductor.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "www", - "wrw", - "www" - ], - "key": - { - "r" : { - "tag" : "c:rods/steel" - }, - "w" : { - "item" : "modern_industrialization:copper_wire" - } - }, - - "result": { - "id": "modern_industrialization:inductor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade_asbl.json deleted file mode 100644 index b83ac9e47..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/invar_rotary_blade_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " d ", - "dGd", - " d " - ], - "key": { - "d" : { - "tag" : "c:dusts/diamond" - }, - "G": { - "tag" : "c:gears/invar" - } - }, - "result": { - "id": "modern_industrialization:invar_rotary_blade" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor_asbl.json deleted file mode 100644 index 863826222..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_motor_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "mmm", - "Crr", - "mmm" - ], - "key": { - "C" : { - "item" : "modern_industrialization:processing_unit" - }, - "r" : { - "tag" : "c:rods/titanium" - }, - "m" : { - "item" : "modern_industrialization:advanced_motor" - } - }, - "result": { - "id": "modern_industrialization:large_advanced_motor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump_asbl.json deleted file mode 100644 index 90503e589..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_advanced_pump_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ppp", - "rMr", - "CrC" - ], - "key": { - "C" : { - "item" : "modern_industrialization:processing_unit" - }, - "r" : { - "item" : "modern_industrialization:titanium_rotor" - }, - "M" : { - "item" : "modern_industrialization:large_advanced_motor" - }, - "p": { - "item" : "modern_industrialization:advanced_pump" - } - }, - "result": { - "id": "modern_industrialization:large_advanced_pump" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger_asbl.json deleted file mode 100644 index ab6cb503b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_heat_exchanger_asbl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "ghg", - "RLR", - "ghg" - ], - "key": { - "h": { - "item" : "modern_industrialization:small_heat_exchanger" - }, - "L": { - "item" : "modern_industrialization:large_advanced_pump" - }, - "R":{ - "item" : "modern_industrialization:aluminum_rotor" - }, - "g" : { - "tag" : "c:gears/invar" - } - }, - - "result": { - "id": "modern_industrialization:large_heat_exchanger" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_motor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_motor_asbl.json deleted file mode 100644 index 61fb9f006..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_motor_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "mmm", - "Crr", - "mmm" - ], - "key": { - "C" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "r" : { - "tag" : "c:rods/aluminum" - }, - "m" : { - "item" : "modern_industrialization:motor" - } - }, - "result": { - "id": "modern_industrialization:large_motor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_pump_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_pump_asbl.json deleted file mode 100644 index 2ee2ad2f1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/large_pump_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ppp", - "rMr", - "CrC" - ], - "key": { - "C" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "r" : { - "item" : "modern_industrialization:aluminum_rotor" - }, - "M" : { - "item" : "modern_industrialization:large_motor" - }, - "p": { - "item" : "modern_industrialization:pump" - } - }, - "result": { - "id": "modern_industrialization:large_pump" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit_asbl.json deleted file mode 100644 index f5aaa83ce..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/memory_management_unit_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "WWW", - "wPw", - "WWW" - ], - - "key": - { - "P" : { - "tag" : "c:plates/emerald" - }, - "w" : { - "item" : "modern_industrialization:silicon_wafer" - }, - "W" : { - "item" : "modern_industrialization:platinum_fine_wire" - } - }, - - "result": { - "id": "modern_industrialization:memory_management_unit", - "count": 1 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/motor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/motor_asbl.json deleted file mode 100644 index 400fa497f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/motor_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cwr", - "wmw", - "rwc" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:steel_rod_magnetic" - }, - "r" : { - "tag" : "c:rods/steel" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "w" :{ - "item" : "modern_industrialization:copper_wire" - } - }, - - "result": { - "id": "modern_industrialization:motor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/not_gate_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/not_gate_asbl.json deleted file mode 100644 index eb10014b0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/not_gate_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - " ", - "wAr", - " " - ], - "key": { - "r": { - "item" : "modern_industrialization:resistor" - }, - "A": { - "item" : "modern_industrialization:op_amp" - }, - "w":{ - "item" : "modern_industrialization:aluminum_wire" - } - }, - - "result": { - "id": "modern_industrialization:not_gate" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/op_amp_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/op_amp_asbl.json deleted file mode 100644 index 8a892ea75..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/op_amp_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "rTT", - "rdr", - "rTT" - ], - "key": { - "r": { - "item" : "modern_industrialization:resistor" - }, - "T": { - "item" : "modern_industrialization:transistor" - }, - "d":{ - "item" : "modern_industrialization:diode" - } - }, - - "result": { - "id": "modern_industrialization:op_amp" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/or_gate_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/or_gate_asbl.json deleted file mode 100644 index 018fa828c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/or_gate_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - " A ", - "wdw", - " A " - ], - "key": { - "A": { - "item" : "modern_industrialization:op_amp" - }, - "w":{ - "item" : "modern_industrialization:aluminum_wire" - }, - "d": { - "item" : "modern_industrialization:diode" - } - }, - - "result": { - "id": "modern_industrialization:or_gate" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module_asbl.json deleted file mode 100644 index 3692ae509..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/overdrive_module_asbl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "wdw", - "tbt", - "wdw" - ], - "key": { - "d": { - "item": "modern_industrialization:diode" - }, - "t": { - "item": "modern_industrialization:transistor" - }, - "w": { - "item": "modern_industrialization:electrum_fine_wire" - }, - "b": { - "item": "modern_industrialization:electronic_circuit_board" - } - }, - "result": { - "id": "modern_industrialization:overdrive_module" - } -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/piston_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/piston_asbl.json deleted file mode 100644 index 5379eef86..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/piston_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ppp", - "crr", - "cmg" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:motor" - }, - "r" : { - "tag" : "c:rods/steel" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "p" :{ - "tag" : "c:plates/steel" - }, - "g" :{ - "tag" : "c:gears/steel" - } - }, - - "result": { - "id": "modern_industrialization:piston" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/pump.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/pump.json deleted file mode 100644 index b2853babd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/pump.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ppp", - "rmr", - "brb" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:motor" - }, - "r" : { - "item" : "modern_industrialization:tin_rotor" - }, - "p" :{ - "tag" : "modern_industrialization:fluid_pipes" - }, - "b" :{ - "item" : "modern_industrialization:tin_bolt" - } - }, - - "result": { - "id": "modern_industrialization:pump" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module_asbl.json deleted file mode 100644 index 5e4dbfcea..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/redstone_control_module_asbl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "dtd", - "rcr", - "ibi" - ], - "key": { - "d": { - "item": "minecraft:redstone" - }, - "t": { - "item": "minecraft:redstone_torch" - }, - "c": { - "item": "modern_industrialization:capacitor" - }, - "r": { - "item": "modern_industrialization:resistor" - }, - "b": { - "item": "modern_industrialization:analog_circuit_board" - }, - "i": { - "item": "modern_industrialization:inductor" - } - }, - "result": { - "id": "modern_industrialization:redstone_control_module" - } -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/resistor.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/resistor.json deleted file mode 100644 index 3a1c035c1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/resistor.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " P ", - "FCF", - " P " - ], - "key": - { - "P" : { - "item" : "minecraft:paper" - }, - "F" : { - "item" : "modern_industrialization:copper_fine_wire" - }, - "C" : { - "tag" : "c:dusts/coal" - } - }, - - "result": { - "id": "modern_industrialization:resistor", - "count": 3 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/robot_arm_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/robot_arm_asbl.json deleted file mode 100644 index 3564b2da9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/robot_arm_asbl.json +++ /dev/null @@ -1,31 +0,0 @@ - -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ccc", - "mrm", - "pCr" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:motor" - }, - "r" : { - "tag" : "c:rods/steel" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "p" :{ - "item" : "modern_industrialization:piston" - }, - "C" :{ - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:robot_arm" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger_asbl.json deleted file mode 100644 index 4e105287f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/small_heat_exchanger_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "pPp", - "PLP", - "pPp" - ], - "key": { - "P": { - "tag" : "c:plates/invar" - }, - "L": { - "item" : "modern_industrialization:stainless_steel_large_plate" - }, - "p":{ - "item" : "modern_industrialization:advanced_pump" - } - }, - - "result": { - "id": "modern_industrialization:small_heat_exchanger" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json deleted file mode 100644 index 9e894e70e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/steel_rod_magnetic.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " RR", - "RrR", - "RR " - ], - "key": { - "R": { - "item": "minecraft:redstone" - }, - "r": { - "tag": "c:rods/steel" - } - }, - "result": { - "id": "modern_industrialization:steel_rod_magnetic" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_asbl.json deleted file mode 100644 index 1bd9a33a1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - " e ", - "PPP", - "SSS" - ], - - "key": - { - "S" : { - "tag" : "c:plates/silicon" - }, - "e" : { - "item" : "modern_industrialization:electrum_fine_wire" - }, - "P" :{ - "tag" : "c:plates/steel" - } - }, - - "result": { - "id": "modern_industrialization:transistor", - "count": 2 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped_asbl.json deleted file mode 100644 index 102f2af98..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/transistor_doped_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - " e ", - "PPP", - "SsS" - ], - - "key": - { - "S" : { - "item" : "modern_industrialization:silicon_p_doped_plate" - }, - "s" : { - "item" : "modern_industrialization:silicon_n_doped_plate" - }, - "e" : { - "item" : "modern_industrialization:electrum_fine_wire" - }, - "P" :{ - "tag" : "c:plates/steel" - } - }, - - "result": { - "id": "modern_industrialization:transistor", - "count": 4 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball_asbl.json deleted file mode 100644 index a1ef349fd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/craft/ultradense_metal_ball_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "TlT", - "lIl", - "TlT" - ], - "key": { - "T": { - "item" : "modern_industrialization:tungsten_large_plate" - }, - "l": { - "tag" : "c:plates/lead" - }, - "I":{ - "tag" : "c:plates/iridium" - } - }, - - "result": { - "id": "modern_industrialization:ultradense_metal_ball" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json deleted file mode 100644 index 8a1f63809..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/cutting_machine/silicon_waffer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:cutting_machine", - "eu": 16, - "duration": 600, - "item_inputs": { - "item": "modern_industrialization:monocrystalline_silicon", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:lubricant", - "amount": 500 - }, - "item_outputs": { - "item": "modern_industrialization:silicon_wafer", - "amount": 32 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json deleted file mode 100644 index d6e39fb10..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/implosion_compressor/singularity.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "item": "modern_industrialization:ultradense_metal_ball", - "amount": 1 - }, - { - "item": "modern_industrialization:nuke", - "amount": 64 - } - ], - "item_outputs": { - "item": "modern_industrialization:singularity", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json deleted file mode 100644 index 1d6298e45..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/component/polarizer/stainless_steel_rod_magnetic.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:polarizer", - "eu": 16, - "duration": 400, - "item_inputs": - [ - { - "tag": "c:rods/stainless_steel", - "amount": 1 - }, - { - "item": "modern_industrialization:neodymium_dust", - "amount": 1 - } - ], - - "item_outputs": { - "item": "modern_industrialization:stainless_steel_rod_magnetic", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull_asbl.json deleted file mode 100644 index 0df95d87f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/advanced_machine_hull_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " c ", - "BCB", - "ppp" - ], - "key": { - "B" : { - "item" : "modern_industrialization:silicon_battery" - }, - "c" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "C" : { - "item" : "modern_industrialization:advanced_machine_casing" - }, - "p" : { - "item" : "modern_industrialization:electrum_cable" - } - }, - "result": { - "id": "modern_industrialization:advanced_machine_hull" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull_asbl.json deleted file mode 100644 index 481757432..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/highly_advanced_machine_hull_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " c ", - "BCB", - "ppp" - ], - "key": { - "B" : { - "item" : "modern_industrialization:cadmium_battery" - }, - "c" : { - "item" : "modern_industrialization:processing_unit" - }, - "C" : { - "item" : "modern_industrialization:highly_advanced_machine_casing" - }, - "p" : { - "item" : "modern_industrialization:annealed_copper_cable" - } - }, - "result": { - "id": "modern_industrialization:highly_advanced_machine_hull" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull_asbl.json deleted file mode 100644 index 8e8556dd7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/lv_machine_hull_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " A ", - "BCB", - "ccc" - ], - "key": - { - "A" : { - "item" : "modern_industrialization:analog_circuit" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "B" : { - "item" : "modern_industrialization:redstone_battery" - }, - "C" :{ - "item" : "modern_industrialization:steel_machine_casing" - } - }, - - "result": { - "id": "modern_industrialization:basic_machine_hull" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull_asbl.json deleted file mode 100644 index d04542fd4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/quantum_machine_hull_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " c ", - "BCB", - "ppp" - ], - "key": { - "B" : { - "item" : "modern_industrialization:plutonium_battery" - }, - "c" : { - "item" : "modern_industrialization:quantum_circuit" - }, - "C" : { - "item" : "modern_industrialization:quantum_machine_casing" - }, - "p" : { - "item" : "modern_industrialization:superconductor_cable" - } - }, - "result": { - "id": "modern_industrialization:quantum_machine_hull" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull_asbl.json deleted file mode 100644 index ccd62a607..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/hull/turbo_machine_hull_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " c ", - "BCB", - "ppp" - ], - "key": { - "B" : { - "item" : "modern_industrialization:sodium_battery" - }, - "c" : { - "item" : "modern_industrialization:digital_circuit" - }, - "C" : { - "item" : "modern_industrialization:turbo_machine_casing" - }, - "p" : { - "item" : "modern_industrialization:aluminum_cable" - } - }, - "result": { - "id": "modern_industrialization:turbo_machine_hull" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler_asbl.json deleted file mode 100644 index 8e5aaeb63..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/advanced_large_steam_boiler_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "PcP", - "LBL", - "PcP" - ], - "key": { - "P" : { - "item" : "modern_industrialization:pump" - }, - "c" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "B": { - "item": "modern_industrialization:large_steam_boiler" - }, - "L": { - "item": "modern_industrialization:large_pump" - } - }, - "result": { - "id": "modern_industrialization:advanced_large_steam_boiler" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json deleted file mode 100644 index 2d7661405..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/assembler/replicator.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 8000, - "item_inputs": [ - { - "item": "modern_industrialization:quantum_machine_hull", - "amount": 1 - }, - { - "item": "modern_industrialization:quantum_upgrade", - "amount": 2 - }, - { - "item": "modern_industrialization:quantum_circuit", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:uu_matter", - "amount": 500 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:replicator", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/assembler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/assembler_asbl.json deleted file mode 100644 index e9dbd627a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/assembler_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AcA", - "CHC", - "AcA" - ], - "key": - { - "A" : { - "item" : "modern_industrialization:robot_arm" - }, - "c" : { - "item" : "modern_industrialization:analog_circuit" - }, - "C" : { - "item" : "modern_industrialization:conveyor" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - } - }, - - "result": { - "id": "modern_industrialization:assembler" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/centrifuge_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/centrifuge_asbl.json deleted file mode 100644 index 3ee0b0d9d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/centrifuge_asbl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "mPm", - "pHp", - "mCm" - ], - "key": { - "m" : { - "item" : "modern_industrialization:large_motor" - }, - "H" : { - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "item" : "modern_industrialization:electrum_cable" - }, - "P": { - "item" : "modern_industrialization:large_pump" - }, - "C": { - "item" : "modern_industrialization:electronic_circuit" - } - }, - "result": { - "id": "modern_industrialization:centrifuge" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/chemical_reactor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/chemical_reactor_asbl.json deleted file mode 100644 index 9f1c2db2b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/chemical_reactor_asbl.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "gmg", - "fHf", - "CpC" - ], - "key": { - "f": { - "item" : "modern_industrialization:aluminum_rotor" - }, - "m" : { - "item" : "modern_industrialization:large_pump" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "g" : { - "tag" : "c:glass_blocks" - }, - "C" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "p": { - "item" : "modern_industrialization:electrum_cable" - } - }, - "result": { - "id": "modern_industrialization:chemical_reactor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/compressor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/compressor_asbl.json deleted file mode 100644 index de9f86cfa..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/compressor_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pCp", - "cHc", - "pCp" - ], - "key": - { - "p" : { - "item" : "modern_industrialization:piston" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "c": { - "item" : "modern_industrialization:tin_cable" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:electric_compressor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_chest_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_chest_asbl.json deleted file mode 100644 index 2933fde38..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_chest_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "chc", - "mCm", - "chc" - ], - "key": - { - "C" : { - "item" : "modern_industrialization:steel_machine_casing" - }, - "m" :{ - "item" : "modern_industrialization:motor" - }, - "c": { - "item" : "modern_industrialization:analog_circuit" - }, - "h" : { - "item" : "minecraft:hopper" - } - }, - "result": { - "id": "modern_industrialization:configurable_chest", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_tank_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_tank_asbl.json deleted file mode 100644 index 694c7b7b4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/configurable_tank_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "ctc", - "pCp", - "ctc" - ], - "key": - { - "C" : { - "item" : "modern_industrialization:steel_machine_casing" - }, - "p" :{ - "item" : "modern_industrialization:pump" - }, - "c": { - "item" : "modern_industrialization:analog_circuit" - }, - "t" : { - "item" : "modern_industrialization:aluminum_tank" - } - }, - "result": { - "id": "modern_industrialization:configurable_tank", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/cutting_machine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/cutting_machine_asbl.json deleted file mode 100644 index 7e4d2eaac..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/cutting_machine_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "gdg", - "mHm", - "CcC" - ], - "key": - { - "d" : { - "item" : "modern_industrialization:invar_rotary_blade" - }, - "g" : { - "tag" : "c:glass_blocks" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "c": { - "item" : "modern_industrialization:conveyor" - }, - "m": { - "item" : "modern_industrialization:motor" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:electric_cutting_machine" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/distillation_tower_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/distillation_tower_asbl.json deleted file mode 100644 index c626db2c8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/distillation_tower_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pdp", - "CHC", - "pdp" - ], - "key": { - "p" : { - "item" : "modern_industrialization:advanced_pump" - }, - "H" :{ - "item" : "modern_industrialization:turbo_machine_hull" - }, - "C" : { - "item" : "modern_industrialization:digital_circuit" - }, - "d": { - "item" : "modern_industrialization:distillery" - } - }, - "result": { - "id": "modern_industrialization:distillation_tower" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/distillery_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/distillery_asbl.json deleted file mode 100644 index 9c868411e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/distillery_asbl.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "gfg", - "mHm", - "CpC" - ], - "key": { - "f": { - "tag" : "modern_industrialization:fluid_pipes" - }, - "m" : { - "item" : "modern_industrialization:large_pump" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "g" : { - "tag" : "c:glass_blocks" - }, - "C" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "p": { - "item" : "modern_industrialization:electrum_cable" - } - }, - "result": { - "id": "modern_industrialization:distillery" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace_asbl.json deleted file mode 100644 index 43bafb14f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electric_blast_furnace_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CCC", - "CHC", - "CFC" - ], - "key": { - "C": { - "item": "modern_industrialization:cupronickel_wire_magnetic" - }, - "H": { - "item": "modern_industrialization:basic_machine_hull" - }, - "F": { - "item": "minecraft:blast_furnace" - } - }, - "result": { - "id": "modern_industrialization:electric_blast_furnace" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electric_quarry_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electric_quarry_asbl.json deleted file mode 100644 index a2b903361..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electric_quarry_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "LAL", - "GCG", - "LPL" - ], - "key": { - "L": { - "item": "modern_industrialization:large_motor" - }, - "A":{ - "item": "modern_industrialization:robot_arm" - }, - "G": { - "item": "modern_industrialization:electronic_circuit" - }, - "P": { - "item": "modern_industrialization:steam_quarry" - }, - "C": { - "item": "modern_industrialization:advanced_machine_hull" - } - }, - "result": { - "id": "modern_industrialization:electric_quarry", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electrolyzer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electrolyzer_asbl.json deleted file mode 100644 index 4406fbae2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/electrolyzer_asbl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "cCc", - "rHr", - "cPc" - ], - "key": { - "c" : { - "item" : "modern_industrialization:cupronickel_wire_magnetic" - }, - "r": { - "tag" : "c:rods/aluminum" - }, - "H": { - "item": "modern_industrialization:basic_machine_hull" - }, - "C" : { - "item": "modern_industrialization:electronic_circuit" - }, - "P" : { - "item": "modern_industrialization:large_pump" - } - }, - "result": { - "id": "modern_industrialization:electrolyzer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/furnace_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/furnace_asbl.json deleted file mode 100644 index fca81a7cb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/furnace_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "wCw", - "wHw", - "cCc" - ], - "key": - { - "w": { - "item" : "modern_industrialization:cupronickel_wire_magnetic" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "c": { - "item" : "modern_industrialization:tin_cable" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:electric_furnace" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/fusion_reactor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/fusion_reactor_asbl.json deleted file mode 100644 index 13b02cfeb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/fusion_reactor_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CCC", - "QHQ", - "CCC" - ], - "key": { - "C": { - "item": "modern_industrialization:fusion_chamber" - }, - "H": { - "item": "modern_industrialization:quantum_machine_hull" - }, - "Q": { - "item": "modern_industrialization:quantum_circuit" - } - }, - "result": { - "id": "modern_industrialization:fusion_reactor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/heat_exchanger_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/heat_exchanger_asbl.json deleted file mode 100644 index 3afa1bd4a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/heat_exchanger_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "FpH", - "PhP", - "FpH" - ], - "key": { - "p" : { - "item" : "modern_industrialization:small_heat_exchanger" - }, - "h" : { - "item" : "modern_industrialization:turbo_machine_hull" - }, - "P":{ - "item" : "modern_industrialization:stainless_steel_machine_casing_pipe" - }, - "F" : { - "item" : "modern_industrialization:frostproof_machine_casing" - }, - "H" : { - "item" : "modern_industrialization:heatproof_machine_casing" - } - - }, - "result": { - "id": "modern_industrialization:heat_exchanger" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler_asbl.json deleted file mode 100644 index ad1c53227..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_advanced_large_steam_boiler_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "LcL", - "fBf", - "LcL" - ], - "key": { - "L" : { - "item" : "modern_industrialization:large_pump" - }, - "c" : { - "item" : "modern_industrialization:processing_unit" - }, - "B": { - "item": "modern_industrialization:high_pressure_large_steam_boiler" - }, - "f": { - "item": "modern_industrialization:large_advanced_pump" - } - }, - "result": { - "id": "modern_industrialization:high_pressure_advanced_large_steam_boiler" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler_asbl.json deleted file mode 100644 index bd6c95924..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/high_pressure_large_steam_boiler_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "fcf", - "PBP", - "fcf" - ], - "key": { - "P" : { - "item" : "modern_industrialization:clean_stainless_steel_machine_casing" - }, - "c" : { - "item" : "modern_industrialization:digital_circuit" - }, - "B": { - "item": "modern_industrialization:advanced_large_steam_boiler" - }, - "f": { - "item": "modern_industrialization:advanced_pump" - } - }, - "result": { - "id": "modern_industrialization:high_pressure_large_steam_boiler" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator_asbl.json deleted file mode 100644 index cdcd9c240..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/hv_diesel_generator_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "PCP", - "GHG", - "ccc" - ], - "key" : { - "H" : { "item" : "modern_industrialization:turbo_machine_hull"}, - "P": { "item" : "modern_industrialization:advanced_pump"}, - "G": { "tag" : "c:gears/stainless_steel"}, - "c" : {"item" : "modern_industrialization:aluminum_cable"}, - "C" : {"item" : "modern_industrialization:digital_circuit"} - -}, - "result": { - "id": "modern_industrialization:hv_diesel_generator" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine_asbl.json deleted file mode 100644 index 0c5af15fa..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/hv_steam_turbine_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pCp", - "rHr", - "mcm" - ], - "key": - { - "C": { - "item" : "modern_industrialization:digital_circuit" - }, - "m" : { - "item" : "modern_industrialization:advanced_motor" - }, - "H" :{ - "item" : "modern_industrialization:turbo_machine_hull" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "r" : { - "item" : "modern_industrialization:stainless_steel_rotor" - }, - "c" : { - "item" : "modern_industrialization:aluminum_cable" - } - }, - - "result": { - "id": "modern_industrialization:hv_steam_turbine" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/implosion_compressor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/implosion_compressor_asbl.json deleted file mode 100644 index ac043fde4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/implosion_compressor_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "BmB", - "THT", - "BmB" - ], - "key": { - "m" : { - "item" : "modern_industrialization:advanced_motor" - }, - "T" : { - "item" : "modern_industrialization:titanium_large_plate" - }, - "H": { - "item": "modern_industrialization:turbo_machine_hull" - }, - "B": { - "item": "modern_industrialization:blastproof_alloy_large_plate" - } - }, - "result": { - "id": "modern_industrialization:implosion_compressor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json deleted file mode 100644 index e40c9d5e8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_diesel_generator_asbl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pcp", - "GHG", - "mem" - ], - "key": { - "p" : { - "item" : "modern_industrialization:large_advanced_pump" - }, - "H" : { - "item" : "modern_industrialization:highly_advanced_machine_hull" - }, - "c" : { - "item" : "modern_industrialization:processing_unit" - }, - "G":{ - "item" : "modern_industrialization:titanium_gear" - }, - "m" : { - "item" : "modern_industrialization:large_advanced_motor" - }, - "e" : { - "item" : "modern_industrialization:hv_diesel_generator" - } - - }, - "result": { - "id": "modern_industrialization:large_diesel_generator" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler_asbl.json deleted file mode 100644 index 3fe4f31b7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_boiler_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "PcP", - "fBf", - "PcP" - ], - "key": { - "P" : { - "item" : "modern_industrialization:bronze_plated_bricks" - }, - "c" : { - "item" : "modern_industrialization:analog_circuit" - }, - "B": { - "item": "modern_industrialization:bronze_boiler" - }, - "f": { - "item": "modern_industrialization:bronze_curved_plate" - } - }, - "result": { - "id": "modern_industrialization:large_steam_boiler" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json deleted file mode 100644 index 9d8cb1304..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_steam_turbine_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "tpt", - "RHR", - "tpt" - ], - "key": - { - "t": { - "item" : "modern_industrialization:hv_steam_turbine" - }, - "p" : { - "item" : "modern_industrialization:advanced_pump" - }, - "H" :{ - "item" : "modern_industrialization:turbo_machine_hull" - }, - "R" : { - "item" : "modern_industrialization:stainless_steel_rotor" - } - }, - - "result": { - "id": "modern_industrialization:large_steam_turbine" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_asbl.json deleted file mode 100644 index 7874aa7b8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "tpt", - "RSR", - "tpt" - ], - "key": - { - "t": { - "item" : "modern_industrialization:steel_tank" - }, - "p" : { - "item" : "modern_industrialization:pump" - }, - "S" :{ - "item" : "modern_industrialization:steel_machine_casing" - }, - "R" : { - "item" : "modern_industrialization:tin_rotor" - } - }, - - "result": { - "id": "modern_industrialization:large_tank" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch_asbl.json deleted file mode 100644 index 354d9ecd7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/large_tank_hatch_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "t", - "p", - "S" - ], - "key": { - "t": { - "item" : "modern_industrialization:steel_tank" - }, - "p" : { - "item" : "modern_industrialization:pump" - }, - "S" :{ - "item" : "modern_industrialization:steel_machine_casing" - } - }, - "result": { - "id": "modern_industrialization:large_tank_hatch" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator_asbl.json deleted file mode 100644 index 51ed05cd1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/lv_diesel_generator_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "PCP", - "GHG", - "ccc" - ], - "key" : { - "H" : { "item" : "modern_industrialization:basic_machine_hull"}, - "P": { "item" : "modern_industrialization:pump"}, - "G": { "tag" : "c:gears/tin"}, - "c" : {"item" : "modern_industrialization:tin_cable"}, - "C" : {"item" : "modern_industrialization:analog_circuit"} - -}, - "result": { - "id": "modern_industrialization:lv_diesel_generator" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine_asbl.json deleted file mode 100644 index 4a959ff86..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/lv_steam_turbine_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pCp", - "rHr", - "mcm" - ], - "key": - { - "C": { - "item" : "modern_industrialization:analog_circuit" - }, - "m" : { - "item" : "modern_industrialization:motor" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "tag" : "modern_industrialization:fluid_pipes" - }, - "r" : { - "item" : "modern_industrialization:tin_rotor" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - } - }, - - "result": { - "id": "modern_industrialization:lv_steam_turbine" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/macerator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/macerator_asbl.json deleted file mode 100644 index 25602c0e1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/macerator_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pdp", - "mHm", - "CcC" - ], - "key": - { - "d": { - "item" : "modern_industrialization:invar_rotary_blade" - }, - "m" : { - "item" : "modern_industrialization:motor" - }, - "p" : { - "item" : "modern_industrialization:piston" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "c": { - "item" : "modern_industrialization:tin_cable" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:electric_macerator" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mixer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mixer_asbl.json deleted file mode 100644 index d0217dc53..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mixer_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "gmg", - "rHr", - "CpC" - ], - "key": - { - "g": { - "tag" : "c:glass_blocks" - }, - "m" : { - "item" : "modern_industrialization:motor" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "tag" : "modern_industrialization:fluid_pipes" - }, - "r" : { - "item" : "modern_industrialization:tin_rotor" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - - "result": { - "id": "modern_industrialization:electric_mixer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator_asbl.json deleted file mode 100644 index a5e653d4b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mv_diesel_generator_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "PCP", - "GHG", - "ccc" - ], - "key" : { - "H" : { "item" : "modern_industrialization:advanced_machine_hull"}, - "P": { "item" : "modern_industrialization:large_pump"}, - "G": { "tag" : "c:gears/aluminum"}, - "c" : {"item" : "modern_industrialization:electrum_cable"}, - "C" : {"item" : "modern_industrialization:electronic_circuit"} - -}, - "result": { - "id": "modern_industrialization:mv_diesel_generator" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine_asbl.json deleted file mode 100644 index 46afd10f2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/mv_steam_turbine_asbl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pcp", - "rHr", - "mem" - ], - "key": { - "p" : { - "tag" : "modern_industrialization:fluid_pipes" - }, - "H" : { - "item" : "modern_industrialization:advanced_machine_hull" - }, - "c" : { - "item" : "modern_industrialization:electronic_circuit" - }, - "r":{ - "item" : "modern_industrialization:aluminum_rotor" - }, - "m" : { - "item" : "modern_industrialization:large_motor" - }, - "e" : { - "item" : "modern_industrialization:electrum_cable" - } - - }, - "result": { - "id": "modern_industrialization:mv_steam_turbine" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor_asbl.json deleted file mode 100644 index 0ac1c5eae..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/nuclear_reactor_asbl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AcA", - "RCR", - "AcA" - ], - "key": { - "A" : { - "item": "modern_industrialization:nuclear_alloy_large_plate" - }, - - "C" : { - "item" : "modern_industrialization:highly_advanced_machine_hull" - }, - - "c" : { - "item" : "modern_industrialization:processing_unit" - }, - - "R" : { - "item" : "modern_industrialization:cadmium_control_rod" - } - }, - "result": { - "id": "modern_industrialization:nuclear_reactor" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/packer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/packer_asbl.json deleted file mode 100644 index 7cde0abfe..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/packer_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "AcA", - "CHC", - "pcp" - ], - "key": - { - "A" : { - "item" : "modern_industrialization:robot_arm" - }, - "c" : { - "item" : "modern_industrialization:analog_circuit" - }, - "C" : { - "item" : "modern_industrialization:conveyor" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "item" : "modern_industrialization:tin_cable" - } - }, - - "result": { - "id": "modern_industrialization:electric_packer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/plasma_turbine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/plasma_turbine_asbl.json deleted file mode 100644 index ad518f7c9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/plasma_turbine_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "tpt", - "RHR", - "tpt" - ], - "key": - { - "t": { - "item" : "modern_industrialization:superconductor_coil" - }, - "p" : { - "item" : "modern_industrialization:quantum_circuit" - }, - "H" :{ - "item" : "modern_industrialization:quantum_machine_hull" - }, - "R" : { - "item" : "modern_industrialization:titanium_rotor" - } - }, - - "result": { - "id": "modern_industrialization:plasma_turbine" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/polarizer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/polarizer_asbl.json deleted file mode 100644 index 3db392267..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/polarizer_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "wLw", - "pHp", - "wLw" - ], - "key": - { - "w" : { - "item" : "modern_industrialization:tin_wire" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "item" : "modern_industrialization:tin_cable" - }, - "L" : { - "item" : "modern_industrialization:inductor" - } - }, - - "result": { - "id": "modern_industrialization:polarizer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/pressurizer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/pressurizer_asbl.json deleted file mode 100644 index 6f78f7571..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/pressurizer_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "pcp", - "PHP", - "pCp" - ], - "key": { - "p" : { - "item" : "modern_industrialization:advanced_pump" - }, - "H" : { - "item" : "modern_industrialization:turbo_machine_hull" - }, - "c" : { - "item" : "modern_industrialization:digital_circuit" - }, - "P":{ - "item" : "modern_industrialization:titanium_machine_casing_pipe" - }, - "C" : { - "item" : "modern_industrialization:aluminum_cable" - } - - }, - "result": { - "id": "modern_industrialization:pressurizer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/unpacker_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/unpacker_asbl.json deleted file mode 100644 index ca2f0fe6a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/unpacker_asbl.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "mcm", - "CHC", - "pcp" - ], - "key": - { - "m" : { - "item" : "modern_industrialization:motor" - }, - "c" : { - "item" : "modern_industrialization:analog_circuit" - }, - "C" : { - "item" : "modern_industrialization:conveyor" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "item" : "modern_industrialization:tin_cable" - } - }, - - "result": { - "id": "modern_industrialization:electric_unpacker" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer_asbl.json deleted file mode 100644 index 798cd0816..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/vacuum_freezer_asbl.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PPP", - "CHC", - "pCp" - ], - "key": { - "C": { - "item": "modern_industrialization:electronic_circuit" - }, - "H": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "P": { - "item": "modern_industrialization:large_pump" - }, - "p" : { - "item": "modern_industrialization:aluminum_large_plate" - } - }, - "result": { - "id": "modern_industrialization:vacuum_freezer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/water_pump_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/water_pump_asbl.json deleted file mode 100644 index 82df135f6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/water_pump_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "frf", - "PHP", - "pcp" - ], - "key": - { - "f" : { - "tag" : "modern_industrialization:fluid_pipes" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "p": { - "item" : "modern_industrialization:tin_cable" - }, - "P" : { - "item" : "modern_industrialization:pump" - }, - "c": { - "item": "modern_industrialization:analog_circuit" - }, - "r": { - "item": "modern_industrialization:tin_rotor" - } - }, - - "result": { - "id": "modern_industrialization:electric_water_pump" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/wiremill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/wiremill_asbl.json deleted file mode 100644 index 3c73e2f15..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/machine/wiremill_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "mcm", - "CHC", - "mcm" - ], - "key": - { - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "m" : { - "item" : "modern_industrialization:motor" - } - }, - - "result": { - "id": "modern_industrialization:electric_wiremill" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit_asbl.json deleted file mode 100644 index ce4f80ecd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/ev_storage_unit_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "bbb", - "LHL", - "bbb" - ], - "key": - { - "b" : { - "item" : "modern_industrialization:cadmium_battery" - }, - "H" :{ - "item" : "modern_industrialization:highly_advanced_machine_hull" - }, - "L": { - "tag" : "c:plates/battery_alloy" - } - - }, - "result": { - "id": "modern_industrialization:ev_storage_unit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit_asbl.json deleted file mode 100644 index 70eb91e27..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/hv_storage_unit_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "bbb", - "LHL", - "bbb" - ], - "key": - { - "b" : { - "item" : "modern_industrialization:sodium_battery" - }, - "H" :{ - "item" : "modern_industrialization:turbo_machine_hull" - }, - "L": { - "tag" : "c:plates/battery_alloy" - } - - }, - "result": { - "id": "modern_industrialization:hv_storage_unit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit_asbl.json deleted file mode 100644 index e1b58fc45..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/lv_storage_unit_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "bbb", - "LHL", - "bbb" - ], - "key": - { - "b" : { - "item" : "modern_industrialization:redstone_battery" - }, - "H" :{ - "item" : "modern_industrialization:basic_machine_hull" - }, - "L": { - "tag" : "c:plates/battery_alloy" - } - - }, - "result": { - "id": "modern_industrialization:lv_storage_unit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit_asbl.json deleted file mode 100644 index 964bb7183..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/mv_storage_unit_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "bbb", - "LHL", - "bbb" - ], - "key": - { - "b" : { - "item" : "modern_industrialization:silicon_battery" - }, - "H" :{ - "item" : "modern_industrialization:advanced_machine_hull" - }, - "L": { - "tag" : "c:plates/battery_alloy" - } - - }, - "result": { - "id": "modern_industrialization:mv_storage_unit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit_asbl.json deleted file mode 100644 index 069e09ff9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/storage_unit/superconductor_storage_unit_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "bbb", - "LHL", - "bbb" - ], - "key": - { - "b" : { - "item" : "modern_industrialization:plutonium_battery" - }, - "H" :{ - "item" : "modern_industrialization:quantum_machine_hull" - }, - "L": { - "tag" : "c:plates/battery_alloy" - } - - }, - "result": { - "id": "modern_industrialization:superconductor_storage_unit" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_asbl.json deleted file mode 100644 index 4ee4eeb59..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " OO", - "IH ", - " OO" - ], - "key": { - "H": { - "item": "modern_industrialization:highly_advanced_machine_hull" - }, - "I": { - "item": "modern_industrialization:superconductor_cable" - }, - "O": { - "item": "modern_industrialization:annealed_copper_cable" - } - }, - "result": { - "id": "modern_industrialization:superconductor_ev_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json deleted file mode 100644 index 469c2b95a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/down_to_up.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:superconductor_ev_transformer" - } - }, - "result": { - "id": "modern_industrialization:ev_superconductor_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_asbl.json deleted file mode 100644 index 809adbc5b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "II ", - " HO", - "II " - ], - "key": { - "H": { - "item": "modern_industrialization:highly_advanced_machine_hull" - }, - "I": { - "item": "modern_industrialization:annealed_copper_cable" - }, - "O": { - "item": "modern_industrialization:superconductor_cable" - } - }, - "result": { - "id": "modern_industrialization:ev_superconductor_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json deleted file mode 100644 index 3526d3e55..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/ev_supra/up_to_down.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:ev_superconductor_transformer" - } - }, - "result": { - "id": "modern_industrialization:superconductor_ev_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_asbl.json deleted file mode 100644 index ee04cd34b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " OO", - "IH ", - " OO" - ], - "key": { - "H": { - "item": "modern_industrialization:turbo_machine_hull" - }, - "I": { - "item": "modern_industrialization:annealed_copper_cable" - }, - "O": { - "item": "modern_industrialization:aluminum_cable" - } - }, - "result": { - "id": "modern_industrialization:ev_hv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json deleted file mode 100644 index 60feddf07..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/down_to_up.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:ev_hv_transformer" - } - }, - "result": { - "id": "modern_industrialization:hv_ev_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_asbl.json deleted file mode 100644 index 162ba90bc..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "II ", - " HO", - "II " - ], - "key": { - "H": { - "item": "modern_industrialization:turbo_machine_hull" - }, - "I": { - "item": "modern_industrialization:aluminum_cable" - }, - "O": { - "item": "modern_industrialization:annealed_copper_cable" - } - }, - "result": { - "id": "modern_industrialization:hv_ev_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json deleted file mode 100644 index de32864d6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/hv_ev/up_to_down.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:hv_ev_transformer" - } - }, - "result": { - "id": "modern_industrialization:ev_hv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_asbl.json deleted file mode 100644 index 040c535da..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " OO", - "IH ", - " OO" - ], - "key": { - "H": { - "item": "modern_industrialization:basic_machine_hull" - }, - "I": { - "item": "modern_industrialization:electrum_cable" - }, - "O": { - "item": "modern_industrialization:tin_cable" - } - }, - "result": { - "id": "modern_industrialization:mv_lv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json deleted file mode 100644 index 71e7d3e4a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/down_to_up.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:mv_lv_transformer" - } - }, - "result": { - "id": "modern_industrialization:lv_mv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_asbl.json deleted file mode 100644 index f941ab1da..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "II ", - " HO", - "II " - ], - "key": { - "H": { - "item": "modern_industrialization:basic_machine_hull" - }, - "I": { - "item": "modern_industrialization:tin_cable" - }, - "O": { - "item": "modern_industrialization:electrum_cable" - } - }, - "result": { - "id": "modern_industrialization:lv_mv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json deleted file mode 100644 index df10d3e82..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/lv_mv/up_to_down.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:lv_mv_transformer" - } - }, - "result": { - "id": "modern_industrialization:mv_lv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_asbl.json deleted file mode 100644 index 0e6090272..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " OO", - "IH ", - " OO" - ], - "key": { - "H": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "I": { - "item": "modern_industrialization:aluminum_cable" - }, - "O": { - "item": "modern_industrialization:electrum_cable" - } - }, - "result": { - "id": "modern_industrialization:hv_mv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json deleted file mode 100644 index 9dd02c3b8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/down_to_up.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:hv_mv_transformer" - } - }, - "result": { - "id": "modern_industrialization:mv_hv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_asbl.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_asbl.json deleted file mode 100644 index 3b3fe30ea..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_asbl.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "II ", - " HO", - "II " - ], - "key": { - "H": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "I": { - "item": "modern_industrialization:electrum_cable" - }, - "O": { - "item": "modern_industrialization:aluminum_cable" - } - }, - "result": { - "id": "modern_industrialization:mv_hv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json deleted file mode 100644 index 69ed68bf4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/transformer/mv_hv/up_to_down.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X" - ], - "key": { - "X": { - "item": "modern_industrialization:mv_hv_transformer" - } - }, - "result": { - "id": "modern_industrialization:hv_mv_transformer" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/advanced.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/advanced.json deleted file mode 100644 index 605f0825d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/advanced.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 400, - "item_inputs": [ - { - "item" : "modern_industrialization:basic_upgrade", - "amount": 4 - }, - { - "item": "modern_industrialization:large_motor", - "amount": 2 - }, - { - "item" : "modern_industrialization:large_pump", - "amount": 1 - }, - { - "item" : "modern_industrialization:electronic_circuit_board", - "amount": 1 - } - ], - - "fluid_inputs": { - "fluid" : "modern_industrialization:polyethylene", - "amount" : 1000 - }, - "item_outputs": [ - { - "item": "modern_industrialization:advanced_upgrade", - "amount": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json deleted file mode 100644 index 17761da38..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/basic.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "item" : "modern_industrialization:conveyor", - "amount": 2 - }, - { - "item": "modern_industrialization:motor", - "amount":4 - }, - { - "item" : "modern_industrialization:robot_arm", - "amount": 2 - }, - { - "item" : "modern_industrialization:analog_circuit_board", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:basic_upgrade", - "amount": 4 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json deleted file mode 100644 index d2f2d80bd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/highly_advanced.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 400, - "item_inputs": [ - { - "item" : "modern_industrialization:large_advanced_motor", - "amount": 8 - }, - { - "item": "modern_industrialization:large_advanced_pump", - "amount": 4 - }, - { - "item" : "modern_industrialization:turbo_upgrade", - "amount": 4 - }, - { - "item" : "modern_industrialization:processing_unit_board", - "amount": 1 - } - ], - - "fluid_inputs": { - "fluid" : "modern_industrialization:polyvinyl_chloride", - "amount" : 2500 - }, - "item_outputs": [ - { - "item": "modern_industrialization:highly_advanced_upgrade", - "amount": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/quantum.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/quantum.json deleted file mode 100644 index 09b3f070a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/quantum.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 1000, - "item_inputs": [ - { - "item" : "modern_industrialization:highly_advanced_upgrade", - "amount": 32 - }, - { - "item": "modern_industrialization:quantum_circuit", - "amount": 8 - }, - { - "item" : "modern_industrialization:singularity", - "amount": 1 - }, - { - "item" : "modern_industrialization:quantum_circuit_board", - "amount": 1 - } - ], - - "fluid_inputs": { - "fluid" : "modern_industrialization:uu_matter", - "amount" : 50 - }, - "item_outputs": [ - { - "item": "modern_industrialization:quantum_upgrade", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/turbo.json b/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/turbo.json deleted file mode 100644 index 83ed19bc4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/electric_age/upgrades/turbo.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 16, - "duration": 400, - "item_inputs": [ - { - "item" : "modern_industrialization:advanced_motor", - "amount": 16 - }, - { - "item": "modern_industrialization:advanced_pump", - "amount": 2 - }, - { - "item" : "modern_industrialization:advanced_upgrade", - "amount": 4 - }, - { - "item" : "modern_industrialization:digital_circuit_board", - "amount": 1 - } - ], - - "fluid_inputs": { - "fluid" : "modern_industrialization:polyvinyl_chloride", - "amount" : 1000 - }, - "item_outputs": [ - { - "item": "modern_industrialization:turbo_upgrade", - "amount": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/forge_hammer.json b/src/main/resources/data/modern_industrialization/recipe/forge_hammer.json deleted file mode 100644 index ccc270e0e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/forge_hammer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "___", - " i ", - "iii" - ], - "key": { - "_": { - "item": "minecraft:heavy_weighted_pressure_plate" - }, - "i": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "id": "modern_industrialization:forge_hammer" - } -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json b/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json deleted file mode 100644 index 55a371015..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_deuterium.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:fusion_reactor", - "eu": 16000, - "duration": 1200, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:deuterium", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:deuterium", - "amount": 1000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:helium_plasma", - "amount": 500 - }, - { - "fluid": "modern_industrialization:tritium", - "amount": 500 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json b/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json deleted file mode 100644 index b83ff5263..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/deuterium_tritium.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:fusion_reactor", - "eu": 16000, - "duration": 900, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:deuterium", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:tritium", - "amount": 1000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:helium_plasma", - "amount": 1000 - }, - { - "fluid" : "modern_industrialization:hydrogen", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/helium_helium.json b/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/helium_helium.json deleted file mode 100644 index ba653cc95..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/helium_helium.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:fusion_reactor", - "eu": 16000, - "duration": 600, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:helium_3", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:helium_3", - "amount": 1000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:helium_plasma", - "amount": 1000 - }, - { - "fluid" : "modern_industrialization:hydrogen", - "amount": 2000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json b/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json deleted file mode 100644 index d47ab94f0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/fusion_reactor/helium_tritium.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "modern_industrialization:fusion_reactor", - "eu": 16000, - "duration": 300, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:helium_3", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:tritium", - "amount": 1000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:helium_plasma", - "amount": 1000 - }, - { - "fluid" : "modern_industrialization:deuterium", - "amount": 1000 - }, - { - "fluid" : "modern_industrialization:hydrogen", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/guide_book.json b/src/main/resources/data/modern_industrialization/recipe/guide_book.json deleted file mode 100644 index 684ab0a2e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/guide_book.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ccc", - "cbc", - "ccc" - ], - "key": { - "c": { - "tag": "c:nuggets/copper" - }, - "b": { - "item": "minecraft:book" - } - }, - "result": { - "id": "modern_industrialization:guidebook" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/assembler/nuke.json b/src/main/resources/data/modern_industrialization/recipe/materials/assembler/nuke.json deleted file mode 100644 index 7fdf0431d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/assembler/nuke.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 600, - "item_inputs": [ - { - "item": "modern_industrialization:industrial_tnt", - "amount": 6 - }, - { - "item": "modern_industrialization:plutonium_ingot", - "amount": 4 - }, - { - "item": "modern_industrialization:processing_unit", - "amount": 2 - }, - { - "item": "modern_industrialization:nuclear_alloy_plate", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:tritium", - "amount": 50 - }, - { - "fluid": "modern_industrialization:deuterium", - "amount": 100 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:nuke", - "amount": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json b/src/main/resources/data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json deleted file mode 100644 index 169f199ae..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/assembler/superconductor_cable.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 32, - "duration": 600, - "item_inputs": [ - { - "item": "modern_industrialization:superconductor_wire", - "amount": 3 - }, - { - "item": "modern_industrialization:cooling_cell", - "amount": 2 - } - ], - - "fluid_inputs" : { - "fluid" : "modern_industrialization:polyvinyl_chloride", - "amount": 1000 - }, - "item_outputs": [ - { - "item": "modern_industrialization:superconductor_cable", - "amount": 6 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json deleted file mode 100644 index 2a6992018..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/annealed_copper.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 64, - "duration": 600, - "item_inputs": { - "tag": "c:dusts/copper", - "amount": 1 - }, - "fluid_inputs":{ - "fluid" : "modern_industrialization:oxygen", - "amount": 250 - }, - "item_outputs": { - "item": "modern_industrialization:annealed_copper_hot_ingot", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json deleted file mode 100644 index fb9bf7bd5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_ingot.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 32, - "duration": 2000, - "item_inputs": { - "tag": "c:storage_blocks/bauxite", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:aluminum_ingot", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json deleted file mode 100644 index b51554fed..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/bauxite_to_aluminum_nugget.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 32, - "duration": 200, - "item_inputs": { - "tag": "c:dusts/bauxite", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:aluminum_nugget", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json deleted file mode 100644 index 4fbd73863..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/molten_redstone.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 4, - "duration": 100, - "item_inputs": { - "item": "minecraft:redstone", - "amount": 1 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:molten_redstone", - "amount": 90 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json deleted file mode 100644 index 306c3b1c5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/raw_oil_to_oil.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 2, - "duration": 200, - "fluid_inputs": { - "fluid": "modern_industrialization:raw_synthetic_oil", - "amount": 100 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:synthetic_oil", - "amount": 100 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json deleted file mode 100644 index 9b295dfa2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 32, - "duration": 400, - - "item_inputs":[ - { - "tag": "c:dusts/quartz", - "amount": 1 - }, - { - "item": "modern_industrialization:coke_dust", - "amount": 1 - } - ], - - "item_outputs": { - "item": "modern_industrialization:silicon_dust", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json deleted file mode 100644 index 808ef66a1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/silicium_from_quartz_with_carbon.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 32, - "duration": 400, - - "item_inputs":[ - { - "tag": "c:dusts/quartz", - "amount": 2 - }, - { - "item": "modern_industrialization:carbon_dust", - "amount": 1 - } - ], - - "item_outputs": { - "item": "modern_industrialization:silicon_dust", - "amount": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json deleted file mode 100644 index a1f82eb39..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type" : "modern_industrialization:blast_furnace", - "eu" : 4, - "duration" : 300, - "item_inputs" : { - "tag" : "c:dusts/soldering_alloy", - "amount" : 1 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:soldering_alloy", - "amount" : 90 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json deleted file mode 100644 index 3ec7ce39f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/soldering_alloy_tiny_dust.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type" : "modern_industrialization:blast_furnace", - "eu" : 4, - "duration" : 60, - "item_inputs" : { - "tag" : "c:tiny_dusts/soldering_alloy", - "amount" : 1 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:soldering_alloy", - "amount" : 10 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel.json deleted file mode 100644 index 50e3be781..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type" : "modern_industrialization:blast_furnace", - "eu" : 2, - "duration" : 600, - "item_inputs" : { - "item" : "modern_industrialization:uncooked_steel_dust", - "amount" : 1 - }, - "item_outputs" : { - "item" : "modern_industrialization:steel_ingot", - "amount" : 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json deleted file mode 100644 index 33f7b2539..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/steel_with_carbon.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 16, - "duration": 400, - - "item_inputs":[ - { - "item": "modern_industrialization:carbon_dust", - "amount": 1 - }, - { - "tag": "c:dusts/iron", - "amount": 4 - } - ], - - "item_outputs": { - "item": "modern_industrialization:steel_ingot", - "amount": 5 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json deleted file mode 100644 index d6fa67c5e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/superconductor.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 128, - "duration": 1200, - "item_inputs": { - "tag": "c:dusts/superconductor", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:superconductor_hot_ingot", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json b/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json deleted file mode 100644 index 6fc563853..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/blast_furnace/titanium_from_raw.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 128, - "duration": 400, - "item_inputs": { - "tag": "c:raw_materials/titanium", - "amount": 3 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:manganese_sulfuric_solution", - "amount": 3000 - }, - "item_outputs": { - "item": "modern_industrialization:titanium_hot_ingot", - "amount": 4 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:manganese_sulfuric_solution", - "amount": 2500 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/bronze_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/bronze_dust.json deleted file mode 100644 index 2d26bd207..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/bronze_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": - [ - { - "tag" : "c:dusts/copper" - }, - { - "tag" : "c:dusts/copper" - }, - { - "tag" : "c:dusts/copper" - }, - { - "tag" : "c:dusts/tin" - } - - ], - "result": { - "id": "modern_industrialization:bronze_dust", - "count": 3 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/bronze_tiny_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/bronze_tiny_dust.json deleted file mode 100644 index 4c9e967f7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/bronze_tiny_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": - [ - { - "tag" : "c:tiny_dusts/copper" - }, - { - "tag" : "c:tiny_dusts/copper" - }, - { - "tag" : "c:tiny_dusts/copper" - }, - { - "tag" : "c:tiny_dusts/tin" - } - - ], - "result": { - "id": "modern_industrialization:bronze_tiny_dust", - "count": 3 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/carbon.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/carbon.json deleted file mode 100644 index 1e74c21ed..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/carbon.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 16, - "duration": 400, - "item_inputs": { - "tag": "c:dusts/coal", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:carbon_dust", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json deleted file mode 100644 index e71d5d8a6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/chromium_crushed_dust.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 16, - "duration": 2400, - "item_inputs" : { - "tag": "c:dusts/ruby", - "amount": 6 - }, - "item_outputs":[ - { - "item": "modern_industrialization:chromium_crushed_dust", - "amount":1 - - }, - { - "item": "modern_industrialization:aluminum_dust", - "amount":2 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/deuterium.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/deuterium.json deleted file mode 100644 index 4189983e6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/deuterium.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 32, - "duration": 1200, - "fluid_inputs": { - "fluid": "modern_industrialization:hydrogen", - "amount": 1000 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:deuterium", - "amount": 20 - }, - { - "fluid": "modern_industrialization:tritium", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/flint.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/flint.json deleted file mode 100644 index 528786f02..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/flint.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 8, - "duration": 300, - "item_inputs": { - "item": "minecraft:gravel", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:flint", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json deleted file mode 100644 index 7ec2829d4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/heavy_water.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 32, - "duration": 1200, - - "fluid_inputs" : { - "fluid" : "minecraft:water", - "amount": 1000 - }, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:heavy_water", - "amount": 20 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/helium_3.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/helium_3.json deleted file mode 100644 index 0521dbbff..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/helium_3.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 32, - "duration": 2000, - - "fluid_inputs": { - "fluid": "modern_industrialization:helium", - "amount": 1000 - }, - - "fluid_outputs": [ - { - "fluid": "modern_industrialization:helium_3", - "amount": 5 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json deleted file mode 100644 index b2c546e32..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/lignite_coal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 32, - "duration": 100, - "item_inputs": { - "tag": "c:dusts/lignite_coal", - "amount": 27 - }, - "item_outputs": { - "item": "modern_industrialization:coal_dust", - "amount": 10 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json deleted file mode 100644 index eef766d15..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/liquid_air.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu" : 24, - "duration" : 600, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:liquid_air", - "amount" : 3000 - }, - - "fluid_outputs" : [ - { - "fluid" : "modern_industrialization:oxygen", - "amount" : 650 - }, - - { - "fluid" : "modern_industrialization:nitrogen", - "amount" : 2315 - }, - { - "fluid" : "modern_industrialization:argon", - "amount" : 35 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json deleted file mode 100644 index 21d9e1cfe..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/manganese_crushed_dust.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 8, - "duration": 1200, - "item_inputs" : [ - {"item" : "minecraft:raw_iron", - "amount": 6} - ], - "item_outputs":[ - { - "item": "modern_industrialization:iron_dust", - "amount":8 - - }, - { - "item": "modern_industrialization:manganese_crushed_dust", - "amount":1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json deleted file mode 100644 index e61827ee4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_dust.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 10, - "duration": 2400, - "item_inputs": { - "tag": "c:dusts/monazite", - "amount": 9 - }, - "item_outputs": [ - { - "item": "modern_industrialization:neodymium_dust", - "amount": 3 - }, - { - "item": "modern_industrialization:yttrium_dust", - "amount": 3 - }, - { - "item": "modern_industrialization:cadmium_dust", - "amount": 3 - } - ], - - "fluid_outputs": [ - { - "fluid" : "modern_industrialization:helium", - "amount": 300, - "probability" : 0.5 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json deleted file mode 100644 index 0b03e5d1e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/mozanite_tiny_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 10, - "duration": 240, - "item_inputs": { - "tag": "c:tiny_dusts/monazite", - "amount": 9 - }, - "item_outputs": [ - { - "item": "modern_industrialization:neodymium_tiny_dust", - "amount": 3 - }, - { - "item": "modern_industrialization:yttrium_tiny_dust", - "amount": 3 - }, - { - "item": "modern_industrialization:cadmium_tiny_dust", - "amount": 3 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json deleted file mode 100644 index 675db7137..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_mox_fuel_rod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - - "eu": 32, - "duration": 6000, - - "item_inputs": { - "item": "modern_industrialization:he_mox_fuel_rod_depleted", - "amount": 1 - }, - - "item_outputs": - [ - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 36 - }, - { - "item": "modern_industrialization:plutonium_tiny_dust", - "amount": 36 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json deleted file mode 100644 index 147242319..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/he_uranium_fuel_rod.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - - "eu": 32, - "duration": 6000, - - "item_inputs": { - "item": "modern_industrialization:he_uranium_fuel_rod_depleted", - "amount": 1 - }, - - "item_outputs": - [ - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 36 - }, - { - "item": "modern_industrialization:plutonium_tiny_dust", - "amount": 18 - }, - { - "item": "modern_industrialization:uranium_235_tiny_dust", - "amount": 18 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json deleted file mode 100644 index cfdd2db3c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_mox_fuel_rod.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - - "eu": 32, - "duration": 6000, - - "item_inputs": { - "item": "modern_industrialization:le_mox_fuel_rod_depleted", - "amount": 1 - }, - - "item_outputs": - [ - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 48 - }, - { - "item": "modern_industrialization:plutonium_tiny_dust", - "amount": 30 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json deleted file mode 100644 index e4e502444..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/le_uranium_fuel_rod.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - - "eu": 32, - "duration": 6000, - - "item_inputs": { - "item": "modern_industrialization:le_uranium_fuel_rod_depleted", - "amount": 1 - }, - - "item_outputs": - [ - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 48 - }, - { - "item": "modern_industrialization:plutonium_tiny_dust", - "amount": 24 - }, - { - "item": "modern_industrialization:uranium_235_tiny_dust", - "amount": 6 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json deleted file mode 100644 index b3071c78b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/nuclear_recycling/uranium_fuel_rod.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - - "eu": 32, - "duration": 6000, - - "item_inputs": { - "item": "modern_industrialization:uranium_fuel_rod_depleted", - "amount": 1 - }, - - "item_outputs": - [ - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 53 - }, - { - "item": "modern_industrialization:plutonium_tiny_dust", - "amount": 27 - }, - { - "item": "modern_industrialization:uranium_235_tiny_dust", - "amount": 1, - "probability" : 0.66 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json deleted file mode 100644 index 767e20c97..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/purified_platinum_sulfuric_solution.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 8, - "duration": 1200, - - - "fluid_inputs" : { - "fluid" : "modern_industrialization:platinum_sulfuric_solution", - "amount": 1000 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:purified_platinum_sulfuric_solution", - "amount" : 1000 - }, - - "item_outputs" : { - "item" : "modern_industrialization:iridium_tiny_dust", - "amount" : 1, - "probability" : 0.05 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json deleted file mode 100644 index 042ef34d4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/ruby_dust.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 8, - "duration": 1200, - "item_inputs" : [ - {"item" : "minecraft:redstone", - "amount": 10} - ], - "item_outputs":[ - { - "item": "modern_industrialization:iron_dust", - "amount":5 - - }, - { - "item": "modern_industrialization:ruby_dust", - "amount": 1 - }, - { - "item": "modern_industrialization:quartz_dust", - "amount":1 - }, - { - "item" : "modern_industrialization:neodymium_tiny_dust", - "amount": 1, - "probability" : 0.5 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/uranium.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/uranium.json deleted file mode 100644 index 6b90bd1a7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/uranium.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - - "eu": 64, - "duration": 6000, - - "item_inputs": { - "tag": "c:dusts/uranium", - "amount": 9 - }, - - "item_outputs": - [ - { - "item": "modern_industrialization:uranium_235_tiny_dust", - "amount": 1 - }, - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 64 - }, - { - "item": "modern_industrialization:uranium_238_tiny_dust", - "amount": 16 - } - ], - - "fluid_outputs": [ - { - "fluid" : "modern_industrialization:helium", - "amount": 150, - "probability" : 0.5 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/wax.json b/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/wax.json deleted file mode 100644 index e66f54b50..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/centrifuge/wax.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 8, - "duration": 200, - "fluid_inputs" : { - "fluid" : "modern_industrialization:naphtha", - "amount": 200 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:lubricant", - "amount" : 150 - }, - - "item_outputs" : { - "item" : "modern_industrialization:wax", - "amount" : 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json deleted file mode 100644 index e8cee2739..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/chromium_hydrochloric_solution.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 200, - "item_inputs" : [ - {"item" : "modern_industrialization:chromium_crushed_dust", - "amount": 1} - ], - "fluid_inputs" : { - "fluid" : "modern_industrialization:hydrochloric_acid", - "amount": 9000 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:chromium_hydrochloric_solution", - "amount" : 9000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json deleted file mode 100644 index eadc814b2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/heavy_water.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 200, - - "fluid_inputs": [ - { - "fluid": "modern_industrialization:oxygen", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:deuterium", - "amount": 2000 - } - ], - - "fluid_outputs": { - "fluid": "modern_industrialization:heavy_water", - "amount": 3000 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json deleted file mode 100644 index c38f76622..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/hydrochloric_acid.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 100, - - "fluid_inputs" : [ - { - "fluid": "modern_industrialization:hydrogen", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:chlorine", - "amount": 1000 - } - ], - "fluid_outputs" : { - "fluid" : "modern_industrialization:hydrochloric_acid", - "amount" : 2000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json deleted file mode 100644 index de0fcd42e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/manganese_sulfuric_solution.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 200, - "item_inputs" : [ - {"item" : "modern_industrialization:manganese_crushed_dust", - "amount": 1} - ], - "fluid_inputs" : { - "fluid" : "modern_industrialization:sulfuric_acid", - "amount": 9000 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:manganese_sulfuric_solution", - "amount" : 9000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json deleted file mode 100644 index 9ecd514d2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/platinum_sulfuric_solution.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 200, - "item_inputs": { - "tag" : "c:raw_materials/platinum", - "amount": 1 - }, - "fluid_inputs" : { - "fluid" : "modern_industrialization:sulfuric_acid", - "amount": 9000 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:platinum_sulfuric_solution", - "amount" : 9000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json deleted file mode 100644 index c7f2c51b5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sodium_hydroxide.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 200, - "item_inputs": { - "tag": "c:dusts/sodium", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:oxygen", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:hydrogen", - "amount": 1000 - } - ], - "fluid_outputs": { - "fluid": "modern_industrialization:sodium_hydroxide", - "amount": 2000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json deleted file mode 100644 index 0b95cf691..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/sulfuric_acid.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 16, - "duration": 200, - "item_inputs": [ - { - "tag": "c:dusts/sulfur", - "amount": 1 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:oxygen", - "amount": 200 - }, - { - "fluid": "minecraft:water", - "amount": 200 - } - ], - "fluid_outputs": { - "fluid": "modern_industrialization:sulfuric_acid", - "amount": 500 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/water.json b/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/water.json deleted file mode 100644 index 054ab89b5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/chemical_reactor/water.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 200, - - "fluid_inputs": [ - { - "fluid": "modern_industrialization:oxygen", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:hydrogen", - "amount": 2000 - } - ], - - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 3000 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/coke_oven/coke.json b/src/main/resources/data/modern_industrialization/recipe/materials/coke_oven/coke.json deleted file mode 100644 index 35a450042..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/coke_oven/coke.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type" : "modern_industrialization:coke_oven", - "eu" : 2, - "duration" : 600, - "item_inputs" : { - "item" : "minecraft:coal", - "amount" : 1 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:creosote", - "amount" : 500, - "probability" : 0.5 - }, - "item_outputs" : { - "item" : "modern_industrialization:coke", - "amount" : 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json deleted file mode 100644 index 385db1dff..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/coke_oven/coke_dust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type" : "modern_industrialization:coke_oven", - "eu" : 2, - "duration" : 600, - "item_inputs" : { - "tag" : "c:dusts/coal", - "amount" : 1 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:creosote", - "amount" : 500, - "probability" : 0.5 - }, - "item_outputs" : { - "item" : "modern_industrialization:coke_dust", - "amount" : 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json b/src/main/resources/data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json deleted file mode 100644 index b829e8b5d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/compressor/blastproof_alloy_plate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:compressor", - "eu": 32, - "duration": 600, - "item_inputs": { - "item": "modern_industrialization:mixed_ingot_blastproof", - "amount": 2 - }, - "item_outputs": { - "item": "modern_industrialization:blastproof_alloy_plate", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json b/src/main/resources/data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json deleted file mode 100644 index ecf70727e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/compressor/tungsten_tiny_dust_to_ingot.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:compressor", - "eu": 32, - "duration": 2400, - "item_inputs": { - "tag": "c:tiny_dusts/tungsten", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:tungsten_nugget", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json deleted file mode 100644 index 3ac9b8a10..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/bauxite.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 32, - "duration": 1200, - "item_inputs": { - "tag": "c:dusts/bauxite", - "amount": 10 - }, - "item_outputs": [ - { - "item": "modern_industrialization:aluminum_dust", - "amount": 4 - }, - { - "item": "modern_industrialization:titanium_tiny_dust", - "amount": 3 - } - ], - "fluid_outputs": { - "fluid": "modern_industrialization:oxygen", - "amount": 2000, - "probability": 0.5 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json deleted file mode 100644 index c6736a0da..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/beryllium_dust.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 32, - "duration": 400, - "item_inputs": { - "tag": "c:dusts/emerald", - "amount": 23 - }, - "item_outputs": [ - { - "item": "modern_industrialization:beryllium_dust", - "amount": 3 - }, - { - "item": "modern_industrialization:aluminum_dust", - "amount": 2 - }, - { - "item": "modern_industrialization:silicon_dust", - "amount": 6 - } - ], - "fluid_outputs": { - "fluid": "modern_industrialization:oxygen", - "amount": 3000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json deleted file mode 100644 index f5202b2b5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/chromium_tiny_dust.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 16, - "duration": 400, - "item_outputs" : [ - {"item" : "modern_industrialization:chromium_tiny_dust", - "amount": 3} - ], - "fluid_inputs" : { - "fluid" : "modern_industrialization:chromium_hydrochloric_solution", - "amount" : 1000 - }, - "fluid_outputs" : [{ - "fluid" : "modern_industrialization:hydrogen", - "amount": 450 - }, - { - "fluid" : "modern_industrialization:chlorine", - "amount": 450 - } - ] - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json deleted file mode 100644 index c5e0c009d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/heavy_water.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 8, - "duration": 600, - "fluid_inputs": { - "fluid": "modern_industrialization:heavy_water", - "amount": 3000 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:deuterium", - "amount": 2000 - }, - { - "fluid": "modern_industrialization:oxygen", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/lapis.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/lapis.json deleted file mode 100644 index c1643b056..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/lapis.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 32, - "duration": 2400, - "item_inputs": { - "tag": "c:dusts/lapis", - "amount": 18 - }, - "item_outputs": [ - { - "item": "modern_industrialization:aluminum_dust", - "amount": 3 - }, - { - "item": "modern_industrialization:sodium_dust", - "amount": 2 - }, - { - "item": "modern_industrialization:silicon_dust", - "amount": 1 - } - ], - "fluid_outputs": { - "fluid": "modern_industrialization:oxygen", - "amount": 2500, - "probability": 0.5 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json deleted file mode 100644 index 969412d7e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/manganese_tiny_dust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 16, - "duration": 400, - "item_outputs" : [ - {"item" : "modern_industrialization:manganese_tiny_dust", - "amount": 3} - ], - "fluid_inputs" : { - "fluid" : "modern_industrialization:manganese_sulfuric_solution", - "amount" : 1000 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:sulfuric_acid", - "amount": 900 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json deleted file mode 100644 index 30ad74601..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/platinum_tiny_dust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 32, - "duration": 600, - "item_outputs" : [ - {"item" : "modern_industrialization:platinum_tiny_dust", - "amount": 3} - ], - "fluid_inputs" : { - "fluid" : "modern_industrialization:purified_platinum_sulfuric_solution", - "amount" : 1000 - }, - "fluid_outputs" : { - "fluid" : "modern_industrialization:sulfuric_acid", - "amount": 900 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json deleted file mode 100644 index 6c4a8c5a9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/salt_electrolysis.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 8, - "duration": 400, - "item_inputs": { - "tag": "c:dusts/salt", - "amount": 2 - }, - "item_outputs": { - "item": "modern_industrialization:sodium_dust", - "amount": 1 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:chlorine", - "amount": 125 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json deleted file mode 100644 index 1468a9f08..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/sulfuric_acid.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 32, - "duration": 300, - "item_outputs": [ - { - "item": "modern_industrialization:sulfur_dust", - "amount": 1 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:oxygen", - "amount": 200 - }, - { - "fluid": "minecraft:water", - "amount": 200 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:sulfuric_acid", - "amount": 500 - } - ] - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json deleted file mode 100644 index 39086df84..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/uu_matter.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 40, - "duration": 2500, - "item_inputs": [ - { - "item": "modern_industrialization:singularity", - "amount": 1, - "probability": 0 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:uu_matter", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/water.json b/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/water.json deleted file mode 100644 index e4b98106f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/electrolyzer/water.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:electrolyzer", - "eu": 8, - "duration": 600, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 3000 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:hydrogen", - "amount": 2000 - }, - { - "fluid": "modern_industrialization:oxygen", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/fire_clay_bricks.json b/src/main/resources/data/modern_industrialization/recipe/materials/fire_clay_bricks.json deleted file mode 100644 index 119bf16db..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/fire_clay_bricks.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "TT", - "TT" - ], - "key": { - "T" : { - "item": "modern_industrialization:fire_clay_brick" - } - }, - "result": { - "id": "modern_industrialization:fire_clay_bricks", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/fire_clay_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/fire_clay_dust.json deleted file mode 100644 index 646d47859..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/fire_clay_dust.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "TC", - "TC" - ], - "key": { - "C": { - "item": "modern_industrialization:brick_dust" - }, - "T" : { - "item": "minecraft:clay_ball" - } - }, - "result": { - "id": "modern_industrialization:fire_clay_dust", - "count": 3 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json deleted file mode 100644 index 9ca6df76c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "ingredient": { - "item": "minecraft:brick" - }, - "result": { - "id": "modern_industrialization:brick_tiny_dust", - "count": 3 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json b/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json deleted file mode 100644 index c73c462d4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/brick_dust_with_tool.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 20, - "ingredient": { - "item": "minecraft:brick" - }, - "result": { - "id": "modern_industrialization:brick_dust" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json b/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json deleted file mode 100644 index c07b69815..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_dust_with_tool.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 60, - "ingredient": { - "tag": "c:ores/copper" - }, - "result": { - "id": "modern_industrialization:copper_dust", - "count": 12 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json b/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json deleted file mode 100644 index de7da1bc6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "ingredient": { - "tag": "c:ores/copper" - }, - "result": { - "id": "minecraft:raw_copper", - "count": 5 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json b/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json deleted file mode 100644 index c19b92bd5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/forge_hammer/copper_ore_to_raw_with_tool.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 20, - "ingredient": { - "tag": "c:ores/copper" - }, - "result": { - "id": "minecraft:raw_copper", - "count": 8 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/heat_exchanger/lava.json b/src/main/resources/data/modern_industrialization/recipe/materials/heat_exchanger/lava.json deleted file mode 100644 index 13de8e5bf..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/heat_exchanger/lava.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "modern_industrialization:heat_exchanger", - "eu" : 2, - "duration" : 400, - "fluid_inputs" : [ - { - "fluid" : "minecraft:lava", - "amount" : 10 - }, - { - "fluid" : "minecraft:water", - "amount" : 500 - } - ], - "fluid_outputs" : - { - "fluid" : "modern_industrialization:steam", - "amount" : 8000 - }, - "item_outputs" : { - "item" : "minecraft:obsidian", - "amount" : 1, - "probability" : 0.01 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json deleted file mode 100644 index 0bff3a910..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/beryllium.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "tag": "c:tiny_dusts/beryllium", - "amount": 9 - }, - { - "tag": "c:nuggets/stainless_steel", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "modern_industrialization:beryllium_ingot", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json deleted file mode 100644 index efee043dd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/blastproof_alloy_plate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "item": "modern_industrialization:mixed_ingot_blastproof", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "modern_industrialization:blastproof_alloy_ingot", - "amount": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json deleted file mode 100644 index 82c6c11a5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/diamond.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "tag": "c:dusts/diamond", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:diamond", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json deleted file mode 100644 index 9af271fab..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/emerald.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "tag": "c:dusts/emerald", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:emerald", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json deleted file mode 100644 index 2bb93ab5a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/iridium_plate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "item": "modern_industrialization:mixed_ingot_iridium", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "modern_industrialization:iridium_plate", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json deleted file mode 100644 index 029647e81..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/nuclear_alloy_plate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "item": "modern_industrialization:mixed_plate_nuclear", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "modern_industrialization:nuclear_alloy_plate", - "amount": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json b/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json deleted file mode 100644 index 5b0731e3c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/implosion_compressor/tungsten.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "tag": "c:tiny_dusts/tungsten", - "amount": 9 - }, - { - "tag": "c:nuggets/stainless_steel", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "modern_industrialization:tungsten_ingot", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json deleted file mode 100644 index 4cb8e2361..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_block.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 200, - "item_inputs": { - "item": "minecraft:bricks", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:brick_dust", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json deleted file mode 100644 index 9da093840..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/brick_dust_from_terracotta.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "minecraft:terracotta", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:brick_dust", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json deleted file mode 100644 index f0ed71c67..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/copper_ore_to_raw.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "c:ores/copper", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:raw_copper", - "amount": 8 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json deleted file mode 100644 index bd7484b0a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lapis_ore_to_crushed.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "c:ores/lapis", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:lapis_crushed_dust", - "amount": 16 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json deleted file mode 100644 index b3a968244..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lead_crushed_to_dust.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "c:raw_materials/lead", - "amount": 1 - }, - "item_outputs": [{ - "item": "modern_industrialization:lead_dust", - "amount": 1 - }, - { - "item": "modern_industrialization:raw_silver", - "amount": 1, - "probability" : 0.5 - }, - { - "item": "modern_industrialization:lead_dust", - "amount": 1, - "probability" : 0.5 - } - - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json deleted file mode 100644 index 7daf94d2a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/lignite_coal_crushed_to_dust.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "modern_industrialization:lignite_coal_crushed_dust", - "amount": 1 - }, - "item_outputs": [{ - "item": "modern_industrialization:lignite_coal_dust", - "amount": 1 - }, - { - "item": "modern_industrialization:lignite_coal_dust", - "amount": 1, - "probability" : 0.5 - }, - { - "item": "modern_industrialization:sulfur_dust", - "amount": 1, - "probability" : 0.5 - } - - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json deleted file mode 100644 index 4760bb25d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/quartz_ore_to_crushed.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "c:ores/quartz", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:quartz_crushed_dust", - "amount": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json deleted file mode 100644 index 4543e944b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/redstone_ore_to_crushed.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "c:ores/redstone", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:redstone_crushed_dust", - "amount": 6 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/wood_pulp.json b/src/main/resources/data/modern_industrialization/recipe/materials/macerator/wood_pulp.json deleted file mode 100644 index dc6cb309e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/macerator/wood_pulp.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "minecraft:logs", - "amount": 1 - }, - "item_outputs": { - "item": "modern_industrialization:wood_pulp", - "amount": 12 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json deleted file mode 100644 index fe8a39d28..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/carbon_dust_to_raw_oil.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 400, - "item_inputs": { - "item": "modern_industrialization:carbon_dust", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 100 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:raw_synthetic_oil", - "amount": 200 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json deleted file mode 100644 index 34d1c6320..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/coke_to_raw_oil.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 400, - "item_inputs": { - "item": "modern_industrialization:coke_dust", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 100 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:raw_synthetic_oil", - "amount": 200 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json deleted file mode 100644 index 7a3f7f559..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/fire_clay_dust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "item": "modern_industrialization:brick_dust", - "amount": 2 - }, - { - "item": "minecraft:clay_ball", - "amount": 2 - } - ], - "item_outputs": { - "item": "modern_industrialization:fire_clay_dust", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/gunpowder.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/gunpowder.json deleted file mode 100644 index 95ccd4cbe..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/gunpowder.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "modern_industrialization:coke_dust", - "amount": 1}, - { - "tag": "c:dusts/sulfur", - "amount": 1} - ] - , - "item_outputs":{ - "item": "minecraft:gunpowder", - "amount": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/itnt.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/itnt.json deleted file mode 100644 index 0ae5f277e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/itnt.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 16, - "duration": 200, - "item_inputs": [ - { - "tag": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:flint", - "amount": 3 - } - ], - "fluid_inputs": - [ - { - "fluid" : "modern_industrialization:toluene", - "amount" : 250 - }, - { - "fluid" : "modern_industrialization:nitrogen", - "amount" : 1000 - } - ], - "item_outputs": { - "item": "modern_industrialization:industrial_tnt", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/lubricant.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/lubricant.json deleted file mode 100644 index e683d92c6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/lubricant.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:redstone", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:creosote", - "amount": 500 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:lubricant", - "amount": 500 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json deleted file mode 100644 index 9231e1042..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/lubricant_oil.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:redstone", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:naphtha", - "amount": 500 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:lubricant", - "amount": 500 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json deleted file mode 100644 index 3e40bcd7a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 4, - "duration": 300, - "item_inputs": { - "tag": "c:dusts/sulfur", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:synthetic_oil", - "amount": 1000 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:synthetic_rubber", - "amount": 1000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json deleted file mode 100644 index c517e889a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/oil_to_rubber_sheet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:paper", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:synthetic_oil", - "amount": 100 - }, - "item_outputs": { - "item": "modern_industrialization:rubber_sheet", - "amount": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json deleted file mode 100644 index f970f9595..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/rubber_sheet_from_synthetic.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:paper", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:synthetic_rubber", - "amount": 100 - }, - "item_outputs": { - "item": "modern_industrialization:rubber_sheet", - "amount": 12 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json deleted file mode 100644 index 2ebaf54f6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/mixer/uncooked_steel_dust.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "tag": "c:dusts/iron", - "amount": 7 - }, - { - "item": "modern_industrialization:coke_dust", - "amount": 2 - } - ], - "item_outputs": { - "item": "modern_industrialization:uncooked_steel_dust", - "amount": 9 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/packer/fire_bricks.json b/src/main/resources/data/modern_industrialization/recipe/materials/packer/fire_bricks.json deleted file mode 100644 index 00eea4e45..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/packer/fire_bricks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "modern_industrialization:fire_clay_brick", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "modern_industrialization:fire_clay_bricks", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json b/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json deleted file mode 100644 index a2a9de0b0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_blastproof.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "modern_industrialization:packer", - "eu" : 2, - "duration" : 200, - "item_inputs" : [ - { - "tag" : "c:ingots/tungsten", - "amount" : 1 - }, - { - "tag" : "c:ingots/titanium", - "amount" : 1 - }, - { - "tag" : "c:ingots/stainless_steel", - "amount" : 1 - } - ], - "item_outputs" : { - "item" : "modern_industrialization:mixed_ingot_blastproof", - "amount" : 1 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json b/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json deleted file mode 100644 index 8acaa8c44..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_ingot_iridium.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "modern_industrialization:packer", - "eu" : 2, - "duration" : 200, - "item_inputs" : [ - { - "tag" : "c:ingots/blastproof_alloy", - "amount" : 1 - }, - { - "tag" : "c:ingots/iridium", - "amount" : 1 - }, - { - "tag" : "c:ingots/blastproof_alloy", - "amount" : 1 - } - ], - "item_outputs" : { - "item" : "modern_industrialization:mixed_ingot_iridium", - "amount" : 1 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json b/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json deleted file mode 100644 index 9630dbef7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/packer/mixed_plate_nuclear.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type" : "modern_industrialization:packer", - "eu" : 2, - "duration" : 200, - "item_inputs" : [ - { - "item" : "modern_industrialization:blastproof_alloy_plate", - "amount" : 1 - }, - { - "tag" : "c:plates/beryllium", - "amount" : 1 - }, - { - "tag" : "c:plates/cadmium", - "amount" : 1 - } - ], - "item_outputs" : { - "item" : "modern_industrialization:mixed_plate_nuclear", - "amount" : 1 - } - -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json deleted file mode 100644 index 843055791..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 2, - "duration" : 100, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:high_pressure_heavy_water", - "amount" : 125 - }, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:heavy_water", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json deleted file mode 100644 index 21e1e34c9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/heavy_water_steam.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 2, - "duration" : 100, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:high_pressure_heavy_water_steam", - "amount" : 125 - }, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:heavy_water_steam", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/steam.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/steam.json deleted file mode 100644 index 0bc871b01..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/steam.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 2, - "duration" : 100, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:high_pressure_steam", - "amount" : 125 - }, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:steam", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/water.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/water.json deleted file mode 100644 index 0d140b6f5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/down/water.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 2, - "duration" : 100, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:high_pressure_water", - "amount" : 125 - }, - - "fluid_outputs" : { - "fluid" : "minecraft:water", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json deleted file mode 100644 index 5b1baf86a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/liquid_air.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "modern_industrialization:pressurizer", - "eu": 8, - "duration" : 200, - - "item_inputs": { - "item" : "modern_industrialization:air_intake", - "probability": 0 - }, - - "fluid_outputs": { - "fluid" : "modern_industrialization:liquid_air", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json deleted file mode 100644 index 58631b98a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 64, - "duration" : 1200, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:heavy_water", - "amount" : 1000 - }, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:high_pressure_heavy_water", - "amount" : 125 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json deleted file mode 100644 index b4c9fc67a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/heavy_water_steam.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 64, - "duration" : 75, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:high_pressure_heavy_water_steam", - "amount" : 125 - }, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:heavy_water_steam", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/steam.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/steam.json deleted file mode 100644 index fa1d06b0b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/steam.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 64, - "duration" : 75, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:high_pressure_steam", - "amount" : 125 - }, - - "fluid_inputs" : { - "fluid" : "modern_industrialization:steam", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/water.json b/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/water.json deleted file mode 100644 index a89085d02..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/pressurizer/up/water.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type" : "modern_industrialization:pressurizer", - "eu" : 64, - "duration" : 1200, - - "fluid_outputs" : { - "fluid" : "modern_industrialization:high_pressure_water", - "amount" : 125 - }, - - "fluid_inputs" : { - "fluid" : "minecraft:water", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/uncooked_steel_dust.json b/src/main/resources/data/modern_industrialization/recipe/materials/uncooked_steel_dust.json deleted file mode 100644 index f40a3cdd7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/uncooked_steel_dust.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": - [ - { - "tag" : "c:dusts/iron" - }, - { - "tag" : "c:dusts/iron" - }, - { - "tag" : "c:dusts/iron" - }, - { - "tag" : "c:dusts/iron" - }, - { - "tag" : "c:dusts/iron" - }, - { - "tag" : "c:dusts/iron" - }, - { - "tag" : "c:dusts/iron" - }, - { - "item" : "modern_industrialization:coke_dust" - } - , - { - "item" : "modern_industrialization:coke_dust" - } - - ], - "result": { - "id": "modern_industrialization:uncooked_steel_dust", - "count": 7 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json b/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json deleted file mode 100644 index c6061aeac..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "modern_industrialization:vacuum_freezer", - "eu": 256, - "duration" : 250, - - "fluid_inputs" : - [ - { - "fluid" : "modern_industrialization:argon", - "amount": 140 - }, - { - "fluid" : "modern_industrialization:helium", - "amount": 60 - } - ], - - "fluid_outputs": { - "fluid" : "modern_industrialization:cryofluid", - "amount" : 200 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json b/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json deleted file mode 100644 index f4c63bd14..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/liquid_air.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "modern_industrialization:vacuum_freezer", - "eu": 32, - "duration" : 200, - - "item_inputs": { - "item" : "modern_industrialization:air_intake", - "probability": 0 - }, - - "fluid_outputs": { - "fluid" : "modern_industrialization:liquid_air", - "amount" : 1000 - } - -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json b/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json deleted file mode 100644 index 18bf64957..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/redstone.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "modern_industrialization:vacuum_freezer", - "eu": 16, - "duration": 5, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:molten_redstone", - "amount": 90 - } - ], - "item_outputs": { - "item": "minecraft:redstone" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json b/src/main/resources/data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json deleted file mode 100644 index 2c9022042..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/blast_furnace/methane_to_acetylene.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:blast_furnace", - "eu": 32, - "duration": 50, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:methane", - "amount": 200 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:acetylene", - "amount": 200 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json deleted file mode 100644 index cbaa6892b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/acrylic_glue_to_slime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 10, - "duration": 80, - "item_inputs": { - "item": "minecraft:slime_ball", - "probability": 0 - }, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:acrylic_glue", - "amount": 25 - } - ], - "item_outputs": { - "item": "minecraft:slime_ball" - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json deleted file mode 100644 index 6ca13b785..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/actylene_to_hydrogen.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 12, - "duration": 200, - "fluid_inputs": { - "fluid": "modern_industrialization:acetylene", - "amount": 1000 - }, - "item_inputs": { - "tag": "c:dusts/coal", - "amount": 1 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:hydrogen", - "amount": 2000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json deleted file mode 100644 index b3f4b6c5d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/benzene_ethylene_to_ethylbenzene.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 12, - "duration": 300, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:benzene", - "amount": 750 - }, - { - "fluid": "modern_industrialization:ethylene", - "amount": 750 - }, - { - "fluid": "modern_industrialization:hydrochloric_acid", - "amount": 100 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:ethylbenzene", - "amount": 750 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json deleted file mode 100644 index 130f2c000..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/caprolactam.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 16, - "duration": 300, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:benzene", - "amount": 500 - }, - { - "fluid": "modern_industrialization:hydrogen", - "amount": 750 - } - ], - "item_inputs": { - "tag": "c:tiny_dusts/nickel", - "amount": 4 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:caprolactam", - "amount": 600 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json deleted file mode 100644 index c207eb9b7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_butadiene.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 16, - "duration": 300, - "fluid_inputs": { - "fluid": "modern_industrialization:ethanol", - "amount": 750 - }, - "item_inputs": { - "tag": "c:tiny_dusts/aluminum", - "amount": 1 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:butadiene", - "amount": 375 - }, - { - "fluid": "minecraft:water", - "amount": 750 - }, - { - "fluid": "modern_industrialization:hydrogen", - "amount": 250 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json deleted file mode 100644 index 08b1a1141..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_diethyl_ether.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 20, - "duration": 300, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:ethanol", - "amount": 500 - }, - { - "fluid": "modern_industrialization:acrylic_acid", - "amount": 25 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:diethyl_ether", - "amount": 250 - }, - { - "fluid": "minecraft:water", - "amount": 250 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json deleted file mode 100644 index 30f68e9a7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethanol_to_ethylene.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 10, - "duration": 280, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:ethanol", - "amount": 1000 - } - ], - "item_inputs": [ - { - "tag": "c:dusts/sulfur", - "amount": 1 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:ethylene", - "amount": 500 - }, - { - "fluid": "modern_industrialization:sulfuric_acid", - "amount": 400 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json deleted file mode 100644 index 7060dc070..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylbenzene_to_styrene.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 20, - "duration": 240, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:ethylbenzene", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:steam", - "amount": 2000 - } - ], - "item_inputs": { - "tag": "c:dusts/iron", - "amount": 1 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:styrene", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:hydrogen", - "amount": 500 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json deleted file mode 100644 index 90446d465..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/ethylene_to_ethanol.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 10, - "duration": 140, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:ethylene", - "amount": 200 - }, - { - "fluid": "minecraft:water", - "amount": 200 - }, - { - "fluid": "modern_industrialization:sulfuric_acid", - "amount": 35 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:ethanol", - "amount": 200 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json deleted file mode 100644 index 685234ced..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/nylon_to_string.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 100, - "item_inputs": { - "item": "minecraft:string", - "probability": 0 - }, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:nylon", - "amount": 20 - } - ], - "item_outputs": { - "item": "minecraft:string" - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json deleted file mode 100644 index eec1dc477..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/plant_oil_to_raw_biodiesel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 12, - "duration": 300, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:plant_oil", - "amount": 6000 - }, - { - "fluid": "modern_industrialization:ethanol", - "amount": 400 - }, - { - "fluid": "modern_industrialization:sodium_hydroxide", - "amount": 100 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:raw_biodiesel", - "amount": 1500 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json deleted file mode 100644 index 87acce021..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/propene_to_acrylic_acid.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 10, - "duration": 240, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:propene", - "amount": 400 - }, - { - "fluid": "modern_industrialization:oxygen", - "amount": 600 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:acrylic_acid", - "amount": 400 - }, - { - "fluid": "minecraft:water", - "amount": 400 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json deleted file mode 100644 index d7925f4a6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/raw_biodiesel_to_biodiesel.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 16, - "duration": 200, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:raw_biodiesel", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:steam", - "amount": 1000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:biodiesel", - "amount": 700 - }, - { - "fluid": "modern_industrialization:ethanol", - "amount": 250 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json deleted file mode 100644 index b46555219..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/styrene_butadiene.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 10, - "duration": 150, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:styrene", - "amount": 500 - }, - { - "fluid": "modern_industrialization:butadiene", - "amount": 500 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:styrene_butadiene", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json b/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json deleted file mode 100644 index f33adfd49..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/chemical_reactor/vinyl_chloride.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 16, - "duration": 500, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:acetylene", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:hydrochloric_acid", - "amount": 1000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:vinyl_chloride", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/crude_oil.json b/src/main/resources/data/modern_industrialization/recipe/oil/crude_oil.json deleted file mode 100644 index b086abc7f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/crude_oil.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "modern_industrialization:oil_drilling_rig", - "eu": 8, - "duration": 200, - "item_inputs": { - "item": "modern_industrialization:aluminum_drill", - "amount": 1, - "probability": 0.04 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:crude_oil", - "amount": 500 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json b/src/main/resources/data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json deleted file mode 100644 index ff84d8c1f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/distillation/ethanol_from_sugar.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:distillery", - "duration": 800, - "eu": 8, - "fluid_inputs": [ - { - "amount": 1000, - "fluid": "modern_industrialization:sugar_solution" - } - ], - "fluid_outputs": [ - { - "amount": 10, - "fluid": "modern_industrialization:ethanol" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diesel.json b/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diesel.json deleted file mode 100644 index fc958749d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diesel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 8, - "duration": 600, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:heavy_fuel", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:light_fuel", - "amount": 5000 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:diesel", - "amount": 6000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json b/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json deleted file mode 100644 index 68bb2e90e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_biodiesel_boost.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 12, - "duration": 450, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:biodiesel", - "amount": 2000 - }, - { - "fluid": "modern_industrialization:diethyl_ether", - "amount": 250 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:boosted_diesel", - "amount": 1500 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json b/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json deleted file mode 100644 index 7460f709f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/diethyl_ether_diesel_boost.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 12, - "duration": 300, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:diesel", - "amount": 1000 - }, - { - "fluid": "modern_industrialization:diethyl_ether", - "amount": 250 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:boosted_diesel", - "amount": 1200 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json b/src/main/resources/data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json deleted file mode 100644 index c3bf5dad5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/lubricant_from_plant_oil.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 200, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:plant_oil", - "amount": 1000 - } - ], - "item_inputs": { - "item": "minecraft:redstone", - "amount": 1 - }, - "fluid_outputs": [ - { - "fluid": "modern_industrialization:lubricant", - "amount": 500 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/sugar_solution.json b/src/main/resources/data/modern_industrialization/recipe/oil/mixer/sugar_solution.json deleted file mode 100644 index 6970c840d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/mixer/sugar_solution.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 200, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1000 - } - ], - "item_inputs": [ - { - "item": "minecraft:sugar", - "amount": 8 - } - ], - "fluid_outputs": [ - { - "fluid": "modern_industrialization:sugar_solution", - "amount": 1000 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/oil_drilling_rig_asbl.json b/src/main/resources/data/modern_industrialization/recipe/oil/oil_drilling_rig_asbl.json deleted file mode 100644 index 40a3e788b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/oil_drilling_rig_asbl.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "LGL", - "PHP", - "LpL" - ], - "key": { - "L": { - "item": "modern_industrialization:steel_large_plate" - }, - "G": { - "item": "modern_industrialization:electronic_circuit" - }, - "P": { - "item": "modern_industrialization:large_pump" - }, - "H": { - "item": "modern_industrialization:advanced_machine_hull" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } - }, - "result": { - "id": "modern_industrialization:oil_drilling_rig" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/shale_oil.json b/src/main/resources/data/modern_industrialization/recipe/oil/shale_oil.json deleted file mode 100644 index 2651f1b5f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/shale_oil.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "modern_industrialization:oil_drilling_rig", - "eu": 32, - "duration": 200, - "item_inputs": { - "item": "modern_industrialization:stainless_steel_drill", - "amount": 1, - "probability": 0.02 - }, - "fluid_outputs": { - "fluid": "modern_industrialization:shale_oil", - "amount": 4000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json b/src/main/resources/data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json deleted file mode 100644 index 050eca025..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/vacuum_freezer/styrene_butadiene_rubber.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:vacuum_freezer", - "eu": 128, - "duration": 300, - "fluid_inputs": { - "fluid": "modern_industrialization:styrene_butadiene_rubber", - "amount": 200 - }, - "item_outputs": { - "item": "modern_industrialization:rubber_sheet", - "amount": 64 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/oil/water.json b/src/main/resources/data/modern_industrialization/recipe/oil/water.json deleted file mode 100644 index 2b8184ceb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/oil/water.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "modern_industrialization:oil_drilling_rig", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "modern_industrialization:copper_drill", - "amount": 1, - "probability": 0.02 - }, - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 16000 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/other/packer_block_template.json b/src/main/resources/data/modern_industrialization/recipe/other/packer_block_template.json deleted file mode 100644 index fc7559895..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/other/packer_block_template.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "b", - "p" - ], - "key": { - "b": { - "item": "minecraft:bricks" - }, - "p": { - "tag": "c:plates/steel" - } - }, - "result": { - "id": "modern_industrialization:packer_block_template" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/other/packer_double_ingot_template.json b/src/main/resources/data/modern_industrialization/recipe/other/packer_double_ingot_template.json deleted file mode 100644 index 3b5ab57ee..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/other/packer_double_ingot_template.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "b", - "p" - ], - "key": { - "b": { - "item": "modern_industrialization:iron_double_ingot" - }, - "p": { - "tag": "c:plates/steel" - } - }, - "result": { - "id": "modern_industrialization:packer_double_ingot_template" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/bronze.json b/src/main/resources/data/modern_industrialization/recipe/quarry/bronze.json index c71b371ed..a3301d8a1 100644 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/bronze.json +++ b/src/main/resources/data/modern_industrialization/recipe/quarry/bronze.json @@ -3,43 +3,43 @@ "eu": 4, "duration": 600, "item_inputs": { - "item": "modern_industrialization:bronze_drill", + "ingredient": "modern_industrialization:bronze_drill", "amount": 1, "probability": 0.04 }, "item_outputs": [ { - "item": "minecraft:iron_ore", + "id": "minecraft:iron_ore", "amount": 1, "probability": 0.4 }, { - "item": "minecraft:coal_ore", + "id": "minecraft:coal_ore", "amount": 1, "probability": 0.4 }, { - "item": "modern_industrialization:lignite_coal_ore", + "id": "modern_industrialization:lignite_coal_ore", "amount": 1, "probability": 0.24 }, { - "item": "minecraft:copper_ore", + "id": "minecraft:copper_ore", "amount": 1, "probability": 0.2 }, { - "item": "modern_industrialization:tin_ore", + "id": "modern_industrialization:tin_ore", "amount": 1, "probability": 0.3 }, { - "item": "minecraft:gold_ore", + "id": "minecraft:gold_ore", "amount": 1, "probability": 0.15 }, { - "item": "minecraft:redstone_ore", + "id": "minecraft:redstone_ore", "amount": 1, "probability": 0.2 }, @@ -47,7 +47,7 @@ "neoforge:conditions": [ { "type": "neoforge:mod_loaded", "modid": "create" } ], - "item": "create:zinc_ore", + "id": "create:zinc_ore", "amount": 1, "probability": 0.08 }, @@ -55,7 +55,7 @@ "neoforge:conditions": [ { "type": "neoforge:mod_loaded", "modid": "mekanism" } ], - "item": "mekanism:osmium_ore", + "id": "mekanism:osmium_ore", "amount": 1, "probability": 0.12 } diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/copper.json b/src/main/resources/data/modern_industrialization/recipe/quarry/copper.json index ef6256a48..d43bef7fb 100644 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/copper.json +++ b/src/main/resources/data/modern_industrialization/recipe/quarry/copper.json @@ -3,48 +3,48 @@ "eu": 4, "duration": 600, "item_inputs": { - "item": "modern_industrialization:copper_drill", + "ingredient": "modern_industrialization:copper_drill", "amount": 1, "probability": 0.1 }, "item_outputs": [ { - "item": "minecraft:cobblestone", + "id": "minecraft:cobblestone", "amount": 32, "probability": 0.5 }, { - "item": "minecraft:diorite", + "id": "minecraft:diorite", "amount": 16, "probability": 0.25 }, { - "item": "minecraft:andesite", + "id": "minecraft:andesite", "amount": 16, "probability": 0.25 }, { - "item": "minecraft:granite", + "id": "minecraft:granite", "amount": 16, "probability": 0.25 }, { - "item": "minecraft:dirt", + "id": "minecraft:dirt", "amount": 10, "probability": 0.5 }, { - "item": "minecraft:gravel", + "id": "minecraft:gravel", "amount": 10, "probability": 0.5 }, { - "item": "minecraft:cobbled_deepslate", + "id": "minecraft:cobbled_deepslate", "amount": 16, "probability": 0.25 }, { - "item": "minecraft:tuff", + "id": "minecraft:tuff", "amount": 16, "probability": 0.25 } diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/aluminum_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/aluminum_drill_asbl.json deleted file mode 100644 index fd7c1e936..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/aluminum_drill_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "gpd", - "mCp", - "cmg" - - ], - "key": { - "d" : { - "item": "modern_industrialization:aluminum_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:fluid_pipes" - }, - "m" : { - "item": "modern_industrialization:pump" - }, - "c" : { - "item" : "modern_industrialization:electrum_cable" - }, - "C" : { - "item" : "modern_industrialization:electronic_circuit" - } - }, - "result": { - "id": "modern_industrialization:aluminum_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/bronze_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/bronze_drill_asbl.json deleted file mode 100644 index a62daed0a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/bronze_drill_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - " d", - "gp ", - "fg " - - ], - "key": { - "d" : { - "item": "modern_industrialization:bronze_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:item_pipes" - }, - "f" : { - "tag" : "modern_industrialization:fluid_pipes" - } - }, - "result": { - "id": "modern_industrialization:bronze_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/copper_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/copper_drill_asbl.json deleted file mode 100644 index bc0797191..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/copper_drill_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - " d", - "gp ", - "fg " - - ], - "key": { - "d" : { - "item": "modern_industrialization:copper_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:item_pipes" - }, - "f" : { - "tag" : "modern_industrialization:fluid_pipes" - } - }, - "result": { - "id": "modern_industrialization:copper_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/gold_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/gold_drill_asbl.json deleted file mode 100644 index 49d4b1218..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/gold_drill_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "gpd", - "mCp", - "cmg" - - ], - "key": { - "d" : { - "item": "modern_industrialization:gold_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:item_pipes" - }, - "m" : { - "item": "modern_industrialization:motor" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - "result": { - "id": "modern_industrialization:gold_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill_asbl.json deleted file mode 100644 index c898e076e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/stainless_steel_drill_asbl.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "gpd", - "mCf", - "cPg" - - ], - "key": { - "d" : { - "item": "modern_industrialization:stainless_steel_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:item_pipes" - }, - "f" : { - "tag" : "modern_industrialization:fluid_pipes" - }, - "m" : { - "item": "modern_industrialization:advanced_motor" - }, - "P" : { - "item": "modern_industrialization:advanced_pump" - }, - "c" : { - "item" : "modern_industrialization:aluminum_cable" - }, - "C" : { - "item" : "modern_industrialization:digital_circuit" - } - }, - "result": { - "id": "modern_industrialization:stainless_steel_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/steel_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/steel_drill_asbl.json deleted file mode 100644 index 75844dae4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/steel_drill_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "gpd", - "mCp", - "cmg" - - ], - "key": { - "d" : { - "item": "modern_industrialization:steel_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:item_pipes" - }, - "m" : { - "item": "modern_industrialization:motor" - }, - "c" : { - "item" : "modern_industrialization:tin_cable" - }, - "C" : { - "item" : "modern_industrialization:analog_circuit" - } - }, - "result": { - "id": "modern_industrialization:steel_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/titanium_drill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/quarry/drill/titanium_drill_asbl.json deleted file mode 100644 index 061dd936f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/drill/titanium_drill_asbl.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "gpd", - "mCp", - "cmg" - - ], - "key": { - "d" : { - "item": "modern_industrialization:titanium_drill_head" - }, - "g" : { - "tag": "c:gears/iron" - }, - "p" : { - "tag" : "modern_industrialization:item_pipes" - }, - "m" : { - "item": "modern_industrialization:large_advanced_motor" - }, - "c" : { - "item" : "modern_industrialization:annealed_copper_cable" - }, - "C" : { - "item" : "modern_industrialization:processing_unit" - } - }, - "result": { - "id": "modern_industrialization:titanium_drill", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/gold.json b/src/main/resources/data/modern_industrialization/recipe/quarry/gold.json index 82b98d38e..2432a6dc6 100644 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/gold.json +++ b/src/main/resources/data/modern_industrialization/recipe/quarry/gold.json @@ -3,59 +3,59 @@ "eu": 8, "duration": 600, "item_inputs": { - "item": "modern_industrialization:gold_drill", + "ingredient": "modern_industrialization:gold_drill", "amount": 1, "probability": 0.1 }, "item_outputs": [ { - "item": "minecraft:netherrack", + "id": "minecraft:netherrack", "amount": 32, "probability": 0.5 }, { - "item": "minecraft:blackstone", + "id": "minecraft:blackstone", "amount": 16, "probability": 0.25 }, { - "item": "minecraft:basalt", + "id": "minecraft:basalt", "amount": 16, "probability": 0.25 }, { - "item": "minecraft:soul_soil", + "id": "minecraft:soul_soil", "amount": 20, "probability": 0.1 }, { - "item": "minecraft:magma_block", + "id": "minecraft:magma_block", "amount": 5, "probability": 0.1 }, { - "item": "minecraft:soul_sand", + "id": "minecraft:soul_sand", "amount": 20, "probability": 0.25 }, { - "item": "minecraft:ancient_debris", + "id": "minecraft:ancient_debris", "amount": 1, "probability": 0.05 }, { - "item": "minecraft:glowstone", + "id": "minecraft:glowstone", "amount": 4, "probability": 0.15 }, { - "item": "minecraft:nether_quartz_ore", + "id": "minecraft:nether_quartz_ore", "amount": 6, "probability": 0.15 }, { - "item": "minecraft:nether_gold_ore", + "id": "minecraft:nether_gold_ore", "amount": 1, "probability": 0.25 } diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/stainless_steel.json b/src/main/resources/data/modern_industrialization/recipe/quarry/stainless_steel.json index f8369d2e3..05cf344af 100644 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/stainless_steel.json +++ b/src/main/resources/data/modern_industrialization/recipe/quarry/stainless_steel.json @@ -3,28 +3,28 @@ "eu": 32, "duration": 600, "item_inputs": { - "item": "modern_industrialization:stainless_steel_drill", + "ingredient": "modern_industrialization:stainless_steel_drill", "amount": 1, "probability": 0.04 }, "item_outputs": [ { - "item": "modern_industrialization:titanium_ore", + "id": "modern_industrialization:titanium_ore", "amount": 1, "probability": 0.15 }, { - "item": "modern_industrialization:tungsten_ore", + "id": "modern_industrialization:tungsten_ore", "amount": 1, "probability": 0.2 }, { - "item": "modern_industrialization:monazite_ore", + "id": "modern_industrialization:monazite_ore", "amount": 1, "probability": 0.25 }, { - "item": "modern_industrialization:platinum_ore", + "id": "modern_industrialization:platinum_ore", "amount": 1, "probability": 0.12 } diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/steel.json b/src/main/resources/data/modern_industrialization/recipe/quarry/steel.json index 7d0d1958f..1385ad8d5 100644 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/steel.json +++ b/src/main/resources/data/modern_industrialization/recipe/quarry/steel.json @@ -3,53 +3,53 @@ "eu": 12, "duration": 600, "item_inputs": { - "item": "modern_industrialization:steel_drill", + "ingredient": "modern_industrialization:steel_drill", "amount": 1, "probability": 0.04 }, "item_outputs": [ { - "item": "modern_industrialization:antimony_ore", + "id": "modern_industrialization:antimony_ore", "amount": 1, "probability": 0.2 }, { - "item": "minecraft:diamond_ore", + "id": "minecraft:diamond_ore", "amount": 1, "probability": 0.12 }, { - "item": "minecraft:lapis_ore", + "id": "minecraft:lapis_ore", "amount": 1, "probability": 0.1 }, { - "item": "modern_industrialization:lead_ore", + "id": "modern_industrialization:lead_ore", "amount": 1, "probability": 0.25 }, { - "item": "modern_industrialization:nickel_ore", + "id": "modern_industrialization:nickel_ore", "amount": 1, "probability": 0.18 }, { - "item": "modern_industrialization:bauxite_ore", + "id": "modern_industrialization:bauxite_ore", "amount": 1, "probability": 0.4 }, { - "item": "modern_industrialization:salt_ore", + "id": "modern_industrialization:salt_ore", "amount": 1, "probability": 0.12 }, { - "item": "minecraft:emerald_ore", + "id": "minecraft:emerald_ore", "amount": 1, "probability": 0.1 }, { - "item": "modern_industrialization:quartz_ore", + "id": "modern_industrialization:quartz_ore", "amount": 1, "probability": 0.2 }, @@ -57,7 +57,7 @@ "neoforge:conditions": [ { "type": "neoforge:mod_loaded", "modid": "powah" } ], - "item": "powah:uraninite_ore", + "id": "powah:uraninite_ore", "amount": 1, "probability": 0.08 } diff --git a/src/main/resources/data/modern_industrialization/recipe/quarry/titanium.json b/src/main/resources/data/modern_industrialization/recipe/quarry/titanium.json index 9a3f78db4..8738b598d 100644 --- a/src/main/resources/data/modern_industrialization/recipe/quarry/titanium.json +++ b/src/main/resources/data/modern_industrialization/recipe/quarry/titanium.json @@ -3,18 +3,18 @@ "eu": 128, "duration": 600, "item_inputs": { - "item": "modern_industrialization:titanium_drill", + "ingredient": "modern_industrialization:titanium_drill", "amount": 1, "probability": 0.04 }, "item_outputs": [ { - "item": "modern_industrialization:uranium_ore", + "id": "modern_industrialization:uranium_ore", "amount": 1, "probability": 0.2 }, { - "item": "modern_industrialization:iridium_ore", + "id": "modern_industrialization:iridium_ore", "amount": 1, "probability": 0.05 }, @@ -22,7 +22,7 @@ "neoforge:conditions": [ { "type": "neoforge:mod_loaded", "modid": "mekanism" } ], - "item": "mekanism:fluorite_ore", + "id": "mekanism:fluorite_ore", "amount": 1, "probability": 0.3 } diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/boiler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/boiler_asbl.json deleted file mode 100644 index 7f451775b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/boiler_asbl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "#T#", - "#F#", - "BBB" - ], - "key": { - "#": { - "tag": "c:plates/bronze" - }, - "T": { - "item": "modern_industrialization:bronze_tank" - }, - "B": { - "item": "modern_industrialization:fire_clay_bricks" - }, - "F": { - "item": "minecraft:furnace" - } - }, - "result": { - "id": "modern_industrialization:bronze_boiler", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/casing_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/casing_pipe_asbl.json deleted file mode 100644 index c25e1d10a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/casing_pipe_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "p p", - "p#p", - "p p" - ], - "key": { - "#": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "p": { - "item": "modern_industrialization:bronze_curved_plate" - } - }, - "result": { - "id": "modern_industrialization:bronze_machine_casing_pipe", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/compressor_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/compressor_asbl.json deleted file mode 100644 index 0136374e5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/compressor_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "rFr", - "GCG", - "ppp" - ], - "key": { - "F": { - "item": "modern_industrialization:forge_hammer" - }, - "G": { - "tag": "c:gears/copper" - }, - "C": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "r": { - "tag": "c:rods/copper" - } - }, - "result": { - "id": "modern_industrialization:bronze_compressor", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/cutting_machine_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/cutting_machine_asbl.json deleted file mode 100644 index 8af6cc8dd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/cutting_machine_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "gdg", - "GCG", - "ppp" - ], - "key": { - "d": { - "item": "minecraft:diamond" - }, - "G": { - "tag": "c:gears/copper" - }, - "C": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "g" :{ - "tag": "c:glass_blocks" - } - }, - "result": { - "id": "modern_industrialization:bronze_cutting_machine", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/furnace_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/furnace_asbl.json deleted file mode 100644 index 9f845d03e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/furnace_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "###", - "#F#", - "BBB" - ], - "key": { - "#": { - "tag": "c:plates/bronze" - }, - "F": { - "item": "minecraft:furnace" - }, - "B": { - "item": "modern_industrialization:fire_clay_bricks" - } - }, - "result": { - "id": "modern_industrialization:bronze_furnace", - "count": 1 - } - } diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/macerator_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/macerator_asbl.json deleted file mode 100644 index 28e4e42f9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/macerator_asbl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "dGd", - "GCG", - "ppp" - ], - "key": { - "d": { - "item": "minecraft:diamond" - }, - "G": { - "tag": "c:gears/copper" - }, - "C": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - } - }, - "result": { - "id": "modern_industrialization:bronze_macerator", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/machine_casing_asbl.json deleted file mode 100644 index 441ab0150..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PPP", - "PGP", - "PPP" - ], - "key": { - "P": { - "tag": "c:plates/bronze" - }, - "G" : { - "tag" : "c:gears/bronze" - } - }, - "result": { - "id": "modern_industrialization:bronze_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/mixer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/mixer_asbl.json deleted file mode 100644 index 81ca1e7fb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/mixer_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "gGg", - "rCr", - "ppp" - ], - "key": { - "r": { - "item": "modern_industrialization:copper_rotor" - }, - "G": { - "tag": "c:gears/copper" - }, - "C": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "g" :{ - "tag": "c:glass_blocks" - } - }, - "result": { - "id": "modern_industrialization:bronze_mixer", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/water_pump_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/water_pump_asbl.json deleted file mode 100644 index f5952d6b8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/bronze/water_pump_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "rTr", - "GCG", - "ppp" - ], - "key": { - "r": { - "item": "modern_industrialization:copper_rotor" - }, - "C": { - "item": "modern_industrialization:bronze_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "G": { - "tag": "c:gears/copper" - }, - "T": { - "item": "modern_industrialization:bronze_tank" - } - }, - "result": { - "id": "modern_industrialization:bronze_water_pump", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json deleted file mode 100644 index 522374fa6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_fluid.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "ppp", - "pbp", - "ppp" - ], - "key": { - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "b": { - "item": "water_bucket" - } - }, - "result": { - "id": "modern_industrialization:fluid_pipe", - "count": 8 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json deleted file mode 100644 index 3b4d5bab9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/eight_item.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "ppp", - "pbp", - "ppp" - ], - "key": { - "p": { - "tag": "modern_industrialization:item_pipes" - }, - "b": { - "item": "water_bucket" - } - }, - "result": { - "id": "modern_industrialization:item_pipe", - "count": 8 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json deleted file mode 100644 index f837860ee..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_fluid.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "pb" - ], - "key": { - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "b": { - "item": "water_bucket" - } - }, - "result": { - "id": "modern_industrialization:fluid_pipe" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json deleted file mode 100644 index 04951a96d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/craft/one_item.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "crafting_shaped", - "pattern": [ - "pb" - ], - "key": { - "p": { - "tag": "modern_industrialization:item_pipes" - }, - "b": { - "item": "water_bucket" - } - }, - "result": { - "id": "modern_industrialization:item_pipe" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json deleted file mode 100644 index cabd39361..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/fluid.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "modern_industrialization:fluid_pipes" - }, - "fluid_inputs": { - "fluid": "water", - "amount": 125 - }, - "item_outputs": { - "item": "modern_industrialization:fluid_pipe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json deleted file mode 100644 index d639deea1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/decolor_pipes/mixer/item.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "modern_industrialization:item_pipes" - }, - "fluid_inputs": { - "fluid": "water", - "amount": 125 - }, - "item_outputs": { - "item": "modern_industrialization:item_pipe" - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json deleted file mode 100644 index 325011a71..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/coke_oven.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "BFB", - "BBB" - ], - "key" : { - "B" : { - "item": "minecraft:bricks" - }, - "F" : { - "item": "minecraft:furnace" - } - }, - "result": { - "id" : "modern_industrialization:coke_oven", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json deleted file mode 100644 index 770ae3cc0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/coke_oven.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 200, - "item_inputs": [ - { - "item": "minecraft:furnace", - "amount": 1 - }, - { - "item": "minecraft:bricks", - "amount": 8 - } - ], - "item_outputs": { - "item": "modern_industrialization:coke_oven", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json deleted file mode 100644 index 138928191..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/packer/packer_steam_blast_furnace.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type" : "modern_industrialization:packer", - "eu" : 2, - "duration" : 200, - "item_inputs" : [ - { - "item": "minecraft:blast_furnace", - "amount": 1 - }, - { - "item": "modern_industrialization:fire_clay_bricks", - "amount": 8 - } - ], - "item_outputs" : { - "item" : "modern_industrialization:steam_blast_furnace", - "amount" : 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json deleted file mode 100644 index f9f3094ce..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/fireclay/steam_blast_furnace.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "BFB", - "BBB" - ], - "key" : { - "B" : { - "item" : "modern_industrialization:fire_clay_bricks" - }, - "F" : { - "item": "minecraft:blast_furnace" - } - }, - "result": { - "id" : "modern_industrialization:steam_blast_furnace", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/fluid_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/fluid_pipe_asbl.json deleted file mode 100644 index a887b2328..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/fluid_pipe_asbl.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CCC", - "rPr", - "CCC" - ], - "key":{ - "C" : { - "item" : "modern_industrialization:bronze_curved_plate" - }, - "r" : { - "item" : "modern_industrialization:copper_rotor" - }, - "P" : { - "item" : "minecraft:glass_pane" - } - - }, - "result": { - "id": "modern_industrialization:fluid_pipe", - "count": 16 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/item_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/item_pipe_asbl.json deleted file mode 100644 index 0da68a84d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/item_pipe_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "CCC", - "G G", - "CCC" - ], - "key":{ - "C" : { - "item" : "modern_industrialization:bronze_curved_plate" - }, - "G" : { - "tag" : "c:gears/steel" - } - }, - "result": { - "id": "modern_industrialization:item_pipe", - "count": 16 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/boiler_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/boiler_asbl.json deleted file mode 100644 index 155df97f7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/boiler_asbl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "#T#", - "#F#", - "BBB" - ], - "key": { - "#": { - "tag": "c:plates/steel" - }, - "T": { - "item": "modern_industrialization:steel_tank" - }, - "B": { - "item": "modern_industrialization:fire_clay_bricks" - }, - "F": { - "item": "minecraft:furnace" - } - }, - "result": { - "id": "modern_industrialization:steel_boiler", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/casing_pipe_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/casing_pipe_asbl.json deleted file mode 100644 index 2b4ddd9a1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/casing_pipe_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "p p", - "p#p", - "p p" - ], - "key": { - "#": { - "item": "modern_industrialization:steel_machine_casing" - }, - "p": { - "item": "modern_industrialization:steel_curved_plate" - } - }, - "result": { - "id": "modern_industrialization:steel_machine_casing_pipe", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/furnace_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/furnace_asbl.json deleted file mode 100644 index 97af4e464..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/furnace_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern" : [ - "###", - "#F#", - "BBB" - ], - "key": { - "#": { - "tag": "c:plates/steel" - }, - "F": { - "item": "minecraft:furnace" - }, - "B": { - "item": "modern_industrialization:fire_clay_bricks" - } - }, - "result": { - "id": "modern_industrialization:steel_furnace", - "count": 1 - } - } diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/machine_casing_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/machine_casing_asbl.json deleted file mode 100644 index 5ca18024e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/machine_casing_asbl.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PPP", - "PGP", - "PPP" - ], - "key": { - "P": { - "tag": "c:plates/steel" - }, - "G" : { - "tag" : "c:gears/steel" - } - }, - "result": { - "id": "modern_industrialization:steel_machine_casing" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/packer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/packer_asbl.json deleted file mode 100644 index 9ca0c7123..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/packer_asbl.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PGP", - "GCG", - "ppp" - ], - "key": { - "G": { - "tag": "c:gears/bronze" - }, - "C": { - "item": "modern_industrialization:steel_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "P": { - "tag": "modern_industrialization:item_pipes" - } - }, - "result": { - "id": "modern_industrialization:steel_packer", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/quarry_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/quarry_asbl.json deleted file mode 100644 index 0c6e6bf90..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/quarry_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "LpL", - "GCG", - "LPL" - ], - "key": { - "L": { - "item": "modern_industrialization:steel_large_plate" - }, - "p":{ - "tag": "modern_industrialization:item_pipes" - }, - "G": { - "tag": "c:gears/steel" - }, - "P": { - "item": "modern_industrialization:invar_rotary_blade" - }, - "C": { - "item": "modern_industrialization:steel_machine_casing" - } - }, - "result": { - "id": "modern_industrialization:steam_quarry", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/steel_upgrade_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/steel_upgrade_asbl.json deleted file mode 100644 index b6dc7bd65..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/steel_upgrade_asbl.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern": [ - "rRr", - "GCG", - "pFp" - ], - "key": { - "p":{ - "tag": "modern_industrialization:fluid_pipes" - }, - "G": { - "tag": "c:gears/bronze" - }, - "R": { - "item": "modern_industrialization:bronze_rotor" - }, - "C": { - "item": "modern_industrialization:steel_machine_casing" - }, - "r": { - "tag": "c:rods/bronze" - }, - "F": { - "item": "modern_industrialization:fire_clay_bricks" - } - }, - "result": { - "id": "modern_industrialization:steel_upgrade", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/unpacker_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/unpacker_asbl.json deleted file mode 100644 index 3f3518722..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/unpacker_asbl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PGP", - "RCR", - "ppp" - ], - "key": { - "G": { - "tag": "c:gears/bronze" - }, - "C": { - "item": "modern_industrialization:steel_machine_casing" - }, - "p": { - "tag": "modern_industrialization:fluid_pipes" - }, - "P": { - "tag": "modern_industrialization:item_pipes" - }, - "R": { - "tag" : "c:rods/bronze" - } - }, - "result": { - "id": "modern_industrialization:steel_unpacker", - "count": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/wiremill_asbl.json b/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/wiremill_asbl.json deleted file mode 100644 index ee8ec9ef3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/steam_age/steel/wiremill_asbl.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "GpG", - "rHr", - "GpG" - ], - "key": - { - "G": { - "tag" : "c:gears/bronze" - }, - "H" :{ - "item" : "modern_industrialization:steel_machine_casing" - }, - "p": { - "tag" : "modern_industrialization:fluid_pipes" - }, - "r" : { - "item" : "modern_industrialization:bronze_rotor" - } - }, - - "result": { - "id": "modern_industrialization:steel_wiremill" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/tools/config_card.json b/src/main/resources/data/modern_industrialization/recipe/tools/config_card.json deleted file mode 100644 index 28eb1cfb0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/tools/config_card.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ggg", - "rcr", - "ibi" - ], - "key": { - "g": { - "item": "minecraft:glass_pane" - }, - "c": { - "item": "modern_industrialization:capacitor" - }, - "r": { - "item": "modern_industrialization:resistor" - }, - "b": { - "item": "modern_industrialization:analog_circuit_board" - }, - "i": { - "item": "modern_industrialization:inductor" - } - }, - "result": { - "id": "modern_industrialization:config_card" - } -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/tools/diesel_chainsaw.json b/src/main/resources/data/modern_industrialization/recipe/tools/diesel_chainsaw.json deleted file mode 100644 index 43830b18a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/tools/diesel_chainsaw.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - " Rr", - "MrR", - "tM " - ], - "key" : { - "M": { - "item" : "modern_industrialization:large_motor" - }, - "r" : { - "item" : "modern_industrialization:invar_rotary_blade" - }, - "t" : { - "item" : "modern_industrialization:aluminum_tank" - }, - "R" : { - "item" : "modern_industrialization:rubber_sheet" - } - }, - "result": { - "id" : "modern_industrialization:diesel_chainsaw" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/tools/diesel_mining_drill.json b/src/main/resources/data/modern_industrialization/recipe/tools/diesel_mining_drill.json deleted file mode 100644 index a1c4a93bf..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/tools/diesel_mining_drill.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "crH", - "MPr", - "tMc" - ], - "key" : { - "P" : { - "item" : "modern_industrialization:large_pump" - }, - "M": { - "item" : "modern_industrialization:large_motor" - }, - "r" : { - "item" : "modern_industrialization:invar_rotary_blade" - }, - "t" : { - "item" : "modern_industrialization:aluminum_tank" - }, - "c": { - "item" : "modern_industrialization:electronic_circuit" - }, - "H" : { - "item" : "modern_industrialization:aluminum_drill_head" - } - }, - "result": { - "id" : "modern_industrialization:diesel_mining_drill" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json b/src/main/resources/data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json deleted file mode 100644 index f10664e8d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/tools/smithing/netherite_hammer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:smithing_transform", - "addition": { - "item": "minecraft:netherite_ingot" - }, - "base": { - "item": "modern_industrialization:diamond_hammer" - }, - "result": { - "id": "modern_industrialization:netherite_hammer" - }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/tools/steam_mining_drill.json b/src/main/resources/data/modern_industrialization/recipe/tools/steam_mining_drill.json deleted file mode 100644 index 7337e5a08..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/tools/steam_mining_drill.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type" : "minecraft:crafting_shaped", - "pattern" : [ - "fdd", - "PDd", - "bPf" - ], - "key" : { - "P": { - "item" : "modern_industrialization:iron_large_plate" - }, - "f" : { - "item" : "minecraft:furnace" - }, - "b" : { - "item" : "minecraft:bucket" - }, - "d": { - "item" : "minecraft:diamond" - }, - "D" : { - "item" : "modern_industrialization:copper_drill_head" - } - }, - "result": { - "id" : "modern_industrialization:steam_mining_drill" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/tools/wrench.json b/src/main/resources/data/modern_industrialization/recipe/tools/wrench.json deleted file mode 100644 index 4c1d8ba14..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/tools/wrench.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "b b", - "bbb", - " b " - ], - "key": { - "b": { - "tag": "c:plates/bronze" - } - }, - "result": { - "id": "modern_industrialization:wrench" - } -} - diff --git a/src/main/resources/data/modern_industrialization/recipe/trash_can.json b/src/main/resources/data/modern_industrialization/recipe/trash_can.json deleted file mode 100644 index c1b486b6f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/trash_can.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "PPP", - "PLP", - "PPP" - ], - "key": { - "P": { - "tag": "c:plates/steel" - }, - "L": { - "item": "minecraft:lava_bucket" - } - }, - "result": { - "id": "modern_industrialization:trash_can" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/trash_can_assembler.json b/src/main/resources/data/modern_industrialization/recipe/trash_can_assembler.json deleted file mode 100644 index 6d6707b1a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/trash_can_assembler.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": - { - "tag": "c:plates/steel", - "amount": 8 - }, - "fluid_inputs" : - { - "fluid": "minecraft:lava", - "amount": 1000 - }, - "item_outputs": [ - { - "item": "modern_industrialization:trash_can", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json deleted file mode 100644 index 662e66b8d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/barrel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "minecraft:planks", - "amount": 6 - }, - { - "tag": "minecraft:wooden_slabs", - "amount": 2 - } - ], - "item_outputs": [ - { - "item": "minecraft:barrel", - "amount": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json deleted file mode 100644 index e9aa2289a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/chest.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "minecraft:planks", - "amount": 8 - }, - { - "item": "minecraft:chest", - "amount": 1, - "probability": 0 - } - ], - "item_outputs": [ - { - "item": "minecraft:chest", - "amount": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json deleted file mode 100644 index 38ce30d64..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/hopper.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "c:plates/steel", - "amount": 5 - }, - { - "item": "modern_industrialization:motor", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:hopper", - "amount": 2 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json deleted file mode 100644 index e55d43c42..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/powered_rail.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "c:rods/gold", - "amount": 6 - }, - { - "item": "minecraft:stick", - "amount": 1 - }, - { - "item": "minecraft:redstone", - "amount": 1 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:creosote", - "amount": 100 - } - ], - "item_outputs": [ - { - "item": "minecraft:powered_rail", - "amount": 8 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json deleted file mode 100644 index e5a169983..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/rail.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "tag": "c:rods/steel", - "amount": 6 - }, - { - "item": "minecraft:stick", - "amount": 1 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:creosote", - "amount": 100 - } - ], - "item_outputs": [ - { - "item": "minecraft:rail", - "amount": 16 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json deleted file mode 100644 index fee161819..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/assembler/sea_lantern.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:assembler", - "eu": 8, - "duration": 200, - "item_inputs": [ - { - "item": "minecraft:prismarine_crystals", - "amount": 5 - }, - { - "item": "minecraft:prismarine_shard", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:sea_lantern", - "amount": 2 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/blast_furnace_asbl.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/blast_furnace_asbl.json deleted file mode 100644 index f8adc2947..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/blast_furnace_asbl.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "ppp", - "pfp", - "sss" - ], - "key": { - "f": { - "item": "minecraft:furnace" - }, - "p": { - "tag": "c:plates/steel" - }, - "s": { - "item": "minecraft:smooth_stone" - } - }, - "result": { - "id": "minecraft:blast_furnace", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json deleted file mode 100644 index 6bd51955e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/centrifuge/lava.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "modern_industrialization:centrifuge", - "eu": 32, - "duration": 600, - - "fluid_inputs" : { - "fluid" : "minecraft:lava", - "amount" : 1000 - }, - - "item_outputs": [ - { - "item": "modern_industrialization:sulfur_dust", - "amount": 17 - }, - - { - "item": "modern_industrialization:copper_nugget", - "amount": 11 - }, - - { - "item": "modern_industrialization:aluminum_nugget", - "amount": 3, - "probability": 0.5 - }, - - { - "item": "modern_industrialization:chromium_nugget", - "amount": 1, - "probability": 0.25 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json deleted file mode 100644 index f161daba6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_boots.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - "x x" - ], - "key": { - "x": [ - { - "item": "modern_industrialization:iron_ring" - } - ] - }, - "result": { - "id": "minecraft:chainmail_boots" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json deleted file mode 100644 index d8e6c894f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_chestplate.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "x x", - "xxx", - "xxx" - ], - "key": { - "x": [ - { - "item": "modern_industrialization:iron_ring" - } - ] - }, - "result": { - "id": "minecraft:chainmail_chestplate" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json deleted file mode 100644 index ef092ffb5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_helmet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x" - ], - "key": { - "x": [ - { - "item": "modern_industrialization:iron_ring" - } - ] - }, - "result": { - "id": "minecraft:chainmail_helmet" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json deleted file mode 100644 index 4f1e05a8f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chainmail_leggings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "x x" - ], - "key": { - "x": [ - { - "item": "modern_industrialization:iron_ring" - } - ] - }, - "result": { - "id": "minecraft:chainmail_leggings" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chains.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chains.json deleted file mode 100644 index 89445ca7a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chains.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " R ", - " R ", - " R " - ], - "key": { - "R": { - "item": "modern_industrialization:steel_ring" - } - }, - "result": { - "id": "minecraft:chain", - "count": 6 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json deleted file mode 100644 index 104f5d1bb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/amethyst.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 4, - "duration": 400, - "item_inputs": [ - { - "tag": "c:dusts/quartz", - "amount": 4 - }, - { - "tag": "c:tiny_dusts/iron", - "amount": 1 - } - ], - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 250 - }, - { - "fluid": "modern_industrialization:sodium_hydroxide", - "amount": 500 - } - ], - "item_outputs": { - "item": "minecraft:amethyst_shard", - "amount": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json deleted file mode 100644 index 03641b5cb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/brain_coral.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 2, - "duration": 6000, - "item_inputs": [ - { - "item": "minecraft:brain_coral_block", - "amount": 1 - }, - { - "item": "minecraft:bone_meal", - "amount": 4 - }, - { - "tag": "c:dusts/salt", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 9000 - } - ], - "item_outputs": [ - { - "item": "minecraft:brain_coral_block", - "amount": 2 - }, - { - "item": "minecraft:brain_coral", - "amount": 2 - }, - { - "item": "minecraft:brain_coral_fan", - "amount": 2 - } - ], - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 6000 - } -} - - - diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json deleted file mode 100644 index 287fc5252..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/bubble_coral.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 2, - "duration": 6000, - "item_inputs": [ - { - "item": "minecraft:bubble_coral_block", - "amount": 1 - }, - { - "item": "minecraft:bone_meal", - "amount": 4 - }, - { - "tag": "c:dusts/salt", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 9000 - } - ], - "item_outputs": [ - { - "item": "minecraft:bubble_coral_block", - "amount": 2 - }, - { - "item": "minecraft:bubble_coral_fan", - "amount": 2 - }, - { - "item": "minecraft:bubble_coral", - "amount": 2 - } - ], - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 6000 - } -} - - - diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json deleted file mode 100644 index affee69a1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/fire_coral.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 2, - "duration": 6000, - "item_inputs": [ - { - "item": "minecraft:fire_coral_block", - "amount": 1 - }, - { - "item": "minecraft:bone_meal", - "amount": 4 - }, - { - "tag": "c:dusts/salt", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 9000 - } - ], - "item_outputs": [ - { - "item": "minecraft:fire_coral_block", - "amount": 2 - }, - { - "item": "minecraft:fire_coral_fan", - "amount": 2 - }, - { - "item": "minecraft:fire_coral", - "amount": 2 - } - ], - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 6000 - } -} - - - diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json deleted file mode 100644 index 6818f742f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/horn_coral.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 2, - "duration": 6000, - "item_inputs": [ - { - "item": "minecraft:horn_coral_block", - "amount": 1 - }, - { - "item": "minecraft:bone_meal", - "amount": 4 - }, - { - "tag": "c:dusts/salt", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 9000 - } - ], - "item_outputs": [ - { - "item": "minecraft:horn_coral_block", - "amount": 2 - }, - { - "item": "minecraft:horn_coral_fan", - "amount": 2 - }, - { - "item": "minecraft:horn_coral", - "amount": 2 - } - ], - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 6000 - } -} - - - diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json deleted file mode 100644 index 9e6821bd4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/leather.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 8, - "duration": 100, - "item_inputs": { - "item": "minecraft:rotten_flesh", - "amount": 5 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:oxygen", - "amount": 100 - }, - "item_outputs": { - "item": "minecraft:leather", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json deleted file mode 100644 index 892578445..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/prismarine_crystals.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 4, - "duration": 400, - "item_inputs": [ - { - "tag": "c:dusts/quartz", - "amount": 4 - }, - { - "tag": "c:tiny_dusts/beryllium", - "amount": 3 - }, - { - "tag": "c:tiny_dusts/aluminum", - "amount": 2 - } - ], - "fluid_inputs": [ - { - "fluid": "modern_industrialization:hydrogen", - "amount": 4000 - }, - { - "fluid": "modern_industrialization:sodium_hydroxide", - "amount": 4000 - }, - { - "fluid": "modern_industrialization:chlorine", - "amount": 250 - } - ], - "item_outputs": { - "item": "minecraft:prismarine_crystals", - "amount": 16 - } -} - - - diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json deleted file mode 100644 index 3cde32c2b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/chemical_reactor/tube_coral.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "type": "modern_industrialization:chemical_reactor", - "eu": 2, - "duration": 6000, - "item_inputs": [ - { - "item": "minecraft:tube_coral_block", - "amount": 1 - }, - { - "item": "minecraft:bone_meal", - "amount": 4 - }, - { - "tag": "c:dusts/salt", - "amount": 4 - } - ], - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 9000 - } - ], - "item_outputs": [ - { - "item": "minecraft:tube_coral_block", - "amount": 2 - }, - { - "item": "minecraft:tube_coral_fan", - "amount": 2 - }, - { - "item": "minecraft:tube_coral", - "amount": 2 - } - ], - "fluid_outputs": { - "fluid": "minecraft:water", - "amount": 6000 - } -} - - - diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json deleted file mode 100644 index bafdcf4e2..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/clay_uncrafting.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ "C" ], - "key": { - "C": { - "item": "minecraft:clay" - } - }, - "result": { - "id": "minecraft:clay_ball", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json deleted file mode 100644 index d8f490f56..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/diamond_from_coal.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:compressor", - "eu": 4, - "duration": 6000, - "item_inputs": { - "item": "minecraft:coal_block", - "amount": 16 - }, - "item_outputs": { - "item": "minecraft:diamond", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json deleted file mode 100644 index 75c282c08..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/glass_bottle.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:compressor", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "c:glass_blocks", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:glass_bottle", - "amount": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json deleted file mode 100644 index b61cf52b7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/packed_mud.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:compressor", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:mud", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:packed_mud", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json deleted file mode 100644 index 2ad02e3e8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/compressor/paper_with_sugarcane.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:compressor", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:sugar_cane", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:paper", - "amount": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json deleted file mode 100644 index d22710f53..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/glass_panes.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:cutting_machine", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:glass", - "amount": 6 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:lubricant", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:glass_pane", - "amount": 16 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json deleted file mode 100644 index ac840d3af..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/cutting_machine/sticks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:cutting_machine", - "eu": 2, - "duration": 50, - "item_inputs": { - "tag": "minecraft:planks", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "modern_industrialization:lubricant", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:stick", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json deleted file mode 100644 index 15cb0e84e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/easy_chest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "lll", - "l l", - "lll" - ], - "key": { - "l": { - "tag": "minecraft:logs" - } - }, - "result": { - "id": "minecraft:chest", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json deleted file mode 100644 index 7efef49e5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_block.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 45, - "ingredient": { - "item": "minecraft:bone_block" - }, - "result": { - "id": "minecraft:bone_meal", - "count": 9 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json deleted file mode 100644 index 58f094d3e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/bone_meal_from_bone.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 30, - "ingredient": { - "item": "minecraft:bone" - }, - "result": { - "id": "minecraft:bone_meal", - "count": 6 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json deleted file mode 100644 index b14b8d00d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/gravel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 10, - "ingredient": { - "item": "minecraft:cobblestone" - }, - "result": { - "id": "minecraft:gravel" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json deleted file mode 100644 index c69d1fd57..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/forge_hammer/sand.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "modern_industrialization:forge_hammer", - "damage": 10, - "ingredient": { - "item": "minecraft:gravel" - }, - "result": { - "id": "minecraft:sand" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json deleted file mode 100644 index 2ae1b1c68..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/enchanted_golden_apple.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 1, - "duration": 10, - "item_inputs": [ - { - "tag": "c:storage_blocks/gold", - "amount": 64 - }, - { - "item": "minecraft:apple", - "amount": 1 - }, - { - "item": "modern_industrialization:industrial_tnt", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:enchanted_golden_apple", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json deleted file mode 100644 index af84ee8e8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/implosion_compressor/nether_star.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "modern_industrialization:implosion_compressor", - "eu": 64, - "duration": 10, - "item_inputs": [ - { - "item": "modern_industrialization:singularity" - }, - { - "amount": 1, - "item": "minecraft:lava_bucket" - }, - { - "amount": 64, - "item": "modern_industrialization:nuke" - }, - { - "amount": 64, - "item": "modern_industrialization:nuke" - } - ], - "item_outputs": [ - { - "item": "minecraft:nether_star" - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json deleted file mode 100644 index c03986ddb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/lignite_torch.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "#" - ], - "key": { - "#": { - "item": "minecraft:stick" - }, - "X": [ - { - "item": "modern_industrialization:lignite_coal" - } - ] - }, - "result": { - "id": "minecraft:torch", - "count": 4 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json deleted file mode 100644 index d7ea667e5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blaze_dust.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:blaze_rod", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:blaze_powder", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json deleted file mode 100644 index 9090dcac7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/blue_dye1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag" : "c:dusts/lapis", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:blue_dye", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json deleted file mode 100644 index 45228a7f0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_block.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:bone_block", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:bone_meal", - "amount": 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json deleted file mode 100644 index 612c6440e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/bone_meal_from_bone.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:bone", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:bone_meal", - "amount": 6 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json deleted file mode 100644 index a65c83154..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/clay_ball.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:clay", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:clay_ball", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json deleted file mode 100644 index 6bba31b40..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/cobbled_deepslate.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:deepslate", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:cobbled_deepslate", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json deleted file mode 100644 index 8676beb57..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gilded_blackstone.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:gilded_blackstone", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:gold_nugget", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json deleted file mode 100644 index c8f148f37..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/glowstone_dust.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:glowstone", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:glowstone_dust", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json deleted file mode 100644 index 0be5eaffc..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/gravel.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:cobblestone", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:gravel", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json deleted file mode 100644 index 0d7944ce3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/netherite_scrap.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 800, - "item_inputs": { - "item": "minecraft:ancient_debris", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:netherite_scrap", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json deleted file mode 100644 index 9f8132155..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/red_sandstone_to_sand.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:red_sandstone", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:red_sand", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json deleted file mode 100644 index 7e66ca4fb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sand.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:gravel", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:sand", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json deleted file mode 100644 index 1235a89d8..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sandstone_to_sand.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:sandstone", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:sand", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json deleted file mode 100644 index 186d61f1a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/strings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "tag": "minecraft:wool", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:string", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json deleted file mode 100644 index b9c2cdfd9..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/macerator/sugar.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:sugar_cane", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:sugar", - "amount": 3 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json deleted file mode 100644 index 2ca48f05c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/andesite.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:andesite", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:andesite", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json deleted file mode 100644 index 9641f704d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/calcite.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:calcite", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:calcite", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json deleted file mode 100644 index e8346aa44..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/clay.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:sand", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:clay", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json deleted file mode 100644 index 5c28c0958..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/coarse_dirt.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:dirt", - "amount": 1 - }, - { - "item": "minecraft:gravel", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:coarse_dirt", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json deleted file mode 100644 index dc063da14..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobbled_deepslate.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:cobbled_deepslate", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:cobbled_deepslate", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json deleted file mode 100644 index 1376971e3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/cobblestone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:cobblestone", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:cobblestone", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json deleted file mode 100644 index a13e5067b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:black_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:black_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json deleted file mode 100644 index 0dd37dd7b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/black_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:black_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:black_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json deleted file mode 100644 index bda995a93..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:blue_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:blue_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json deleted file mode 100644 index 3221f22a1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/blue_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:blue_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:blue_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json deleted file mode 100644 index a9762d3b4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:brown_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:brown_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json deleted file mode 100644 index 99d095b07..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/brown_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:brown_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:brown_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json deleted file mode 100644 index 18c3d879d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:cyan_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:cyan_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json deleted file mode 100644 index c5efbb1f4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/cyan_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:cyan_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:cyan_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json deleted file mode 100644 index 8b91ef933..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:gray_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:gray_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json deleted file mode 100644 index 0cfcda40e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/gray_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:gray_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:gray_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json deleted file mode 100644 index 43174464d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:green_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:green_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json deleted file mode 100644 index 6304c1d09..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/green_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:green_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:green_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json deleted file mode 100644 index 5e8c56660..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:light_blue_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:light_blue_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json deleted file mode 100644 index 5c0fc0c57..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_blue_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:light_blue_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:light_blue_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json deleted file mode 100644 index a1a1d7777..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:light_gray_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:light_gray_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json deleted file mode 100644 index 65dd6bb56..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/light_gray_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:light_gray_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:light_gray_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json deleted file mode 100644 index df383afa5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:lime_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:lime_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json deleted file mode 100644 index 580f475eb..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/lime_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:lime_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:lime_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json deleted file mode 100644 index 794262dc5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:magenta_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:magenta_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json deleted file mode 100644 index 618618907..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/magenta_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:magenta_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:magenta_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json deleted file mode 100644 index f9c321916..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:orange_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:orange_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json deleted file mode 100644 index 2a6eef210..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/orange_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:orange_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:orange_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json deleted file mode 100644 index b7faa20c0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:pink_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:pink_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json deleted file mode 100644 index 29355ac36..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/pink_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:pink_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:pink_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json deleted file mode 100644 index 46e1e4b30..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:purple_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:purple_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json deleted file mode 100644 index 88febcc63..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/purple_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:purple_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:purple_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json deleted file mode 100644 index 92e55e072..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:red_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:red_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json deleted file mode 100644 index 24c66defd..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/red_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:red_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:red_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json deleted file mode 100644 index c9a25c905..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:white_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:white_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json deleted file mode 100644 index 5ebca7190..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/white_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:white_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:white_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json deleted file mode 100644 index 4d38fefb1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:yellow_concrete_powder", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:yellow_concrete", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json deleted file mode 100644 index 4feebbb23..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/concrete/yellow_concrete_powder.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gravel", - "amount": 4 - }, - { - "item": "minecraft:yellow_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:yellow_concrete_powder", - "amount": 8 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json deleted file mode 100644 index 65e0d40be..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dark_prismarine.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:prismarine", - "amount": 8 - }, - { - "item": "minecraft:black_dye", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:dark_prismarine", - "amount": 8 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json deleted file mode 100644 index 69f150e4c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/diorite.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:diorite", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:diorite", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json deleted file mode 100644 index 6d9497731..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dirt.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 600, - "item_inputs": - { - "item": "minecraft:coarse_dirt", - "amount": 1 - }, - "fluid_inputs": { - "fluid" : "minecraft:water", - "amount":6000 - }, - "item_outputs": { - "item": "minecraft:dirt", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json deleted file mode 100644 index 966c7ae9a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dripstone.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:dripstone_block", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:dripstone_block", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json deleted file mode 100644 index 86b40668e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "modern_industrialization:coal_dust" - }], - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 50 - }, - "item_outputs": { - "item": "minecraft:black_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json deleted file mode 100644 index a1cf43f35..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:ink_sac", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:black_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json deleted file mode 100644 index 25448e9a6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/black_dye3.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:wither_rose", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:black_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json deleted file mode 100644 index 6d46ce730..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/blue_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:cornflower", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:blue_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json deleted file mode 100644 index 4dffe7393..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/brown_dye.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:cocoa_beans", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:brown_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json deleted file mode 100644 index 76ed1bf9f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/cyan_dye.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:green_dye" - }, - { - "amount": 1, - "item" : "minecraft:blue_dye" - }], - - "item_outputs": { - "item": "minecraft:cyan_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json deleted file mode 100644 index 13ae56632..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/gray_dye.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:black_dye" - }, - { - "amount": 1, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:gray_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json deleted file mode 100644 index 6aa7e41ff..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:blue_orchid", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:light_blue_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json deleted file mode 100644 index fd5cb7791..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_blue_dye2.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:blue_dye" - }, - { - "amount": 1, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:light_blue_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json deleted file mode 100644 index a95e1b999..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:azure_bluet", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:light_gray_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json deleted file mode 100644 index 0dcb2f182..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:oxeye_daisy", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:light_gray_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json deleted file mode 100644 index 4f41f5c9f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye3.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:white_tulip", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:light_gray_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json deleted file mode 100644 index 10c8bd17d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye4.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:gray_dye" - }, - { - "amount": 1, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:light_gray_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json deleted file mode 100644 index 6ffa993d4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/light_gray_dye5.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:black_dye" - }, - { - "amount": 2, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:light_gray_dye", - "amount": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json deleted file mode 100644 index e707bc9f1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/lime_dye.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:green_dye" - }, - { - "amount": 1, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:lime_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json deleted file mode 100644 index 7ec5e377f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:allium", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:magenta_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json deleted file mode 100644 index 3c7d992ba..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:lilac", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:magenta_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json deleted file mode 100644 index b4def1a66..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye3.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:purple_dye" - }, - { - "amount": 1, - "item" : "minecraft:pink_dye" - }], - - "item_outputs": { - "item": "minecraft:magenta_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json deleted file mode 100644 index ff12c6b75..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye4.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:blue_dye" - }, - { - "amount": 2, - "item" : "minecraft:red_dye" - }, - { - "amount": 1, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:magenta_dye", - "amount": 4 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json deleted file mode 100644 index c85c7fd9f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/magenta_dye5.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:blue_dye" - }, - { - "amount": 1, - "item" : "minecraft:red_dye" - }, - { - "amount": 1, - "item" : "minecraft:pink_dye" - }], - - "item_outputs": { - "item": "minecraft:magenta_dye", - "amount": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json deleted file mode 100644 index c43a52b75..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:orange_tulip", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:orange_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json deleted file mode 100644 index 7fac6e0e5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/orange_dye2.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:yellow_dye" - }, - { - "amount": 1, - "item" : "minecraft:red_dye" - }], - - "item_outputs": { - "item": "minecraft:orange_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json deleted file mode 100644 index 926339f37..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:peony", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:pink_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json deleted file mode 100644 index 2afbd6262..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:pink_tulip", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:pink_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json deleted file mode 100644 index 45675fb89..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/pink_dye3.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:red_dye" - }, - { - "amount": 1, - "item" : "minecraft:white_dye" - }], - - "item_outputs": { - "item": "minecraft:pink_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json deleted file mode 100644 index 4eef84cff..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/purple_dye.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [{ - "amount": 1, - "item" : "minecraft:red_dye" - }, - { - "amount": 1, - "item" : "minecraft:blue_dye" - }], - - "item_outputs": { - "item": "minecraft:purple_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json deleted file mode 100644 index a5673c235..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:beetroot", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:red_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json deleted file mode 100644 index 65e731165..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:poppy", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:red_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json deleted file mode 100644 index d4b0bd58c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye3.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:rose_bush", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:red_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json deleted file mode 100644 index 07efaed08..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/red_dye4.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:red_tulip", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:red_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json deleted file mode 100644 index 935ed163c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:bone_meal", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:white_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json deleted file mode 100644 index fdc7d7fc3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/white_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:lily_of_the_valley", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:white_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json deleted file mode 100644 index f7499879a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:sunflower", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:yellow_dye", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json deleted file mode 100644 index 479b18a28..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/dye/yellow_dye2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:macerator", - "eu": 2, - "duration": 100, - "item_inputs": { - "item" : "minecraft:dandelion", - "amount": 1 - }, - "item_outputs": { - "item": "minecraft:yellow_dye", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json deleted file mode 100644 index 183a53986..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/endstone.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 8, - "duration": 200, - "item_inputs": { - "item": "minecraft:end_stone", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "modern_industrialization:heavy_water", - "amount": 1 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:end_stone", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json deleted file mode 100644 index e9bd997ae..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/fermented_spider_eye.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:spider_eye", - "amount": 1 - }, - { - "item": "minecraft:brown_mushroom", - "amount": 1 - }, - { - "item": "minecraft:sugar", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:fermented_spider_eye", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json deleted file mode 100644 index 5e5d5f448..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/granite.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:granite", - "amount": 1 - }, - "fluid_inputs": [ - { - "fluid": "minecraft:water", - "amount": 1, - "probability" : 0 - }, - { - "fluid": "minecraft:lava", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": { - "item": "minecraft:granite", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json deleted file mode 100644 index 650e25f7c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/lava.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 32, - "duration": 1250, - "item_inputs": { - "item": "minecraft:stone", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:lava", - "amount": 1000, - "probability": 0 - }, - "fluid_outputs": { - "fluid": "minecraft:lava", - "amount": 50 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json deleted file mode 100644 index 49f01e466..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/mud.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:dirt", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:mud", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json deleted file mode 100644 index b646f2291..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/netherite.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 16, - "duration": 200, - "item_inputs": [ - { - "item": "minecraft:netherite_scrap", - "amount": 4 - }, - { - "item": "minecraft:gold_ingot", - "amount": 4 - } - ], - "item_outputs": { - "item": "minecraft:netherite_ingot", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json deleted file mode 100644 index d4d092fd3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/paper.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "modern_industrialization:wood_pulp", - "amount": 1 - }, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 100 - }, - "item_outputs": { - "item": "minecraft:paper", - "amount": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json deleted file mode 100644 index 87b70fa31..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/red_sand.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": - [ - { - "item": "minecraft:redstone", - "amount": 1 - }, - { - "item": "minecraft:sand", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:red_sand", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json deleted file mode 100644 index 2262dc303..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/mixer/tnt.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:mixer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "tag": "minecraft:sand", - "amount": 4 - }, - { - "item": "minecraft:gunpowder", - "amount": 5 - } - ], - "item_outputs": [ - { - "item": "minecraft:tnt", - "amount": 2 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json deleted file mode 100644 index 72f14ab82..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/activator_rail.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:rail", - "amount": 4 - }, - { - "item": "minecraft:redstone_torch", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:activator_rail", - "amount": 4 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json deleted file mode 100644 index 5cd1502b0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/amethyst_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:amethyst_shard", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:amethyst_block", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json deleted file mode 100644 index b1e2967f5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/blue_ice.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:packed_ice", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:blue_ice", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json deleted file mode 100644 index 9b7db1eca..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bone_block.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:bone_meal", - "amount": 9 - }, - "item_outputs": { - "item": "minecraft:bone_block", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json deleted file mode 100644 index ea87cbf81..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bricks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:brick", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:bricks", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json deleted file mode 100644 index 9baeaba2a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/bucket.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "modern_industrialization:steel_curved_plate", - "amount": 3 - } - ], - "item_outputs": [ - { - "item": "minecraft:bucket", - "amount": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json deleted file mode 100644 index d8ebffaf4..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/candle.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:string", - "amount": 1 - }, - { - "item": "modern_industrialization:wax", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:candle", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json deleted file mode 100644 index edaf98cb0..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chains.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "modern_industrialization:steel_ring", - "amount": 3 - }, - "item_outputs": { - "item": "minecraft:chain", - "amount": 6 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json deleted file mode 100644 index 44ed3a84c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/chest_minecart.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:chest", - "amount": 1 - }, - { - "item": "minecraft:minecart", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:chest_minecart", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json deleted file mode 100644 index 0fb1352c3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/detector_rail.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:rail", - "amount": 4 - }, - { - "item": "minecraft:stone_pressure_plate", - "amount": 1 - }, - { - "item": "minecraft:redstone", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:detector_rail", - "amount": 4 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json deleted file mode 100644 index 4f81b2e45..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dried_kelp.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:dried_kelp", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:dried_kelp_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json deleted file mode 100644 index a99a66b56..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/dripstone.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:pointed_dripstone", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:dripstone_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json deleted file mode 100644 index 54386eaba..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "tag": "minecraft:stone_crafting_materials", - "amount": 8 - } - ], - "item_outputs": [ - { - "item": "minecraft:furnace", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json deleted file mode 100644 index 3555cc736..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/furnace_minecart.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:furnace", - "amount": 1 - }, - { - "item": "minecraft:minecart", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:furnace_minecart", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json deleted file mode 100644 index 8da7d60da..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glistering_melon_slice.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:gold_nugget", - "amount": 4 - }, - { - "item": "minecraft:melon_slice", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:glistering_melon_slice", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json deleted file mode 100644 index b298de49e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/glowstone_block.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": { - "item": "minecraft:glowstone_dust", - "amount": 4 - }, - "item_outputs": { - "item": "minecraft:glowstone", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json deleted file mode 100644 index a46c48538..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/golden_carrot.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:gold_nugget", - "amount": 4 - }, - { - "item": "minecraft:carrot", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:golden_carrot", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json deleted file mode 100644 index 9cd2794f5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hayblock.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:wheat", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:hay_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json deleted file mode 100644 index da522fb6e..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/honeycomb.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:honeycomb", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:honeycomb_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json deleted file mode 100644 index 649e6f3d6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/hopper_minecart.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:hopper", - "amount": 1 - }, - { - "item": "minecraft:minecart", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:hopper_minecart", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json deleted file mode 100644 index c051f8e8f..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:magma_cream", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:magma_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json deleted file mode 100644 index a01214fd6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/magma_cream.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:blaze_powder", - "amount": 1 - }, - { - "item": "minecraft:slime_ball", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:magma_cream", - "amount": 2 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json deleted file mode 100644 index 5f99e95a3..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/melon.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:melon_slice", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:melon", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json deleted file mode 100644 index dbb202e6b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/minecart.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "modern_industrialization:steel_large_plate", - "amount": 1 - }, - { - "item": "minecraft:rail", - "amount": 1 - } - ], - "item_outputs": [ - { - "item": "minecraft:minecart", - "amount": 1 - } - ] -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json deleted file mode 100644 index 42160fbf5..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/mud_bricks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:packed_mud", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:mud_bricks", - "amount": 4 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json deleted file mode 100644 index 9e26295e6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_bricks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:nether_brick", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:nether_bricks", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json deleted file mode 100644 index 9ad2c1bc1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/nether_warts.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:nether_wart", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:nether_wart_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json deleted file mode 100644 index 9b405955b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/netherite.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 200, - "item_inputs": [ - { - "item": "minecraft:netherite_ingot", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:netherite_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json deleted file mode 100644 index ccaebd445..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/packed_ice.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:ice", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:packed_ice", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json deleted file mode 100644 index 0c14923e6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:prismarine_shard", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:prismarine", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json deleted file mode 100644 index c8b1b56b7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/prismarine_bricks.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:prismarine_shard", - "amount": 9 - }, - { - "item" : "modern_industrialization:packer_block_template", - "amount": 1, - "probability" : 0 - } - ], - "item_outputs": [ - { - "item": "minecraft:prismarine_bricks", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json deleted file mode 100644 index 034d6c28b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/purpur.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:popped_chorus_fruit", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:purpur_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json deleted file mode 100644 index c4f6cfc27..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/quartz_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:quartz", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:quartz_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json deleted file mode 100644 index 11ccf352c..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/red_sandstone.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:red_sand", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:red_sandstone", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json deleted file mode 100644 index 760bd6709..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/sandstone.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:sand", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:sandstone", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json deleted file mode 100644 index bcbb667e7..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/slimeblock.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:slime_ball", - "amount": 9 - } - ], - "item_outputs": [ - { - "item": "minecraft:slime_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json deleted file mode 100644 index 8f9e4e85b..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/snowblock.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:snowball", - "amount": 4 - } - ], - "item_outputs": [ - { - "item": "minecraft:snow_block", - "amount": 1 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json deleted file mode 100644 index fcccf8c84..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/packer/tnt_minecart.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "modern_industrialization:packer", - "eu": 2, - "duration": 100, - "item_inputs": [ - { - "item": "minecraft:tnt", - "amount": 1 - }, - { - "item": "minecraft:minecart", - "amount": 1 - } - ], - "item_outputs": { - "item": "minecraft:tnt_minecart", - "amount": 1 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json deleted file mode 100644 index ccdec6931..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steam_bucket.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "neoforge:conditions": [ - { - "type": "neoforge:not", - "value": { - "type": "neoforge:mod_loaded", - "modid": "dehydration" - } - } - ], - "type":"minecraft:smelting", - "cookingtime":500, - "experience":0, - "ingredient":{ - "item":"minecraft:water_bucket" - }, - "result": { - "id": "modern_industrialization:steam_bucket" - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_anvil_asbl.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_anvil_asbl.json deleted file mode 100644 index 20985272d..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_anvil_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "III", - " i ", - "iii" - ], - "key": { - "I": { - "item": "modern_industrialization:steel_block" - }, - "i": { - "item": "modern_industrialization:steel_ingot" - } - }, - "result": { - "id": "minecraft:anvil", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer_asbl.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer_asbl.json deleted file mode 100644 index e55f86e3a..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_forge_hammer_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "___", - " i ", - "iii" - ], - "key": { - "_": { - "tag": "c:plates/steel" - }, - "i": { - "tag": "c:ingots/steel" - } - }, - "result": { - "id": "modern_industrialization:forge_hammer", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_hopper_asbl.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_hopper_asbl.json deleted file mode 100644 index f9cc7ad50..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/steel_hopper_asbl.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "p p", - "pcp", - " p " - ], - "key": { - "c": { - "item": "minecraft:chest" - }, - "p": { - "tag": "c:plates/steel" - } - }, - "result": { - "id": "minecraft:hopper", - "count": 2 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/torch.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/torch.json deleted file mode 100644 index 30705f3a6..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/torch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "C", - "s" - ], - "key": { - "C": { - "item": "modern_industrialization:coke" - }, - "s": { - "item": "minecraft:stick" - } - }, - "result": { - "id": "minecraft:torch", - "count": 8 - } -} diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json deleted file mode 100644 index 89c8639d1..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/ice.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:vacuum_freezer", - "eu": 16, - "duration": 200, - "fluid_inputs": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:ice", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json b/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json deleted file mode 100644 index 892aadbdc..000000000 --- a/src/main/resources/data/modern_industrialization/recipe/vanilla_recipes/vacuum_freezer/obsidian.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "modern_industrialization:vacuum_freezer", - "eu": 2, - "duration": 2400, - "fluid_inputs": { - "fluid": "minecraft:lava", - "amount": 1000 - }, - "item_outputs": { - "item": "minecraft:obsidian", - "amount": 1 - } -} \ No newline at end of file diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml index 9a9fee608..23a7dc056 100644 --- a/src/main/templates/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -22,13 +22,6 @@ versionRange="${neo_version_range}" ordering="NONE" side="BOTH" -[[dependencies.modern_industrialization]] -modId="grandpower" -type="required" -versionRange="${grandpower_version_range}" -ordering="NONE" -side="BOTH" - [[dependencies.modern_industrialization]] modId="guideme" type="required" diff --git a/src/main/java/aztech/modern_industrialization/compat/almostunified/AlmostUnifiedFacadeImpl.java b/src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/AlmostUnifiedFacadeImpl.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/almostunified/AlmostUnifiedFacadeImpl.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/AlmostUnifiedFacadeImpl.java diff --git a/src/main/java/aztech/modern_industrialization/compat/almostunified/MIAlmostUnifiedPlugin.java b/src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/MIAlmostUnifiedPlugin.java similarity index 95% rename from src/main/java/aztech/modern_industrialization/compat/almostunified/MIAlmostUnifiedPlugin.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/MIAlmostUnifiedPlugin.java index 7a373fce2..2bb858d7a 100644 --- a/src/main/java/aztech/modern_industrialization/compat/almostunified/MIAlmostUnifiedPlugin.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/MIAlmostUnifiedPlugin.java @@ -28,12 +28,12 @@ import com.almostreliable.unified.api.plugin.AlmostUnifiedNeoPlugin; import com.almostreliable.unified.api.plugin.AlmostUnifiedPlugin; import com.almostreliable.unified.api.unification.recipe.RecipeUnifierRegistry; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; @AlmostUnifiedNeoPlugin public class MIAlmostUnifiedPlugin implements AlmostUnifiedPlugin { @Override - public ResourceLocation getPluginId() { + public Identifier getPluginId() { return MI.id("almost_unified"); } diff --git a/src/main/java/aztech/modern_industrialization/compat/almostunified/MIRecipeUnifier.java b/src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/MIRecipeUnifier.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/almostunified/MIRecipeUnifier.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/MIRecipeUnifier.java diff --git a/src/main/java/aztech/modern_industrialization/compat/almostunified/package-info.java b/src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/package-info.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/almostunified/package-info.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/almostunified/package-info.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/LoadedKubeJSProxy.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/LoadedKubeJSProxy.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/LoadedKubeJSProxy.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/LoadedKubeJSProxy.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/MIKubeJSPlugin.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/MIKubeJSPlugin.java similarity index 96% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/MIKubeJSPlugin.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/MIKubeJSPlugin.java index d8f10b036..043ed3088 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/MIKubeJSPlugin.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/MIKubeJSPlugin.java @@ -40,7 +40,7 @@ import dev.latvian.mods.kubejs.recipe.schema.RecipeFactoryRegistry; import dev.latvian.mods.kubejs.recipe.schema.RecipeSchemaRegistry; import java.util.Map; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MIKubeJSPlugin implements KubeJSPlugin { @Override @@ -82,7 +82,7 @@ public void registerRecipeComponents(RecipeComponentTypeRegistry registry) { } @Override - public void beforeRecipeLoading(RecipesKubeEvent event, RecipeManagerKJS manager, Map recipeJsons) { + public void beforeRecipeLoading(RecipesKubeEvent event, RecipeManagerKJS manager, Map recipeJsons) { CustomProcessCondition.onReload(); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/AddEbfTiersEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/AddEbfTiersEventJS.java similarity index 92% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/AddEbfTiersEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/AddEbfTiersEventJS.java index 2a57053cf..7b86bd15f 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/AddEbfTiersEventJS.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/AddEbfTiersEventJS.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.machines.blockentities.multiblocks.ElectricBlastFurnaceBlockEntity; import dev.latvian.mods.kubejs.event.KubeEvent; import java.util.function.Consumer; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class AddEbfTiersEventJS implements KubeEvent { private final Consumer tierConsumer; @@ -36,7 +36,7 @@ public AddEbfTiersEventJS(Consumer tierCon this.tierConsumer = tierConsumer; } - public void add(ResourceLocation coilBlockId, long maxBaseEu, String englishName) { + public void add(Identifier coilBlockId, long maxBaseEu, String englishName) { tierConsumer.accept(new ElectricBlastFurnaceBlockEntity.Tier(coilBlockId, maxBaseEu, englishName)); } } diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/AddMultiblockSlotsEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/AddMultiblockSlotsEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/AddMultiblockSlotsEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/AddMultiblockSlotsEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/ExtraMachineConfig.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/ExtraMachineConfig.java similarity index 96% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/ExtraMachineConfig.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/ExtraMachineConfig.java index a0ac1d680..7a6a2442a 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/ExtraMachineConfig.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/ExtraMachineConfig.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.GsonHelper; public class ExtraMachineConfig { @@ -73,7 +73,7 @@ private static List parseOverclockFromObject(JsonOb var multiplier = GsonHelper.getAsDouble(parameters, "multiplier"); var ticks = GsonHelper.getAsInt(parameters, "ticks"); - catalysts.add(new OverclockComponent.Catalyst(multiplier, ResourceLocation.parse(catalystName), ticks)); + catalysts.add(new OverclockComponent.Catalyst(multiplier, Identifier.parse(catalystName), ticks)); } return catalysts; diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/MIMachineKubeJSEvents.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/MIMachineKubeJSEvents.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/MIMachineKubeJSEvents.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/MIMachineKubeJSEvents.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java similarity index 95% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java index 8cb080486..8f825a115 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterCasingsEventJS.java @@ -29,7 +29,7 @@ import dev.latvian.mods.kubejs.event.KubeEvent; import java.util.Objects; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +51,7 @@ public void registerNamed(String name, String englishName) { MachineCasings.create(MI.id(name), englishName); } - public void registerBlockImitation(String name, ResourceLocation block) { + public void registerBlockImitation(String name, Identifier block) { Objects.requireNonNull(block, "block may not be null"); if (name.contains(":")) { throw new IllegalArgumentException("Casing name cannot contain ':'."); diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterHatchesEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterHatchesEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterHatchesEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterHatchesEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java similarity index 98% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java index f10df6916..cbc621df3 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterMachinesEventJS.java @@ -51,7 +51,7 @@ import java.util.function.Consumer; import java.util.function.Function; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.level.material.Fluid; @@ -322,12 +322,12 @@ public FluidItemConsumerBuilder furnaceFuels() { return this; } - public FluidItemConsumerBuilder fluid(ResourceLocation fluidId, long euPerMb) { + public FluidItemConsumerBuilder fluid(Identifier fluidId, long euPerMb) { fluidEuProductionMapBuilder.add(fluidId, euPerMb); return this; } - public FluidItemConsumerBuilder item(ResourceLocation itemId, long euPerItem) { + public FluidItemConsumerBuilder item(Identifier itemId, long euPerItem) { itemEuProductionMapBuilder.add(itemId, euPerItem); return this; } diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterRecipeTypesEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterRecipeTypesEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterRecipeTypesEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/RegisterRecipeTypesEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/ShapeTemplateHelper.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/ShapeTemplateHelper.java similarity index 95% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/ShapeTemplateHelper.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/ShapeTemplateHelper.java index e2fec00c1..f623f5025 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/ShapeTemplateHelper.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/ShapeTemplateHelper.java @@ -29,7 +29,7 @@ import aztech.modern_industrialization.machines.multiblocks.HatchTypes; import aztech.modern_industrialization.machines.multiblocks.ShapeTemplate; import aztech.modern_industrialization.machines.multiblocks.SimpleMember; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public interface ShapeTemplateHelper { default ShapeTemplate.LayeredBuilder layeredShape(String hatchCasing, String[][] layers) { @@ -41,7 +41,7 @@ default ShapeTemplate.Builder startShape(String hatchCasing) { } default SimpleMember memberOfBlock(String blockId) { - return SimpleMember.forBlockId(ResourceLocation.parse(blockId)); + return SimpleMember.forBlockId(Identifier.parse(blockId)); } default HatchFlags noHatch() { diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/machine/package-info.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/package-info.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/machine/package-info.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/machine/package-info.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/AddMaterialsEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/AddMaterialsEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/material/AddMaterialsEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/AddMaterialsEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/MIMaterialKubeJSEvents.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/MIMaterialKubeJSEvents.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/material/MIMaterialKubeJSEvents.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/MIMaterialKubeJSEvents.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java similarity index 98% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java index 9cf489d27..05e328f7c 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/MaterialBuilderJSWrapper.java @@ -39,7 +39,7 @@ import aztech.modern_industrialization.nuclear.IsotopeFuelParams; import aztech.modern_industrialization.nuclear.NuclearConstant; import com.google.gson.JsonObject; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; public class MaterialBuilderJSWrapper { protected MaterialBuilder materialBuilder; @@ -145,7 +145,7 @@ public MaterialBuilderJSWrapper specialCasing(String englishName, String path, f return this; } - public MaterialBuilderJSWrapper ore(JsonObject json, ResourceLocation stoneType) { + public MaterialBuilderJSWrapper ore(JsonObject json, Identifier stoneType) { materialBuilder.addParts(creator.orePart(json, stoneType)); return this; } diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/ModifyMaterialEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/ModifyMaterialEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/material/ModifyMaterialEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/ModifyMaterialEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java similarity index 96% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java index a9325310f..7c1b7df00 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/PartJsonCreator.java @@ -35,7 +35,7 @@ import aztech.modern_industrialization.nuclear.NuclearConstant; import com.google.gson.JsonObject; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.BiomeTags; import net.minecraft.tags.TagKey; import net.minecraft.util.valueproviders.UniformInt; @@ -111,7 +111,7 @@ public PartTemplate specialCasing(String englishName, String path, float resista return MIParts.MACHINE_CASING_SPECIAL.of(englishName, path, resistance); } - public PartTemplate orePart(JsonObject json, ResourceLocation stoneType) { + public PartTemplate orePart(JsonObject json, Identifier stoneType) { OrePart act = new OrePart(stoneType); int minXp = json.has("min_xp") ? json.get("min_xp").getAsInt() : 0; @@ -126,7 +126,7 @@ public PartTemplate orePart(JsonObject json, ResourceLocation stoneType) { if (generate) { TagKey biomeTag; if (json.has("biome_tag")) { - biomeTag = TagKey.create(Registries.BIOME, ResourceLocation.parse(json.get("biome_tag").getAsString())); + biomeTag = TagKey.create(Registries.BIOME, Identifier.parse(json.get("biome_tag").getAsString())); } else { biomeTag = BiomeTags.IS_OVERWORLD; } diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/material/package-info.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/package-info.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/material/package-info.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/material/package-info.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/package-info.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/package-info.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/package-info.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/package-info.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/CustomConditionEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/CustomConditionEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/CustomConditionEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/CustomConditionEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidInputComponent.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidInputComponent.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidInputComponent.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidInputComponent.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidOutputComponent.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidOutputComponent.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidOutputComponent.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/FluidOutputComponent.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemInputComponent.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemInputComponent.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemInputComponent.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemInputComponent.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemOutputComponent.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemOutputComponent.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemOutputComponent.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ItemOutputComponent.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MIRecipeKubeJSEvents.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MIRecipeKubeJSEvents.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MIRecipeKubeJSEvents.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MIRecipeKubeJSEvents.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineKubeRecipe.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineKubeRecipe.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineKubeRecipe.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineKubeRecipe.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineProcessConditionComponent.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineProcessConditionComponent.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineProcessConditionComponent.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineProcessConditionComponent.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineRecipeSchema.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineRecipeSchema.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineRecipeSchema.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/MachineRecipeSchema.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java similarity index 92% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java index bf9856b8a..4f07c7c3d 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/ProcessConditionHelper.java @@ -35,14 +35,14 @@ import java.util.Map; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; public interface ProcessConditionHelper { ProcessConditionHelper processCondition(MachineProcessCondition condition); - default ProcessConditionHelper dimension(ResourceLocation dimension) { + default ProcessConditionHelper dimension(Identifier dimension) { return processCondition(new DimensionProcessCondition(ResourceKey.create(Registries.DIMENSION, dimension))); } @@ -50,11 +50,11 @@ default ProcessConditionHelper adjacentBlock(Block block, String relativePositio return processCondition(new AdjacentBlockProcessCondition(block, relativePosition)); } - default ProcessConditionHelper biome(ResourceLocation biome) { + default ProcessConditionHelper biome(Identifier biome) { return processCondition(new BiomeProcessCondition(Either.left(ResourceKey.create(Registries.BIOME, biome)))); } - default ProcessConditionHelper biomeTag(ResourceLocation tag) { + default ProcessConditionHelper biomeTag(Identifier tag) { return processCondition(new BiomeProcessCondition(Either.right(TagKey.create(Registries.BIOME, tag)))); } @@ -75,7 +75,7 @@ default ProcessConditionHelper registeredCondition(JsonElement condition) { Map.Entry entry = obj.entrySet().iterator().next(); String idString = entry.getKey(); - ResourceLocation id = ResourceLocation.tryParse(idString); + Identifier id = Identifier.tryParse(idString); if (id == null) { throw new IllegalArgumentException( String.format("'%s' is not registered at MachineProcessConditions. Perhaps you meant to use a customCondition?", idString)); diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/package-info.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/package-info.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/recipe/package-info.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/recipe/package-info.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/registration/MIRegistrationKubeJSEvents.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/MIRegistrationKubeJSEvents.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/registration/MIRegistrationKubeJSEvents.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/MIRegistrationKubeJSEvents.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterCableTiersEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterCableTiersEventJS.java similarity index 94% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterCableTiersEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterCableTiersEventJS.java index 576e3a423..327b84d52 100644 --- a/src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterCableTiersEventJS.java +++ b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterCableTiersEventJS.java @@ -27,7 +27,7 @@ import aztech.modern_industrialization.api.energy.CableTier; import dev.latvian.mods.kubejs.event.KubeEvent; import dev.latvian.mods.kubejs.typings.Info; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; /** * Event class for registering new cable tiers. @@ -45,7 +45,7 @@ public CableTier get(String name) { @Info(""" Registers a new cable tier. """) - public CableTier register(String name, String shortEnglishName, String longEnglishName, long eu, ResourceLocation itemKey) { + public CableTier register(String name, String shortEnglishName, String longEnglishName, long eu, Identifier itemKey) { CableTier tier = new CableTier(name, shortEnglishName, longEnglishName, eu, itemKey, false); CableTier.addTier(tier); return tier; diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidNeutronInteractionsEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidNeutronInteractionsEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidNeutronInteractionsEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidNeutronInteractionsEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidsEventJS.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidsEventJS.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidsEventJS.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/RegisterFluidsEventJS.java diff --git a/src/main/java/aztech/modern_industrialization/compat/kubejs/registration/package-info.java b/src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/package-info.java similarity index 100% rename from src/main/java/aztech/modern_industrialization/compat/kubejs/registration/package-info.java rename to src/main_disabled/java/aztech/modern_industrialization/compat/kubejs/registration/package-info.java