diff --git a/README.md b/README.md index 593f62cb..777577ff 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,44 @@ ![Mekanism Logo](logo.png) - ![Update Display](updatedisplay.png) +# Repository description for sddsd2332 # + +Here is sddsd2332 for the Minecraft modpacks [Ultimate Technology] modified Mekanism -# sddsd2332 # +If you need this mod, you can fork the repository to build, or go to the actions of the repository to download the latest build -This is an unofficial test version of MEK for sddsd2332, some machines have been modified. - -Because I don’t have time to make it recently, maybe this is the last version +If there is a good proposal, it can be submitted through a PR -If anyone needs it, you can download it +I may not have time to update, maybe this is an update for the last version # Mekanism for Minecraft 1.12 # -Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools, +Mekanism is a Minecraft add-on featuring high-tech machinery that can be used to create powerful tools, armor, and weapons. You can find more detail on the features at the [**Official Website**](http://aidancbrady.com/mekanism/). -Mekanism is an independent tech mod that brings low, mid, and high tier machinery to Minecraft. The -mod doesn't have an actual goal, and you'll understand this when you see all the random content -Mekanism contains, from jetpacks to balloons. However, I can assure you that you'll notice all the +Mekanism is an independent tech mod that brings low, mid, and high tier machinery to Minecraft. The +mod doesn't have an actual goal, and you'll understand this when you see all the random content +Mekanism contains, from jetpacks to balloons. However, I can assure you that you'll notice all the content blend together as you get to know the mod better! -Mekanism uses a tier-based system when organizing several of its core features, including Energy -Cubes and Factories. There are four tiers: basic, the simplest tier, advanced, the second-most basic -tier, elite, the second-most complex tier, and ultimate, the most complex tier. You can upgrade -tiers by placing the component in a crafting grid and surrounding it with the necessary resources +Mekanism uses a tier-based system when organizing several of its core features, including Energy +Cubes and Factories. There are four tiers: basic, the simplest tier, advanced, the second-most basic +tier, elite, the second-most complex tier, and ultimate, the most complex tier. You can upgrade +tiers by placing the component in a crafting grid and surrounding it with the necessary resources for the next upgrade. -By the time you've been using Mekanism for a while, you'll have a near-instructible suit of Obsidian -Armor, be obtaining four ingots for each ore you mine, have the ability to fly wherever you want with +By the time you've been using Mekanism for a while, you'll have a near-instructible suit of Obsidian +Armor, be obtaining four ingots for each ore you mine, have the ability to fly wherever you want with the hydrogen-powered jetpacks, and have a cute robotic friend following you around while you mine. :) # Discord # -Mekanism has a [discord](https://discord.gg/nmSjMGc) where you can come chat with other Mekanism users and the developers. Join us! +Official Mekanism has a[discord](https://discord.gg/nmSjMGc) where you can come chat with other Mekanism users and the developers. Join us! # License # -Mekanism is under the MIT license. You may use it in modpacks, reviews or any other form as long as you abide by the terms below. +Mekanism is under the MIT license. You may use it in modpacks, reviews or any other form as long as you abide by the terms below. Copyright 2017 Aidan C. Brady @@ -50,21 +50,21 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI # Credits # - * aidancbrady - * thommy101 - * thiakil - * pupnewfster - * dizzyd - * unpairedbracket - * CyanideX (artwork) - * Cheapshot (artwork) - * Archadia (artwork) - * micdoodle - * Bluexin - * JaSpr +* aidancbrady +* thommy101 +* thiakil +* pupnewfster +* dizzyd +* unpairedbracket +* CyanideX (artwork) +* Cheapshot (artwork) +* Archadia (artwork) +* micdoodle +* Bluexin +* JaSpr ## YourKit ## -YourKit supports open source projects with innovative and intelligent tools for monitoring and -profiling Java and .NET applications. YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler), +YourKit supports open source projects with innovative and intelligent tools for monitoring and +profiling Java and .NET applications. YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/) and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/). Mekanism uses YourKit for all our profiling needs! diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index ac7c58af..b15f89f3 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -337,21 +337,18 @@ public void registerBlockRenders() { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock), 4, getInventoryMRL("digital_miner")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock), 14, getInventoryMRL("isotopic_centrifuge")); - + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock), 13, getInventoryMRL("personal_chest")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 6, getInventoryMRL("chemical_dissolution_chamber")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 8, getInventoryMRL("chemical_crystallizer")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 9, getInventoryMRL("seismic_vibrator")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), 11, getInventoryMRL("fluid_tank")); - - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 0, getInventoryMRL("quantum_entangloporter")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 1, getInventoryMRL("solar_neutron_activator")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 4, getInventoryMRL("resistive_heater")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 9, getInventoryMRL("personal_chest")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 14, getInventoryMRL("antiprotonic_nucleosynthesizer")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 9, getInventoryMRL("isotopic_centrifuge")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), 13, getInventoryMRL("antiprotonic_nucleosynthesizer")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), 9, getInventoryMRL("security_desk")); @@ -368,7 +365,11 @@ public void registerBlockRenders() { String resource = "mekanism:" + type.getName(); RecipeType recipePointer = null; - if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY|| type == MachineType.ULTIMATE_FACTORY || type == MachineType.CREATIVE_FACTORY) { + if (type == MachineType.BASIC_FACTORY + || type == MachineType.ADVANCED_FACTORY + || type == MachineType.ELITE_FACTORY + || type == MachineType.ULTIMATE_FACTORY + || type == MachineType.CREATIVE_FACTORY) { recipePointer = RecipeType.values()[0]; resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); } diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 0c754d12..bba55d9a 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -72,23 +72,19 @@ enum RecipeType implements IStringSerializable { SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER, MachineFuelType.BASIC, false, Recipe.ENERGIZED_SMELTER), ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER, MachineFuelType.BASIC, false, Recipe.ENRICHMENT_CHAMBER), CRUSHING("Crushing", "crusher", MachineType.CRUSHER, MachineFuelType.BASIC, false, Recipe.CRUSHER), + COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR, MachineFuelType.ADVANCED, false, Recipe.OSMIUM_COMPRESSOR), + COMBINING("Combining", "combiner", MachineType.COMBINER, MachineFuelType.DOUBLE, false, Recipe.COMBINER), + PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.PURIFICATION_CHAMBER), + INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.CHEMICAL_INJECTION_CHAMBER), INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER, MachineFuelType.BASIC, false, Recipe.METALLURGIC_INFUSER), + SAWING("Sawing", "sawmill", MachineType.PRECISION_SAWMILL, MachineFuelType.CHANCE, false, Recipe.PRECISION_SAWMILL), STAMPING("Stamping","stamping",MachineType.STAMPING,MachineFuelType.BASIC, false, Recipe.STAMPING), ROLLING("Rolling","rolling",MachineType.ROLLING,MachineFuelType.BASIC, false, Recipe.ROLLING), BRUSHED ("Brushed","brushed",MachineType.BRUSHED,MachineFuelType.BASIC, false, Recipe.BRUSHED), TURNING("Turning","turning",MachineType.TURNING,MachineFuelType.BASIC, false, Recipe.TURNING), - - COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR, MachineFuelType.ADVANCED, false, Recipe.OSMIUM_COMPRESSOR), - PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.PURIFICATION_CHAMBER), - INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER, MachineFuelType.ADVANCED, true, Recipe.CHEMICAL_INJECTION_CHAMBER), - - COMBINING("Combining", "combiner", MachineType.COMBINER, MachineFuelType.DOUBLE, false, Recipe.COMBINER), AllOY("Alloy","alloy",MachineType.ALLOY,MachineFuelType.DOUBLE,false,Recipe.ALLOY), - - SAWING("Sawing", "sawmill", MachineType.PRECISION_SAWMILL, MachineFuelType.CHANCE, false, Recipe.PRECISION_SAWMILL), EXTRACTOR("Extractor","extractor",MachineType.CELL_EXTRACTOR,MachineFuelType.CHANCE,false, Recipe.CELL_EXTRACTOR), SEPARATOR("Separator","separator",MachineType.CELL_SEPARATOR,MachineFuelType.CHANCE,false, Recipe.CELL_SEPARATOR), - FARM("Farm","farm",MachineType.ORGANIC_FARM,MachineFuelType.FARM,false,Recipe.ORGANIC_FARM); diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 13793aea..ed97e4ad 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -85,14 +85,14 @@ public enum MachineType implements IStringSerializable, IBlockType { BASIC_FACTORY(MachineBlock.MACHINE_BLOCK_1, 5, "Factory", 11, TileEntityFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.BASIC), ADVANCED_FACTORY(MachineBlock.MACHINE_BLOCK_1, 6, "Factory", 11, TileEntityAdvancedFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ADVANCED), ELITE_FACTORY(MachineBlock.MACHINE_BLOCK_1, 7, "Factory", 11, TileEntityEliteFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ELITE), - ULTIMATE_FACTORY(MachineBlock.MACHINE_BLOCK_1,8, "Factory", 11, TileEntityUltimateFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ULTIMATE), - CREATIVE_FACTORY(MachineBlock.MACHINE_BLOCK_1,9,"Factory", 11,TileEntityCreativeFactory::new,true, false, true, Plane.HORIZONTAL, true, FactoryTier.CREATIVE), - METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 10, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser::new, true, true, true, Plane.HORIZONTAL, false), - PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 11, "PurificationChamber", 15, TileEntityPurificationChamber::new, true, false, true, Plane.HORIZONTAL, true), - ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 12, "EnergizedSmelter", 16, TileEntityEnergizedSmelter::new, true, false, true, Plane.HORIZONTAL, true), - TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 13, "Teleporter", 13, TileEntityTeleporter::new, true, false, false, BlockStateUtils.NO_ROTATION, false), - ISOTOPIC_CENTRIFUGE(MachineBlock.MACHINE_BLOCK_1, 14, "IsotopicCentrifuge", 61, TileEntityIsotopicCentrifuge::new, false, true, false, Plane.HORIZONTAL, false), - + METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser::new, true, true, true, Plane.HORIZONTAL, false), + PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, TileEntityPurificationChamber::new, true, false, true, Plane.HORIZONTAL, true), + ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter::new, true, false, true, Plane.HORIZONTAL, true), + TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter::new, true, false, false, BlockStateUtils.NO_ROTATION, false), + ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_1, 12, "ElectricPump", 17, TileEntityElectricPump::new, true, true, false, Plane.HORIZONTAL, false), + PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "PersonalChest", 19, TileEntityPersonalChest::new, true, true, false, Plane.HORIZONTAL, false), + CHARGEPAD(MachineBlock.MACHINE_BLOCK_1,14, "Chargepad", -1, TileEntityChargepad::new, true, true, false, Plane.HORIZONTAL, false), + LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", 59, TileEntityLogisticalSorter::new, false, true, false, BlockStateUtils.ALL_FACINGS, true), ROTARY_CONDENSENTRATOR(MachineBlock.MACHINE_BLOCK_2, 0, "RotaryCondensentrator", 7, TileEntityRotaryCondensentrator::new, true, true, false, Plane.HORIZONTAL, false), CHEMICAL_OXIDIZER(MachineBlock.MACHINE_BLOCK_2, 1, "ChemicalOxidizer", 29, TileEntityChemicalOxidizer::new, true, true, true, Plane.HORIZONTAL, true), @@ -110,7 +110,7 @@ public enum MachineType implements IStringSerializable, IBlockType { LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser::new, true, true, false, BlockStateUtils.ALL_FACINGS, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier::new, false, true, false, BlockStateUtils.ALL_FACINGS, true), LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam::new, false, true, false, BlockStateUtils.ALL_FACINGS, true), - + QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter::new, true, false, false, BlockStateUtils.ALL_FACINGS, false), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator::new, false, true, false, Plane.HORIZONTAL, true), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator::new, true, true, false, Plane.HORIZONTAL, true), @@ -118,16 +118,17 @@ public enum MachineType implements IStringSerializable, IBlockType { RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater::new, true, false, false, Plane.HORIZONTAL, true), FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator::new, true, false, true, Plane.HORIZONTAL, true), FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater::new, false, false, false, Plane.HORIZONTAL, true), - CHARGEPAD(MachineBlock.MACHINE_BLOCK_3,7, "Chargepad", -1, TileEntityChargepad::new, true, true, false, Plane.HORIZONTAL, false), - ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_3, 8, "ElectricPump", 17, TileEntityElectricPump::new, true, true, false, Plane.HORIZONTAL, false), - PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_3, 9, "PersonalChest", 19, TileEntityPersonalChest::new, true, true, false, Plane.HORIZONTAL, false), - LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_3, 10, "LogisticalSorter", 59, TileEntityLogisticalSorter::new, false, true, false, BlockStateUtils.ALL_FACINGS, true), - Nutritional_Liquifier(MachineBlock.MACHINE_BLOCK_3, 11, "NutritionalLiquifier", 60, TileEntityNutritionalLiquifier::new, true, true, true, Plane.HORIZONTAL, true), + ULTIMATE_FACTORY(MachineBlock.MACHINE_BLOCK_3,7, "Factory", 11, TileEntityUltimateFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ULTIMATE), + CREATIVE_FACTORY(MachineBlock.MACHINE_BLOCK_3,8,"Factory", 11,TileEntityCreativeFactory::new,true, false, true, Plane.HORIZONTAL, true, FactoryTier.CREATIVE), + ISOTOPIC_CENTRIFUGE(MachineBlock.MACHINE_BLOCK_3, 9, "IsotopicCentrifuge", 61, TileEntityIsotopicCentrifuge::new, false, true, false, Plane.HORIZONTAL, false), + + + Nutritional_Liquifier(MachineBlock.MACHINE_BLOCK_3, 10, "NutritionalLiquifier", 60, TileEntityNutritionalLiquifier::new, true, true, true, Plane.HORIZONTAL, true), //INDUSTRIAL_ALARM(MachineBlock.MACHINE_BLOCK_3,12,"IndustrialAlarm",-1,TileEntityIndustrialAlarm::new,false,true,false, Plane.HORIZONTAL,true); - SUPERCHARGED_COIL(MachineBlock.MACHINE_BLOCK_3,12,"superchargedcoil",-1, TileEntitySuperchargedCoil::new,false,true,false,BlockStateUtils.ALL_FACINGS,false), - ORGANIC_FARM(MachineBlock.MACHINE_BLOCK_3,13,"organicfarm",63,TileEntityOrganicFarm::new,true,false,true, Plane.HORIZONTAL, true), - ANTIPROTONIC_NUCLEOSYNTHESIZER(MachineBlock.MACHINE_BLOCK_3, 14,"antiprotonicnucleosynthesizer",62, TileEntityAntiprotonicNucleosynthesizer::new, true, true, true, Plane.HORIZONTAL, true), + SUPERCHARGED_COIL(MachineBlock.MACHINE_BLOCK_3,11,"SuperchargedCoil",-1, TileEntitySuperchargedCoil::new,false,true,false,BlockStateUtils.ALL_FACINGS,false), + ORGANIC_FARM(MachineBlock.MACHINE_BLOCK_3,12,"OrganicFarm",63,TileEntityOrganicFarm::new,true,false,true, Plane.HORIZONTAL, true), + ANTIPROTONIC_NUCLEOSYNTHESIZER(MachineBlock.MACHINE_BLOCK_3, 13,"antiprotonicnucleosynthesizer",62, TileEntityAntiprotonicNucleosynthesizer::new, true, true, true, Plane.HORIZONTAL, true), STAMPING(MachineBlock.MACHINE_BLOCK_4,0,"Stamping",64,TileEntityStamping::new,true,false,true, Plane.HORIZONTAL, true), @@ -140,7 +141,6 @@ public enum MachineType implements IStringSerializable, IBlockType { CELL_SEPARATOR(MachineBlock.MACHINE_BLOCK_4,7,"CellSeparator",71,TileEntityCellSeparator::new,true,false,true,Plane.HORIZONTAL, true)/*, BASIC_FACTORY2(MachineBlock.MACHINE_BLOCK_4, 8, "Factory", 11, TileEntityFactory2::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.BASIC), - ADVANCED_FACTORY2(MachineBlock.MACHINE_BLOCK_4, 9, "Factory", 11, TileEntityAdvancedFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ADVANCED), ELITE_FACTORY2(MachineBlock.MACHINE_BLOCK_4, 10, "Factory", 11, TileEntityEliteFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ELITE), ULTIMATE_FACTORY2(MachineBlock.MACHINE_BLOCK_4,11, "Factory", 11, TileEntityUltimateFactory::new, true, false, true, Plane.HORIZONTAL, true, FactoryTier.ULTIMATE), diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 5e68cade..e71b0abe 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -130,9 +130,15 @@ public static ItemStack getTransmitter(TransmitterType type, BaseTier tier, int * @return factory with defined tier and recipe type */ public static ItemStack getFactory(FactoryTier tier, RecipeType type) { - ItemStack itemstack = new ItemStack(MekanismBlocks.MachineBlock, 1, MachineType.BASIC_FACTORY.ordinal() + tier.ordinal()); - ((IFactory) itemstack.getItem()).setRecipeType(type.ordinal(), itemstack); - return itemstack; + if (tier ==FactoryTier.ULTIMATE || tier == FactoryTier.CREATIVE){ + ItemStack itemstack = new ItemStack(MekanismBlocks.MachineBlock3, 1, 4 + tier.ordinal()); + ((IFactory) itemstack.getItem()).setRecipeType(type.ordinal(), itemstack); + return itemstack; + }else { + ItemStack itemstack = new ItemStack(MekanismBlocks.MachineBlock, 1, MachineType.BASIC_FACTORY.ordinal() + tier.ordinal()); + ((IFactory) itemstack.getItem()).setRecipeType(type.ordinal(), itemstack); + return itemstack; + } } /** diff --git a/src/main/resources/assets/mekanism/lang/en_us.lang b/src/main/resources/assets/mekanism/lang/en_us.lang index 7bff1ecb..de3e309c 100644 --- a/src/main/resources/assets/mekanism/lang/en_us.lang +++ b/src/main/resources/assets/mekanism/lang/en_us.lang @@ -52,7 +52,7 @@ item.GaugeDropper.name=Gauge Dropper item.BioFuel.name=Bio Fuel item.CraftingFormula.name=Crafting Formula item.Canteen.name=Canteen - +item.MekTool.name=Meka-Tool # Control Circuits item.BasicControlCircuit.name=Basic Control Circuit item.AdvancedControlCircuit.name=Advanced Control Circuit @@ -104,8 +104,7 @@ tile.BasicBlock.CopperBlock.name=Copper Block tile.BasicBlock.TinBlock.name=Tin Block tile.BasicBlock.ThermalEvaporationController.name=Thermal Evaporation Controller tile.BasicBlock.ThermalEvaporationValve.name=Thermal Evaporation Valve -tile.BasicBlock2.UraniumBlock.name=Uranium Block -tile.BasicBlock2.LeadBlock.name=Lead Block + # Basic Block 2 (second ID iteration) tile.BasicBlock2.ThermalEvaporationBlock.name=Thermal Evaporation Block @@ -124,7 +123,13 @@ tile.BasicBlock2.PressureDisperser.name=Pressure Disperser tile.BasicBlock2.BoilerCasing.name=Boiler Casing tile.BasicBlock2.BoilerValve.name=Boiler Valve tile.BasicBlock2.SecurityDesk.name=Security Desk +tile.BasicBlock2.UraniumBlock.name=Uranium Block +tile.BasicBlock2.LeadBlock.name=Lead Block +tile.BasicBlock3.SpsCasing.name=SPS Casing[WIP] +tile.BasicBlock3.FissionReacherCasing.name=Fission Reactor Casing[WIP] +tile.BasicBlock3.ControlRodAssembly.name=Control Rod Assembly[WIP] +tile.BasicBlock3.FissionFuelAssembly.name=Fission Fuel Assembly[WIP] # Machine Block tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber tile.MachineBlock.OsmiumCompressor.name=Osmium Compressor @@ -140,9 +145,6 @@ tile.MachineBlock.PersonalChest.name=Personal Chest tile.MachineBlock.Chargepad.name=Chargepad tile.MachineBlock.LogisticalSorter.name=Logistical Sorter tile.MachineBlock.DigitalMiner.name=Digital Miner -tile.MachineBlock.IsotopicCentrifuge.name=Isotopic Centrifuge -tile.MachineBlock.NutritionalLiquifier.name=Nutritional Liquifier - # Machine Block 2 (second ID iteration) tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator @@ -157,7 +159,6 @@ tile.MachineBlock2.ChemicalWasher.name=Chemical Washer tile.MachineBlock2.ChemicalCrystallizer.name=Chemical Crystallizer tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber -tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laser Amplifier @@ -170,16 +171,22 @@ tile.MachineBlock3.Oredictionificator.name=Oredictionificator tile.MachineBlock3.ResistiveHeater.name=Resistive Heater tile.MachineBlock3.FormulaicAssemblicator.name=Formulaic Assemblicator tile.MachineBlock3.FuelwoodHeater.name=Fuelwood Heater -tile.MachineBlock3.Chargepad.name=Chargepad -tile.MachineBlock3.ElectricPump.name=Electric Pump -tile.MachineBlock3.LogisticalSorter.name=Logistical Sorter -tile.MachineBlock3.PersonalChest.name=Personal Chest tile.MachineBlock3.NutritionalLiquifier.name=Nutritional Liquifier +tile.MachineBlock3.SuperchargedCoil.name=Supercharged Coil(WIP) +tile.MachineBlock3.AmbientAccumulator.name=Ambient gas collectors +tile.MachineBlock3.IsotopicCentrifuge.name=Isotopic Centrifuge tile.MachineBlock3.OrganicFarm.name=Organic Farm -tile.MachineBlock3.organicfarm.name=Organic Farm tile.MachineBlock3.antiprotonicnucleosynthesizer.name=Antiprotonic Nucleosynthesizer£¨WIP£© -tile.MachineBlock3.AntiprotonicNucleosynthesizer.name=Antiprotonic Nucleosynthesizer£¨WIP£© - +tile.MachineBlock3.Factory.name=Factory + +tile.MachineBlock4.Stamping.name=CNC punching machine +tile.MachineBlock4.Rolling.name=CNC rolling machine +tile.MachineBlock4.Brushed.name=CNC wire drawing machine +tile.MachineBlock4.Turning.name=CNC lathes +tile.MachineBlock4.Alloy.name=Alloy furnace +tile.MachineBlock4.CellCultivate.name=Cell culture machines +tile.MachineBlock4.CellExtractor.name=Cell extractor +tile.MachineBlock4.CellSeparator.name=Cell separator # Plastic tile.PlasticBlock.name=Plastic Block tile.SlickPlasticBlock.name=Slick Plastic Block @@ -261,6 +268,15 @@ item.silverDust.name=Silver Dust item.leadDust.name=Lead Dust item.sulfurDust.name=Sulfur Dust item.lithiumDust.name=Lithium Dust +item.uraniumDust.name=Uranium Dust +item.fluoriteDust.name=Fluorite +item.fluoritedustDust.name=Fluorite Dust +item.charcoaldustDust.name=Charcoal Dust +item.plutoniumpelletDust.name=Plutonium Pellet +item.antimatterpelletDust.name=Antimatter Pellet +item.reprocessedfissilefragmentDust.name=Reprocessed Fissile Fragment +item.yellowcakeuraniumDust.name=Yellow Cake Uranium +item.poloniumpelletDust.name=Polonium Pellet # Clumps item.ironClump.name=Iron Clump @@ -270,7 +286,7 @@ item.copperClump.name=Copper Clump item.tinClump.name=Tin Clump item.silverClump.name=Silver Clump item.leadClump.name=Lead Clump - +item.uraniumClump.name=Uranium Clump # Shards item.ironShard.name=Iron Shard item.goldShard.name=Gold Shard @@ -279,6 +295,7 @@ item.copperShard.name=Copper Shard item.tinShard.name=Tin Shard item.silverShard.name=Silver Shard item.leadShard.name=Lead Shard +item.uraniumShard.name=Uranium Shard # Crystals item.ironCrystal.name=Iron Crystal @@ -288,6 +305,7 @@ item.copperCrystal.name=Copper Crystal item.tinCrystal.name=Tin Crystal item.silverCrystal.name=Silver Crystal item.leadCrystal.name=Lead Crystal +item.uraniumCrystal.name=Uranium Crystal # Dirty Dust item.dirtyIronDust.name=Dirty Iron Dust @@ -297,6 +315,7 @@ item.dirtyCopperDust.name=Dirty Copper Dust item.dirtyTinDust.name=Dirty Tin Dust item.dirtySilverDust.name=Dirty Silver Dust item.dirtyLeadDust.name=Dirty Lead Dust +item.dirtyUraniumDust.name=Dirty Uranium Dust # Ingots item.obsidianIngot.name=Refined Obsidian Ingot @@ -306,6 +325,8 @@ item.glowstoneIngot.name=Glowstone Ingot item.steelIngot.name=Steel Ingot item.copperIngot.name=Copper Ingot item.tinIngot.name=Tin Ingot +item.uraniumIngot.name=Uranium Ingot +item.leadIngot.name=Lead Ingot # Nuggets item.obsidianNugget.name=Refined Obsidian Nugget @@ -315,6 +336,8 @@ item.glowstoneNugget.name=Glowstone Nugget item.steelNugget.name=Steel Nugget item.copperNugget.name=Copper Nugget item.tinNugget.name=Tin Nugget +item.uraniumNugget.name=Ultimate Nugget +item.leadNugget.name=Lead Nugget # Gasses gas.hydrogen=Hydrogen @@ -333,6 +356,20 @@ gas.deuterium=Deuterium gas.tritium=Tritium gas.lithium=Lithium gas.fusionfuel=D-T Fuel +gas.nutritionalpaste=Nutritional Paste +gas.nuclearwaste=Nuclear Wastewater +gas.plutonium=Plutonium +gas.polonium=Polonium +gas.spentnuclearwaste=Spent Nuclear Waste +gas.hydrofluoricacid=Hydrofluoric Acid +gas.antimatter=Antimatter +gas.fissilefule=Fissile Fuel +gas.superheatedsodium=Superheated Sodium +gas.uraniumhexafluoride=Uranium Hexafluoride +gas.uraniumoxide=Uranium Oxide + +gas.nutrientsolution=Nutrient solution +gas.oxygenenrichedwater=Oxygen-rich water gas.iron=Iron Slurry gas.gold=Gold Slurry @@ -342,6 +379,7 @@ gas.tin=Tin Slurry gas.silver=Silver Slurry gas.obsidian=Obsidian Slurry gas.lead=Lead Slurry +gas.uranium=Uranium Slurry gas.cleanIron=Clean Iron Slurry gas.cleanGold=Clean Gold Slurry @@ -374,7 +412,8 @@ fluid.liquiddeuterium=Liquid Deuterium fluid.liquidtritium=Liquid Tritium fluid.liquidfusionfuel=Liquid D-T Fuel fluid.steam=Steam - +fluid.liquidhydrofluoricacid=Liquid Hydrofluric Acid +fluid.liquidsuperheatedsodium=Superheated Sodium # OreGas names oregas.iron=Iron Ore oregas.gold=Gold Ore @@ -384,6 +423,7 @@ oregas.tin=Tin Ore oregas.silver=Silver Ore oregas.obsidian=Obsidian Ore oregas.lead=Lead Ore +oregas.uranium=Uranium Ore # Tier names tier.Basic=Basic @@ -646,6 +686,13 @@ gui.factory.Injecting=Injecting gui.factory.Infusing=Infusing gui.factory.Sawing=Sawing gui.factory.Farm=Farm +gui.factory.Stamping=Stamping +gui.factory.Rolling=Rolling +gui.factory.Brushed=Brushed +gui.factory.Turning=Turning +gui.factory.Alloy=Alloy +gui.factory.Extractor=Extractor +gui.factory.Separator=Separator gui.seismicReader.short=S. Reader gui.seismicReader.solids=Solids @@ -829,6 +876,14 @@ mekanism.tooltip.disassembler.vein=vein mekanism.tooltip.disassembler.extended_vein=extended vein mining mekanism.tooltip.disassembler.off=off +mekanism.tooltip.mektool.normal=normal +mekanism.tooltip.mektool.slow=slow +mekanism.tooltip.mektool.fast=fast +mekanism.tooltip.mektool.very_fast=very fast +mekanism.tooltip.mektool.vein=vein +mekanism.tooltip.mektool.extended_vein=extended +mekanism.tooltip.mektool.off=off + tooltip.configurationCard.got=Retrieved configuration data from %s tooltip.configurationCard.set=Injected configuration data of type %s tooltip.configurationCard.unequal=Unequal configuration data formats @@ -869,6 +924,8 @@ tooltip.PressureDisperser=A block used disperse steam throughout a multiblock st tooltip.BoilerCasing=A pressure-resistant, dense casing used in the creation of a Thermoelectric Boiler multiblock. tooltip.BoilerValve=A valve that can be placed on a Thermoelectric Boiler multiblock, allowing for the insertion of energy and water along with the extraction of produced steam. tooltip.SecurityDesk=A central control hub for managing the security of all your owned machinery. +tooltip.SpsCasing=Reinforced housing capable of resisting the strong chemical and thermal effects of phase shift reactions. +tooltip.FissionReacherCasing=Fission Reactor Casing tooltip.EnrichmentChamber=A simple machine used to enrich ores into two of their dust counterparts, as well as perform many other operations. tooltip.OsmiumCompressor=A fairly advanced machine used to compress osmium into various dusts in order to create their ingot counterparts. @@ -906,6 +963,19 @@ tooltip.ResistiveHeater=A condensed, coiled resistor capable of converting elect tooltip.FormulaicAssemblicator=A machine that uses energy to rapidly craft items and blocks from Crafting Formulas. Doubles as an advanced crafting bench. tooltip.FuelwoodHeater=A machine that is capable of producing large quantities of heat energy by burning combustible items. tooltip.QuantumEntangloporter=A highly-advanced block capable of transmitting any practical resource across long distances and dimensions. +tooltip.canteen1=Only Nutritional Paste can be added +tooltip.canteen2=Why is this item so expensive? +tooltip.NutritionalLiquifier=A machine that processes any food into a harmless, easily digestible nutritional paste +tooltip.IsotopicCentrifuge=A machine with only one purpose: to spin very, very fast what it loads. +tooltip.antiprotonicnucleosynthesizer=A machine that uses a small amount of antimatter and a large amount of energy to convert various resources in an atomic way. +tooltip.superchargedcoil=It is used to power supercritical phase shifter multi-block structure. Must be connected to the supercritical phase shifter port [currently just a decoration] +tooltip.OrganicFarm=A very powerful one-block farm machine +tooltip.AmbientAccumulator=One that can collect the gases contained in the current dimension [Warning! Exit the archive, the internal gas will not be retained] + +tooltip.MekTool1=A very powerful excavating machine +tooltip.MekTool2=When flushed above 25%, the damage is super doubled +tooltip.MekTool3=When it is more than 90%, it may have a flash sale effect? +tooltip.MekTool4=¡ì4???Dangerous tools, warning!??? tooltip.HeatGenerator=A generator that uses the heat of lava or other burnable resources to produce energy. tooltip.SolarGenerator=A generator that uses the power of the sun to produce energy. @@ -946,7 +1016,7 @@ sideData.Fill=Fill sideData.Empty=Empty sideData.Charge=Charge sideData.Discharge=Discharge - +sideData.Input_Extra=Input/Extra # Redstone control control.disabled=Disabled control.high=High diff --git a/src/main/resources/assets/mekanism/lang/zh_cn.lang b/src/main/resources/assets/mekanism/lang/zh_cn.lang index 85622069..ff6fdef2 100644 --- a/src/main/resources/assets/mekanism/lang/zh_cn.lang +++ b/src/main/resources/assets/mekanism/lang/zh_cn.lang @@ -52,7 +52,7 @@ item.GaugeDropper.name=æ»´é‡å™¨ item.BioFuel.name=生物燃料 item.CraftingFormula.name=åˆæˆé…æ–¹ item.Canteen.name=水壶 -item.MekTool.name=§4☢☣✪拓è’者工具✪☣☢ §fã€WIP】 +item.MekTool.name=§4☢☣✪拓è’者工具✪☣☢§fã€WIP】 # Control Circuits item.BasicControlCircuit.name=基础控制电路 item.AdvancedControlCircuit.name=高级控制电路 @@ -139,12 +139,11 @@ tile.MachineBlock.MetallurgicInfuser.name=冶金çŒæ³¨æœº tile.MachineBlock.PurificationChamber.name=净化仓 tile.MachineBlock.EnergizedSmelter.name=充能冶炼炉 tile.MachineBlock.Teleporter.name=ä¼ é€æœº -tile.MachineBlock.DigitalMiner.name=数字型采矿机 -tile.MachineBlock.IsotopicCentrifuge.name=åŒä½ç´ ç¦»å¿ƒæœº +tile.MachineBlock.ElectricPump.name=电动泵 +tile.MachineBlock.PersonalChest.name=ç§äººç®±å­ tile.MachineBlock.Chargepad.name=å……ç”µå° -tile.MachineBlock.NutritionalLiquifier.name=è¥å…»æ¶²åŒ–器 - - +tile.MachineBlock.LogisticalSorter.name=物æµæ•´ç†æœº +tile.MachineBlock.DigitalMiner.name=数字型采矿机 # Machine Block 2 (second ID iteration) tile.MachineBlock2.RotaryCondensentrator.name=回旋å¼æ°”液转æ¢æœº tile.MachineBlock2.ChemicalOxidizer.name=化学氧化机 @@ -170,16 +169,13 @@ tile.MachineBlock3.Oredictionificator.name=矿典转æ¢å™¨ tile.MachineBlock3.ResistiveHeater.name=电阻加热装置 tile.MachineBlock3.FormulaicAssemblicator.name=å…¬å¼è£…é…器 tile.MachineBlock3.FuelwoodHeater.name=木料加热器 -tile.MachineBlock3.Chargepad.name=å……ç”µå° -tile.MachineBlock3.ElectricPump.name=电动泵 -tile.MachineBlock3.LogisticalSorter.name=物æµæ•´ç†æœº -tile.MachineBlock3.PersonalChest.name=ç§äººç®±å­ tile.MachineBlock3.NutritionalLiquifier.name=è¥å…»æ¶²åŒ–器 -tile.MachineBlock3.superchargedcoil.name=增压线圈(WIP) +tile.MachineBlock3.SuperchargedCoil.name=增压线圈(WIP) tile.MachineBlock3.AmbientAccumulator.name=环境气体收集器 +tile.MachineBlock3.IsotopicCentrifuge.name=åŒä½ç´ ç¦»å¿ƒæœº tile.MachineBlock3.OrganicFarm.name=有机农场 -tile.MachineBlock3.organicfarm.name=有机农场 tile.MachineBlock3.antiprotonicnucleosynthesizer.name=åè´¨å­æ ¸åˆæˆå™¨ï¼ˆWIP） +tile.MachineBlock3.Factory.name=工厂 tile.MachineBlock4.Stamping.name=数控冲床 tile.MachineBlock4.Rolling.name=数控轧制机 @@ -220,25 +216,20 @@ tile.Transmitter.BasicPressurizedTube.name=åŸºç¡€åŠ åŽ‹ç®¡é“ tile.Transmitter.AdvancedPressurizedTube.name=é«˜çº§åŠ åŽ‹ç®¡é“ tile.Transmitter.ElitePressurizedTube.name=ç²¾è‹±åŠ åŽ‹ç®¡é“ tile.Transmitter.UltimatePressurizedTube.name=终æžåŠ åŽ‹ç®¡é“ - tile.Transmitter.BasicUniversalCable.name=基础通用线缆 tile.Transmitter.AdvancedUniversalCable.name=高级通用线缆 tile.Transmitter.EliteUniversalCable.name=精英通用线缆 tile.Transmitter.UltimateUniversalCable.name=终æžé€šç”¨çº¿ç¼† - tile.Transmitter.BasicMechanicalPipe.name=åŸºç¡€æœºæ¢°ç®¡é“ tile.Transmitter.AdvancedMechanicalPipe.name=é«˜çº§æœºæ¢°ç®¡é“ tile.Transmitter.EliteMechanicalPipe.name=ç²¾è‹±æœºæ¢°ç®¡é“ tile.Transmitter.UltimateMechanicalPipe.name=终æžæœºæ¢°ç®¡é“ - tile.Transmitter.BasicLogisticalTransporter.name=基础物æµç®¡é“ tile.Transmitter.AdvancedLogisticalTransporter.name=高级物æµç®¡é“ tile.Transmitter.EliteLogisticalTransporter.name=精英物æµç®¡é“ tile.Transmitter.UltimateLogisticalTransporter.name=终æžç‰©æµç®¡é“ - tile.Transmitter.RestrictiveTransporter.name=é™åˆ¶ä¼ é€ç®¡é“ tile.Transmitter.DiversionTransporter.name=转移传é€ç®¡é“ - tile.Transmitter.BasicThermodynamicConductor.name=基础热导线缆 tile.Transmitter.AdvancedThermodynamicConductor.name=高级热导线缆 tile.Transmitter.EliteThermodynamicConductor.name=精英热导线缆 @@ -364,8 +355,8 @@ gas.deuterium=æ°˜ gas.tritium=æ°š gas.lithium=锂 gas.fusionfuel=D-T燃料 -gas.nutritionalpaste=è¥å…»ç³Šç³Š -gas.nuclearwaste=核废料 +gas.nutritionalpaste=è¥å…»ç³Šå‰‚ +gas.nuclearwaste=核废水 gas.plutonium=é’š gas.polonium=é’‹ gas.spentnuclearwaste=用尽的核废料 @@ -475,6 +466,7 @@ null.name=无效物å“/æ–¹å—（放置会导致关闭游æˆï¼ï¼‰ # Key description text mekanism.key.mode=模å¼åˆ‡æ¢ mekanism.key.armorMode=装甲模å¼åˆ‡æ¢ +mekanism.key.feetMode=é´å­æ¨¡å¼å¼€å…³ mekanism.key.voice=声音 # Entities @@ -484,14 +476,18 @@ entity.BabySkeleton.name=骷髅射手å®å® # Config Gui mekanism.configgui.ctgy.general=通用机械常规设定 mekanism.configgui.ctgy.machines=机器设定 +mekanism.configgui.ctgy.tier=层设定 mekanism.configgui.ctgy.usage=能耗设定 mekanism.configgui.ctgy.client=客户端设定 +mekanism.configgui.ctgy.storage=机器能é‡å­˜å‚¨è®¾ç½® # Config Tooltips mekanism.configgui.ctgy.general.tooltip=通用机械åŠå…¶ä¸‹æ‰€æœ‰æ¨¡å—的常规设定 mekanism.configgui.ctgy.machines.tooltip=是å¦å¯ç”¨ç‰¹å®šæœºå™¨çš„设定 +mekanism.configgui.ctgy.tier.tooltip=有关 通用机械 机器层层åŠå…¶ç›¸åº”值的设置 mekanism.configgui.ctgy.usage.tooltip=有关机械以åŠèƒ½è€—的设定 mekanism.configgui.ctgy.client.tooltip=通用机械åŠå…¶ä¸‹æ‰€æœ‰æ¨¡å—在客户端的特殊设定 +mekanism.configgui.ctgy.storage.tooltip=有关机械åŠå…¶æœ€å¤§å‚¨èƒ½çš„设置 # Gui text gui.condensentrating=å‡èšæ¶²ä½“中... @@ -554,7 +550,7 @@ gui.inductionMatrix=输导矩阵 gui.matrixStats=矩阵统计 gui.turbineStats=æ¶¡è½®æ•°æ® gui.boilerStats=é”…ç‚‰æ•°æ® -gui.main=Main +gui.main=主页 gui.outputting=输出 gui.receiving=输入 gui.dimensions=世界 @@ -566,6 +562,7 @@ gui.dynamicTank=动æ€å‚¨ç½ gui.industrialTurbine=工业涡轮 gui.thermoelectricBoiler=热力锅炉 gui.visuals=外观 +mekanism.gui.visuals.toobig=åŠå¾„太大，无法显示视觉对象 gui.noEject=无法输出 gui.undefined=未定义 gui.owner=所有者 @@ -579,7 +576,8 @@ gui.index=列表 gui.producing=产出 gui.maxOutput=最大输出 gui.storing=å­˜é‡ -gui.skyBlocked=Sky blocked +gui.skyBlocked=天空被阻挡 +gui.noWind=无风 gui.using=消耗 gui.needed=éœ€è¦ mekanism.gui.bufferfree=空闲能é‡ç¼“冲 @@ -647,6 +645,10 @@ gui.entityDetection=实体检测 gui.energyContents=能é‡å«é‡ gui.redstoneOutput=红石输出 gui.maxWaterOutput=最大水输出 +gui.stockControl=库存控制 +gui.allowDefault=å…许默认值 +gui.sizeMode=大å°æ¨¡å¼ +mekanism.gui.sizeModeConflict=当å‰æ²¡æœ‰æ•ˆæžœï¼Œå› ä¸ºå•é¡¹æ¨¡å¼å·²æ‰“开。 gui.reactor.injectionRate=输入速率 @@ -744,7 +746,11 @@ gui.password=å¯†ç  mekanism.gui.logisticalSorter.default=默认 mekanism.gui.logisticalSorter.autoEject=自动 +mekanism.gui.logisticalSorter.autoEject.tooltip=自动将物料弹出到连接的库存。 mekanism.gui.logisticalSorter.roundRobin=å¾ªçŽ¯æ¨¡å¼ +mekanism.gui.logisticalSorter.roundRobin.tooltip=å‘é€ç‰©æ–™æ—¶åœ¨æ‰€æœ‰è¿žæŽ¥çš„库存之间循环。 +mekanism.gui.logisticalSorter.singleItem=å•ä¸ª +mekanism.gui.logisticalSorter.singleItem.tooltip=æ¯æ¬¡å‘é€å•ä¸ªé¡¹ç›®è€Œä¸æ˜¯æ•´ä¸ªå †æ ˆï¼ˆè¦†ç›– ItemStack 筛选器中设置的最å°å€¼å’Œæœ€å¤§å€¼ï¼‰ã€‚ gui.teleporter.notReady=未准备 gui.teleporter.ready=已准备 @@ -790,6 +796,8 @@ tooltip.configurator.rotate=旋转 tooltip.configurator.wrench=扳手 tooltip.configurator.pumpReset=é‡ç½®ç”µåŠ›æ³µè®¡æ•° tooltip.configurator.toggleDiverter=分æµæ¨¡å¼æ›´æ”¹ä¸º +tooltip.configurator.toggleMode=%s 行为被撞到 +tooltip.configurator.viewMode=å½“å‰ %s 行为 tooltip.configurator.noLink=无链接 tooltip.configurator.linkMsg=绑定到 tooltip.configurator.dim=ä½é¢ @@ -830,6 +838,7 @@ tooltip.diversionDesc=å¯å—红石信å·æŽ§åˆ¶ tooltip.noGas=无气体存储 tooltip.stored=已存储 tooltip.channel=é¢‘é“ +tooltip.walkie_disabled=语音æœåŠ¡å™¨å·²ç¦ç”¨. tooltip.mode=æ¨¡å¼ tooltip.efficiency=效率 tooltip.modeToggle=模å¼åˆ‡æ¢è‡³ @@ -901,7 +910,7 @@ tooltip.Bin=一个能存储大é‡å•ç§ç‰©å“çš„æ–¹å—。 tooltip.TeleporterFrame=ä¼ é€æ¡†æž¶ç”¨äºŽæ­å»ºä¼ é€é—¨ç»“构，å…许传é€é—¨åœ¨å…¶ä¸­æ‰“å¼€ tooltip.SteelCasing=åšå›ºè€ç”¨çš„钢制机壳，是机械的基础 tooltip.DynamicTank=动æ€å‚¨ç½å¤šæ–¹å—结构的框架，å¯ä»¥å­˜å‚¨å¤§é‡æ¶²ä½“ -tooltip.StructuralGlass=一ç§ç”¨æ–°åž‹æ料制作的强化玻璃，å¯ä»¥æŒ–掘。 用于制作å„ç§å¤šæ–¹å—机器结构 +tooltip.StructuralGlass=一ç§ç”¨æ–°åž‹æ料制作的强化玻璃，å¯ä»¥æŒ–掘。用于制作å„ç§å¤šæ–¹å—机器结构 tooltip.DynamicValve=动æ€å‚¨ç½çš„连接å£ï¼Œå…许液体管é“与动æ€å‚¨ç½äº¤äº’ tooltip.ThermalEvaporationController=热力蒸é¦å¡”的控制器，作为结构的核心。æ¯ä¸ªè’¸é¦å¡”åªèƒ½æœ‰ä¸€ä¸ª tooltip.ThermalEvaporationValve=用于热力蒸é¦å¡”的阀门，å¯ä»¥ä½¿çƒ­åŠ›è’¸é¦å¡”和外界管é“交互 @@ -919,8 +928,8 @@ tooltip.SpsCasing=能够抵抗相移å应产生的强烈化学和热效应的 tooltip.FissionReacherCasing=裂å˜å应堆外壳 tooltip.EnrichmentChamber=一å°èƒ½å°†çŸ¿çŸ³ç£¨æˆä¸¤ä»½ç²‰æœ«çš„机器，也å¯ä»¥è¿›è¡Œä¸€äº›å…¶ä»–æ“作。 -tooltip.OsmiumCompressor=一å°éžå¸¸é«˜çº§çš„è®¾å¤‡ï¼Œèƒ½å¤Ÿå°†é”‡çŸ¿çŸ³åŽ‹ç¼©æˆ å¤šç§ç²‰æœ«ä»¥åˆ¶é€ ç›¸åº”金属锭。 -tooltip.Combiner=A machine 一å°ç”¨æ¥å°†ç²‰æœ«ä¸Žåœ†çŸ³èžåˆä¸ºç›¸åº”矿石的机器。 +tooltip.OsmiumCompressor=一å°éžå¸¸é«˜çº§çš„设备，能够将锇矿石压缩æˆå¤šç§ç²‰æœ«ä»¥åˆ¶é€ ç›¸åº”金属锭。 +tooltip.Combiner=一å°ç”¨æ¥å°†ç²‰æœ«ä¸Žåœ†çŸ³èžåˆä¸ºç›¸åº”矿石的机器。 tooltip.Crusher=一å°ç”¨æ¥å°†é‡‘属锭磨æˆç›¸åº”粉末的机器，也å¯ä»¥è¿›è¡Œä¸€äº›å…¶ä»–æ“作。 tooltip.DigitalMiner=一å°é«˜åº¦å…ˆè¿›ï¼Œä»¥è¿‡æ»¤ä¸ºåŸºç¡€åŠŸèƒ½çš„自动采矿机，它å¯ä»¥æŒ–掘/采集最大32格范围内的所有方å—。 tooltip.MetallurgicInfuser=一å°ç”¨æ¥å°†å¤šç§æ料的金属熔炼æˆåˆé‡‘或其他化åˆç‰©çš„设备。 @@ -932,7 +941,7 @@ tooltip.Chargepad=通用充能æ¿ï¼Œèƒ½å¤Ÿä¸ºå„ç§æ¨¡ç»„中的物å“补充能 tooltip.LogisticalSorter=一å°ä»¥è¿‡æ»¤ä¸ºåŸºç¡€åŠŸèƒ½çš„高级整ç†æœºå™¨ï¼Œèƒ½å¤Ÿè‡ªåŠ¨å°†æŒ‡å®šç‰©å“弹射到ä¾é™„的物å“æ æˆ–物æµç®¡é“中。 tooltip.RotaryCondensentrator=一å°èƒ½å¤Ÿå°†æ°”体和其液æ€å½¢å¼ç›¸äº’转化的机器。 tooltip.ChemicalInjectionChamber=一å°èƒ½å¤Ÿå°†çŸ¿ç‰©å¤„ç†æˆ4个碎片的精英机器，是四å€äº§é‡çš„第一步。 -tooltip.ElectrolyticSeparator=一å°ä½¿ç”¨ç”µè§£å°†ç‰¹å®šæ°”体 分离æˆä¸¤ç§ä¸åŒæ°”体的机器。 +tooltip.ElectrolyticSeparator=一å°ä½¿ç”¨ç”µè§£å°†ç‰¹å®šæ°”体分离æˆä¸¤ç§ä¸åŒæ°”体的机器。 tooltip.PrecisionSawmill=一å°æ›´æœ‰æ•ˆåœ°å¤„ç†åŽŸæœ¨å’Œæœ¨åˆ¶å“的机器，åŒæ—¶ä¹Ÿèƒ½èŽ·å¾—锯屑。 tooltip.ChemicalDissolutionChamber=一å°èƒ½å¤Ÿé€šè¿‡åŒ–学手段溶解矿石里的所有æ‚质，从而得到未ç»å¤„ç†çš„矿物浆液的终æžæœºå™¨ã€‚ tooltip.ChemicalWasher=一å°èƒ½å¤Ÿæ¸…ç†æœªç»å¤„ç†çš„浆液，为结晶作准备的终æžæœºå™¨ã€‚ @@ -952,13 +961,13 @@ tooltip.ResistiveHeater=一å°èƒ½ç›´æŽ¥å°†èƒ½é‡è½¬åŒ–æˆçƒ­èƒ½çš„机器 tooltip.FormulaicAssemblicator=一å°å¿«é€Ÿåˆ¶ä½œæˆå“的机器 tooltip.FuelwoodHeater=一å°é€šè¿‡ç‡ƒçƒ§å¯ç‡ƒç‰©æ¥ç”Ÿäº§çƒ­é‡çš„机器 tooltip.QuantumEntangloporter=一å°å¯ä»¥é•¿è·ç¦»è·¨ç»´åº¦ä¼ è¾“物å“的高级机器 -tooltip.canteen1=åªèƒ½æ·»åŠ è¥å…»ç³Šç³Š +tooltip.canteen1=åªèƒ½æ·»åŠ è¥å…»ç³Šå‰‚ tooltip.canteen2=为什么这物å“是如此的昂贵？ tooltip.NutritionalLiquifier=一ç§èƒ½å°†ä»»ä½•é£Ÿç‰©åŠ å·¥æˆæ— å®³ã€æ˜“消化的è¥å…»ç³Šå‰‚的机器 tooltip.IsotopicCentrifuge=一å°åªæœ‰ä¸€ä¸ªç›®çš„的机器：éžå¸¸éžå¸¸å¿«åœ°æ—‹è½¬å®ƒè£…载的东西。 tooltip.antiprotonicnucleosynthesizer=一ç§ä»¥åŽŸå­çš„æ–¹å¼åˆ©ç”¨å°‘é‡å物质和大é‡èƒ½é‡è½¬åŒ–å„ç§èµ„æºçš„机器。 tooltip.superchargedcoil=用于超临界移相器多方å—结构供电。必须连接到超临界移相器端å£[ç›®å‰åªæ˜¯ä¸ªè£…饰] -tooltip.organicfarm=一个éžå¸¸å¼ºå¤§çš„å•æ–¹å—农场机器 +tooltip.OrganicFarm=一个éžå¸¸å¼ºå¤§çš„å•æ–¹å—农场机器 tooltip.AmbientAccumulator=一个能收集当å‰ç»´åº¦åŒ…å«çš„气体[警告ï¼é€€å‡ºå­˜æ¡£ï¼Œå°†ä¸ä¼šä¿ç•™å†…部气体] tooltip.MekTool1=å分强大的挖掘机器 @@ -971,13 +980,14 @@ tooltip.SolarGenerator=一å°ä½¿ç”¨å¤ªé˜³èƒ½é‡å‘电的å‘电机。 tooltip.GasGenerator=一å°åˆ©ç”¨ä¸åŒçš„气体供能的å‘电机。 tooltip.BioGenerator=一å°åˆ©ç”¨ç‡ƒçƒ§æœ‰æœºæ料产生能é‡çš„å‘电机。 tooltip.AdvancedSolarGenerator=一å°ç›´æŽ¥å¸æ”¶å¤§éƒ¨åˆ†å¤ªé˜³å…‰äº§ç”Ÿèƒ½é‡çš„高级å‘电机。 +tooltip.WindGenerator=利用风力产生能é‡çš„å‘电机，在更高的水平上效率更高。 tooltip.TurbineRotor=æ”¾ç½®åœ¨å·¥ä¸šæ¶¡è½®ä¸­çš„é’¢åˆ¶è½¬å­ tooltip.RotationalComplex=放置在涡轮转å­ä¸Šæ–¹çš„转化元件，能够将转å­çš„动能转化。 tooltip.ElectromagneticCoil=一å—类似ç£é“的装置，能使得动能在其中转化为电ç£èƒ½ï¼Œå®ƒå¿…须放置在旋钮装置的上方并ä¿è¯å®ƒä»¬æ˜¯ç›¸è¿žçš„。 tooltip.TurbineCasing=用于工业涡轮的è€åŽ‹å¤–壳 tooltip.TurbineValve=用于输é€è’¸æ±½å¹¶å¯¼å‡ºèƒ½é‡çš„工业涡轮阀门 tooltip.TurbineVent=用于将剩余蒸汽排出的涡轮外壳，它们必须安装在旋钮装置以上的ä½ç½®ã€‚ -tooltip.SaturatingCondenser=一å—å¯ä»¥å°†å·¥ä¸šæ¶¡è½®æœºäº§ç”Ÿçš„蒸汽处ç†æˆæ°´çš„æ–¹å—。 å¯ä»¥æ”¾ç½®åœ¨å¤æ‚旋钮装置上任æ„ä½ç½®ã€‚ +tooltip.SaturatingCondenser=一å—å¯ä»¥å°†å·¥ä¸šæ¶¡è½®æœºäº§ç”Ÿçš„蒸汽处ç†æˆæ°´çš„æ–¹å—。å¯ä»¥æ”¾ç½®åœ¨å¤æ‚旋钮装置上任æ„ä½ç½®ã€‚ tooltip.ReactorGlass=能用于èšå˜å应结构的强化玻璃。 tooltip.ReactorLaserFocusMatrix=一个å¯å¸æ”¶å…‰èƒ½å¹¶åŠ çƒ­èšå˜å应堆的强化玻璃æ¿ã€‚ @@ -987,8 +997,8 @@ tooltip.ReactorNeutronCapturePlate=一个能用于阻隔èšå˜è¾å°„或å助氚 tooltip.ReactorPort=一个强化的框架方å—，能处ç†èšå˜å应堆中气体和能é‡çš„输é€ã€‚ tooltip.ReactorLogicAdapter=一个å¯ä»¥é€šè¿‡çº¢çŸ³ä¿¡å·æ¥å¯¹å应堆进行基本监控的的方å—。 -tooltip.OsmiumOre=一ç§ç‰¢å›ºçš„æ料，它能够在这个世界任何高度被å‘现。 它因ç»å¸¸ç”¨äºŽæœºå™¨å»ºé€ è€Œé—»å。 -tooltip.CopperOre=一ç§å¸¸è§çš„导电æ料，能够用于线缆的产出。 它è€é«˜æ¸©çš„特性也使它æˆä¸ºç”Ÿæˆé«˜çº§æœºæ¢°çš„é‡è¦æ料。 +tooltip.OsmiumOre=一ç§ç‰¢å›ºçš„æ料，它能够在这个世界任何高度被å‘现。它因ç»å¸¸ç”¨äºŽæœºå™¨å»ºé€ è€Œé—»å。 +tooltip.CopperOre=一ç§å¸¸è§çš„导电æ料，能够用于线缆的产出。它è€é«˜æ¸©çš„特性也使它æˆä¸ºç”Ÿæˆé«˜çº§æœºæ¢°çš„é‡è¦æ料。 tooltip.TinOre=一ç§è½»ç›ˆï¼Œä½†ç‰¢å›ºçš„导电æ料，比铜è¦ç•¥å¾®ç¨€æœ‰ç‚¹ã€‚ # Side data @@ -1005,7 +1015,6 @@ sideData.Empty=排空 sideData.Charge=充能 sideData.Discharge=å充能 sideData.Input_Extra=输入/注入 -sideData.Output2=输出2 # Redstone control control.disabled=ç¦æ­¢ control.high=高 @@ -1123,6 +1132,17 @@ gui.maxCasing=壳体最高温度 gui.passiveGeneration=被动产能 gui.steamProduction=è’¸æ±½äº§é‡ +# Config Gui +mekanism.configgui.ctgy.generators.general=常规设置 +mekanism.configgui.ctgy.generators.generators=å‘电机设置 +mekanism.configgui.ctgy.generators.generation=生æˆè®¾ç½® + +# Config Tooltips +mekanism.configgui.ctgy.generators.general.tooltip=关于Mekanism生æˆå™¨å¸¸è§„é…置的设置 +mekanism.configgui.ctgy.generators.generators.tooltip=有关å¯ç”¨å’Œç¦ç”¨ç‰¹å®šç”Ÿæˆå™¨çš„设置 +mekanism.configgui.ctgy.generators.generation.tooltip=有关å‘电机能æºä½¿ç”¨çš„设置 + + ######### # TOOLS ######### @@ -1215,3 +1235,28 @@ mekanism.configgui.ctgy.tools.tools=工具平衡 mekanism.configgui.ctgy.tools.general.tooltip=通用机械工具的常规é…置设定 mekanism.configgui.ctgy.tools.armor.tooltip=通用机械护甲的ä¿æŠ¤å€¼ä»¥åŠå¹³è¡¡çš„设定 mekanism.configgui.ctgy.tools.tools.tooltip=通用机械工具的效率值以åŠå¹³è¡¡çš„设定 + +# Commands +cmd.mek.usage= +cmd.mek.debug.usage=å¯ç”¨è°ƒè¯• +cmd.mek.debug=调试 +cmd.mek.testrules.usage=设置世界规则进行测试（无生物生æˆã€æ—¥å…‰å‘¨æœŸæˆ–天气） +cmd.mek.testrules=生物生æˆï¼Œæ—¥å…‰å¾ªçŽ¯å’Œå¤©æ°”ç¦ç”¨ï¼ +cmd.mek.tp.usage=ä¼ é€åˆ°æ–°å标，ä¿å­˜å †æ ˆä¸Šçš„最åŽä¸€ä¸ªä½ç½® +cmd.mek.tp=ä¼ é€åˆ° %d,%d,%d - 在堆栈上ä¿å­˜äº†æœ€åŽä¸€ä¸ªä½ç½® +cmd.mek.tp.missing.args=ä¼ é€éœ€è¦ä¸‰ä¸ªå标： x, y, z +cmd.mek.tpop.usage=返回到堆栈上的最åŽä¸€ä¸ªä½ç½® +cmd.mek.tpop=返回至 %d,%d,%d; %d 堆栈上的ä½ç½® +cmd.mek.tpop.empty.stack=堆栈上没有ä½ç½® + +cmd.mek.chunk.usage= +cmd.mek.chunk.watch.usage=将调用方的区å—添加到加载/å¸è½½äº‹ä»¶çš„监视列表 +cmd.mek.chunk.watch=åŒºå— %d,%d 已添加到观察列表 +cmd.mek.chunk.unwatch.usage=从å—加载/å¸è½½äº‹ä»¶çš„ç›‘è§†åˆ—è¡¨ä¸­åˆ é™¤è°ƒç”¨æ–¹çš„å— +cmd.mek.chunk.unwatch=åŒºå— %d,%d 已从观察列表中删除 +cmd.mek.chunk.clear.usage=从监视列表中删除å—加载/å¸è½½äº‹ä»¶çš„æ‰€æœ‰å— +cmd.mek.chunk.clear=%d ä»Žç›‘è§†åˆ—è¡¨ä¸­åˆ é™¤çš„åŒºå— +cmd.mek.chunk.flush=%d å·²å¸è½½çš„å— + +#chat messages +chat.mek.multiblockformed=多方å—å½¢æˆ \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_1.json b/src/main/resources/assets/mekanism/recipes/machineblock2_1.json index 5b8addc3..1a7fc0eb 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_1.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_1.json @@ -27,8 +27,8 @@ "item": "#CIRCUITBASIC" }, "E": { - "item": "mekanism:machineblock3", - "data": 9 + "item": "mekanism:machineblock", + "data": 13 }, "G": { "nbt": { diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_12.json b/src/main/resources/assets/mekanism/recipes/machineblock2_12.json index a4ef79b7..5246e4f8 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_12.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_12.json @@ -17,8 +17,8 @@ ], "key": { "P": { - "item": "mekanism:machineblock3", - "data": 8 + "item": "mekanism:machineblock", + "data": 12 }, "C": { "item": "#CIRCUITBASIC" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_15.json b/src/main/resources/assets/mekanism/recipes/machineblock2_15.json index 4292d793..4385d7eb 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_15.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_15.json @@ -16,8 +16,8 @@ ], "key": { "C": { - "item": "mekanism:machineblock3", - "data": 9 + "item": "mekanism:machineblock", + "data": 13 }, "F": { "item": "mekanism:machineblock2", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_3.json b/src/main/resources/assets/mekanism/recipes/machineblock2_3.json index cc6d19dc..ce75a38b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_3.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_3.json @@ -18,7 +18,7 @@ "key": { "P": { "item": "mekanism:machineblock", - "data": 11 + "data": 9 }, "R": { "ore": "alloyElite", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock2_4.json b/src/main/resources/assets/mekanism/recipes/machineblock2_4.json index 6cfb13d3..8c063ff9 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock2_4.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock2_4.json @@ -4,9 +4,9 @@ "data": 4 }, "pattern": [ - "ABA", - "CDC", - "EFE" + "IRI", + "ECE", + "IRI" ], "type": "mekanism:ore_shaped", "conditions": [ @@ -16,35 +16,19 @@ } ], "key": { - "A": { - "ore": "alloyAdvanced", + "R": { + "ore": "dustRedstone", "type": "forge:ore_dict" }, - "B": { - "nbt": { - "tier": 0 - }, - "item": "mekanism:machineblock2", - "data": 11, - "type": "mekanism:item_nbt" - }, "C": { - "nbt": { - "tier": 0 - }, - "item": "mekanism:gastank", - "data": 0, - "type": "mekanism:item_nbt" - }, - "D": { "item": "mekanism:electrolyticcore" }, "E": { - "item": "#CIRCUITBASIC" + "item": "mekanism:enrichedalloy" }, - "F": { - "item": "mekanism:basicblock", - "data": 8 + "I": { + "ore": "ingotIron", + "type": "forge:ore_dict" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_0.json b/src/main/resources/assets/mekanism/recipes/machineblock3_0.json index 91ec45ba..a39dc2a0 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_0.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock3_0.json @@ -4,9 +4,9 @@ "data": 0 }, "pattern": [ - "ABA", - "CDE", - "FGF" + "OCO", + "ATA", + "OCO" ], "type": "mekanism:ore_shaped", "conditions": [ @@ -17,39 +17,18 @@ ], "key": { "A": { - "ore": "AntimatterPellet", - "type": "forge:ore_dict" - }, - "B": { - "ore": "blockRefinedObsidian", + "ore": "alloyUltimate", "type": "forge:ore_dict" }, "C": { - "item": "mekanism:machineblock3", - "data": 9 - }, - "D": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:basicblock2", - "data": 3, - "type": "mekanism:item_nbt" - }, - "E": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:gastank", - "data": 0, - "type": "mekanism:item_nbt" + "item": "#CIRCUITULTIMATE" }, - "F": { - "item": "mekanism:machineblock", - "data": 13 + "T": { + "item": "mekanism:teleportationcore" }, - "G": { - "item": "#CIRCUITULTIMATE" + "O": { + "ore": "ingotRefinedObsidian", + "type": "forge:ore_dict" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_11.json b/src/main/resources/assets/mekanism/recipes/machineblock3_11.json deleted file mode 100644 index 803e6cfc..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_11.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock3", - "data": 11 - }, - "pattern": [ - "ABC", - "EFD", - "GBG" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "NutritionalLiquifier" - } - ], - "key": { - "A": { - "ore":"PlutoniumPellet", - "type": "forge:ore_dict" - }, - "B": { - "item": "#CIRCUITULTIMATE" - }, - "C": { - "ore": "PoloniumPellet", - "type": "forge:ore_dict" - }, - "D": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:gastank", - "data": 0, - "type": "mekanism:item_nbt" - }, - "E": { - "item": "mekanism:machineblock3", - "data": 9 - }, - "F": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:energycube", - "data": 0, - "type": "mekanism:item_nbt" - }, - "G": { - "item": "mekanism:basicblock", - "data": 9 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_12.json b/src/main/resources/assets/mekanism/recipes/machineblock3_12.json deleted file mode 100644 index 31ab8a0a..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_12.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock3", - "data": 12 - }, - "pattern": [ - "ADA", - "BCB", - "FEF" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "superchargedcoil" - } - ], - "key": { - "A": { - "ore": "ingotCopper", - "type": "forge:ore_dict" - }, - "B": { - "item": "#CIRCUITULTIMATE" - }, - "C": { - "item": "mekanism:machineblock2", - "data": 13 - }, - "D": { - "ore": "PoloniumPellet", - "type": "forge:ore_dict" - }, - "E": { - "item": "mekanism:basicblock", - "data": 8 - }, - "F": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:basicblock2", - "data": 4, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_14.json b/src/main/resources/assets/mekanism/recipes/machineblock3_14.json deleted file mode 100644 index 1d73466e..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_14.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock", - "data": 14 - }, - "pattern": [ - "RCR", - "gIg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "antiprotonicnucleosynthesizer" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "I": { - "item": "mekanism:basicblock", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_2.json b/src/main/resources/assets/mekanism/recipes/machineblock3_2.json deleted file mode 100644 index 68348909..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_2.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock3", - "data": 2 - }, - "pattern": [ - "ABA", - "CDC", - "EFE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "AmbientAccumulator" - } - ], - "key": { - "A": { - "ore": "blockSteel", - "type": "forge:ore_dict" - }, - "B": { - "item": "mekanism:basicblock", - "data": 10 - }, - "C": { - "nbt": { - "tier": 0 - }, - "item": "mekanism:gastank", - "data": 0, - "type": "mekanism:item_nbt" - }, - "D": { - "nbt": { - "tier": 0 - }, - "item": "mekanism:transmitter", - "data": 2, - "type": "mekanism:item_nbt" - }, - "E": { - "item": "#CIRCUITBASIC" - }, - "F": { - "item": "mekanism:basicblock", - "data": 8 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_7.json b/src/main/resources/assets/mekanism/recipes/machineblock3_7.json deleted file mode 100644 index b0227b78..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_7.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock3", - "data": 7 - }, - "pattern": [ - "PPP", - "SES" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Chargepad" - } - ], - "key": { - "P": { - "item": "minecraft:stone_pressure_plate" - }, - "S": { - "ore": "ingotSteel", - "type": "forge:ore_dict" - }, - "E": { - "item": "mekanism:energytablet" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_8.json b/src/main/resources/assets/mekanism/recipes/machineblock3_8.json deleted file mode 100644 index 0348e3bb..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_8.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock3", - "data": 8 - }, - "pattern": [ - " B ", - "ECE", - "OOO" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "ElectricPump" - } - ], - "key": { - "B": { - "item": "minecraft:bucket" - }, - "C": { - "item": "mekanism:basicblock", - "data": 8 - }, - "E": { - "item": "mekanism:enrichedalloy" - }, - "O": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_9.json b/src/main/resources/assets/mekanism/recipes/machineblock3_9.json deleted file mode 100644 index 7131a3c6..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_9.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "result": { - "item": "mekanism:machineblock3", - "data": 9 - }, - "pattern": [ - "SGS", - "CcC", - "SSS" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "PersonalChest" - } - ], - "key": { - "S": { - "ore": "ingotSteel", - "type": "forge:ore_dict" - }, - "C": { - "ore": "chestWood", - "type": "forge:ore_dict" - }, - "c": { - "item": "#CIRCUITBASIC" - }, - "G": { - "ore": "blockGlass", - "type": "forge:ore_dict" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_10.json index db276426..273e3cb7 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_10.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_10.json @@ -4,32 +4,32 @@ "data": 10 }, "pattern": [ - "IFI", - "ROR", - "IFI" + "RCR", + "GIG", + "RCR" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "MetallurgicInfuser" + "machineType": "EnergizedSmelter" } ], "key": { "R": { - "ore": "dustRedstone", + "ore": "alloyBasic", "type": "forge:ore_dict" }, - "F": { - "item": "minecraft:furnace" + "C": { + "item": "#CIRCUITBASIC" }, - "I": { - "ore": "ingotIron", + "G": { + "ore": "blockGlass", "type": "forge:ore_dict" }, - "O": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" + "I": { + "item": "mekanism:basicblock", + "data": 8 } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_11.json index 70cf2230..c1a1b7ec 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_11.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_11.json @@ -4,32 +4,27 @@ "data": 11 }, "pattern": [ - "ECE", - "ORO", - "ECE" + "COC", + "OTO", + "COC" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "PurificationChamber" + "machineType": "Teleporter" } ], "key": { - "R": { - "item": "mekanism:machineblock", - "data": 0 - }, "C": { - "item": "#CIRCUITADVANCED" + "item": "#CIRCUITBASIC" }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" + "T": { + "item": "mekanism:teleportationcore" }, "O": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" + "item": "mekanism:basicblock", + "data": 8 } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_12.json index 3a4cd546..e372674f 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_12.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_12.json @@ -4,32 +4,31 @@ "data": 12 }, "pattern": [ - "RCR", - "GIG", - "RCR" + " B ", + "ECE", + "OOO" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "EnergizedSmelter" + "machineType": "ElectricPump" } ], "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" + "B": { + "item": "minecraft:bucket" }, "C": { - "item": "#CIRCUITBASIC" - }, - "G": { - "ore": "blockGlass", - "type": "forge:ore_dict" - }, - "I": { "item": "mekanism:basicblock", "data": 8 + }, + "E": { + "item": "mekanism:enrichedalloy" + }, + "O": { + "ore": "ingotOsmium", + "type": "forge:ore_dict" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_13.json index 3012aa03..8b206040 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_13.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_13.json @@ -4,27 +4,32 @@ "data": 13 }, "pattern": [ - "COC", - "OTO", - "COC" + "SGS", + "CcC", + "SSS" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "Teleporter" + "machineType": "PersonalChest" } ], "key": { + "S": { + "ore": "ingotSteel", + "type": "forge:ore_dict" + }, "C": { - "item": "#CIRCUITBASIC" + "ore": "chestWood", + "type": "forge:ore_dict" }, - "T": { - "item": "mekanism:teleportationcore" + "c": { + "item": "#CIRCUITBASIC" }, - "O": { - "item": "mekanism:basicblock", - "data": 8 + "G": { + "ore": "blockGlass", + "type": "forge:ore_dict" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_14.json index e03df14e..14841542 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_14.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_14.json @@ -4,48 +4,26 @@ "data": 14 }, "pattern": [ - "ABA", - "CDC", - "EFE" + "PPP", + "SES" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "IsotopicCentrifuge" + "machineType": "Chargepad" } ], "key": { - "A": { - "ore": "blockTin", - "type": "forge:ore_dict" - }, - "B": { - "item": "#CIRCUITULTIMATE" - }, - "C": { - "item": "mekanism:basicblock", - "data": 10 + "P": { + "item": "minecraft:stone_pressure_plate" }, - "D": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:gastank", - "data": 0, - "type": "mekanism:item_nbt" + "S": { + "ore": "ingotSteel", + "type": "forge:ore_dict" }, "E": { - "item": "mekanism:basicblock", - "data": 8 - }, - "F": { - "nbt": { - "tier": 3 - }, - "item": "mekanism:energycube", - "data": 0, - "type": "mekanism:item_nbt" + "item": "mekanism:energytablet" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock3_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_15.json similarity index 88% rename from src/main/resources/assets/mekanism/recipes/machineblock3_10.json rename to src/main/resources/assets/mekanism/recipes/machineblock_15.json index 66238799..a6fbe82b 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock3_10.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_15.json @@ -1,7 +1,7 @@ { "result": { - "item": "mekanism:machineblock3", - "data": 10 + "item": "mekanism:machineblock", + "data": 15 }, "pattern": [ "IPI", diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_4.json index dec10a06..27b321d9 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_4.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_4.json @@ -23,8 +23,8 @@ "item": "#CIRCUITBASIC" }, "S": { - "item": "mekanism:machineblock3", - "data": 10 + "item": "mekanism:machineblock", + "data": 15 }, "T": { "item": "mekanism:teleportationcore" diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_5.json index 4ef55942..1129ee06 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5.json @@ -33,7 +33,7 @@ }, "O": { "item": "mekanism:machineblock", - "data": 12 + "data": 10 } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_10.json deleted file mode 100644 index 67b0d28c..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_10.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 0 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_11.json deleted file mode 100644 index 22bf0681..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_11.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 1 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_12.json deleted file mode 100644 index 8e2672e7..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_12.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 2 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_13.json deleted file mode 100644 index 60eedd29..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_13.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 3 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_14.json deleted file mode 100644 index dc392cd4..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_14.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 4 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_15.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_15.json deleted file mode 100644 index 3376f66b..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_15.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 6 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_16.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_16.json deleted file mode 100644 index 4d76c2de..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_16.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock4", - "data": 7 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_9.json deleted file mode 100644 index 273e0415..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_9.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "iOi", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyBasic", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITBASIC" - }, - "i": { - "ore": "ingotIron", - "type": "forge:ore_dict" - }, - "O": { - "item": "mekanism:machineblock3", - "data": 13 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_1.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_1.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_2.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_2.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_3.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_3.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_4.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json similarity index 97% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_5.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json index dac51874..21b068cf 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_5.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt.json @@ -33,7 +33,7 @@ }, "O": { "item": "mekanism:machineblock", - "data": 11 + "data": 9 } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_6.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json similarity index 97% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_7.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json index 16563e90..6a696359 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_5_7.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt.json @@ -33,7 +33,7 @@ }, "O": { "item": "mekanism:machineblock", - "data": 10 + "data": 8 } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_5_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_5_8.json rename to src/main/resources/assets/mekanism/recipes/machineblock_5_alt_alt_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_10.json deleted file mode 100644 index 60dd9f69..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_10.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_11.json deleted file mode 100644 index a1069d42..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_11.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_12.json deleted file mode 100644 index 3ea2f4eb..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_12.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_13.json deleted file mode 100644 index 4c36bd9a..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_13.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_14.json deleted file mode 100644 index afbae338..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_14.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_15.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_15.json deleted file mode 100644 index 671e9d05..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_15.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_16.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_16.json deleted file mode 100644 index ddfb071a..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_16.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_9.json deleted file mode 100644 index d35c488c..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_6_9.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "ECE", - "oOo", - "ECE" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "C": { - "item": "#CIRCUITADVANCED" - }, - "E": { - "ore": "alloyAdvanced", - "type": "forge:ore_dict" - }, - "o": { - "ore": "ingotOsmium", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 5, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_1.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_1.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_2.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_2.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_3.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_3.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_4.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_5.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_6.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_7.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_6_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_6_8.json rename to src/main/resources/assets/mekanism/recipes/machineblock_6_alt_alt_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_10.json deleted file mode 100644 index b34ea935..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_10.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_11.json deleted file mode 100644 index 627af89e..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_11.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_12.json deleted file mode 100644 index 2201efc8..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_12.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_13.json deleted file mode 100644 index 8b8caf1f..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_13.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_14.json deleted file mode 100644 index e733d558..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_14.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_15.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_15.json deleted file mode 100644 index 4041d3e1..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_15.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_16.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_16.json deleted file mode 100644 index 4476b6f2..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_16.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_9.json deleted file mode 100644 index 783d1104..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_7_9.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyElite", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITELITE" - }, - "g": { - "ore": "ingotGold", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 6, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_1.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_1.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_2.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_2.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_3.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_3.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_4.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_5.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_6.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_7.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_7_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt_alt.json similarity index 100% rename from src/main/resources/assets/mekanism/recipes/machineblock_7_8.json rename to src/main/resources/assets/mekanism/recipes/machineblock_7_alt_alt_alt_alt_alt_alt_alt_alt.json diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_8.json index 45d2c14f..072ab007 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_8.json @@ -1,43 +1,35 @@ { "result": { - "nbt": { - "recipeType": 0 - }, "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" + "data": 8 }, "pattern": [ - "RCR", - "gOg", - "RCR" + "IFI", + "ROR", + "IFI" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "Factory" + "machineType": "MetallurgicInfuser" } ], "key": { "R": { - "ore": "alloyUltimate", + "ore": "dustRedstone", "type": "forge:ore_dict" }, - "C": { - "item": "#CIRCUITULTIMATE" + "F": { + "item": "minecraft:furnace" }, - "g": { - "ore": "gemDiamond", + "I": { + "ore": "ingotIron", "type": "forge:ore_dict" }, "O": { - "nbt": { - "recipeType": 0 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" + "ore": "ingotOsmium", + "type": "forge:ore_dict" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_1.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_1.json deleted file mode 100644 index 5ebfcd14..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_1.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 1 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 1 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_10.json deleted file mode 100644 index 04ab3b22..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_10.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_11.json deleted file mode 100644 index f8de627c..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_11.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_12.json deleted file mode 100644 index e23b27c6..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_12.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_13.json deleted file mode 100644 index 63760ec8..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_13.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_14.json deleted file mode 100644 index 5cd0a68b..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_14.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_15.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_15.json deleted file mode 100644 index f303a841..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_15.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_16.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_16.json deleted file mode 100644 index df6be478..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_16.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_2.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_2.json deleted file mode 100644 index ab279791..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_2.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 2 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 2 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_3.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_3.json deleted file mode 100644 index 752bf637..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_3.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 3 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 3 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_4.json deleted file mode 100644 index b9c86f87..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_4.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 4 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 4 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_5.json deleted file mode 100644 index 4ae75671..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_5.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 5 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 5 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_6.json deleted file mode 100644 index c35fa912..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_6.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 6 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 6 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_7.json deleted file mode 100644 index 90a2602f..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_7.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 7 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 7 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_8.json deleted file mode 100644 index 9c4bd992..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_8.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 8 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 8 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_8_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_8_9.json deleted file mode 100644 index fc7af6b3..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_8_9.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "ore": "alloyUltimate", - "type": "forge:ore_dict" - }, - "C": { - "item": "#CIRCUITULTIMATE" - }, - "g": { - "ore": "gemDiamond", - "type": "forge:ore_dict" - }, - "O": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 7, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_9.json index a2258a25..9cd5ceeb 100644 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9.json +++ b/src/main/resources/assets/mekanism/recipes/machineblock_9.json @@ -1,43 +1,35 @@ { "result": { - "nbt": { - "recipeType": 0 - }, "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" + "data": 9 }, "pattern": [ - "RCR", - "gOg", - "RCR" + "ECE", + "ORO", + "ECE" ], "type": "mekanism:ore_shaped", "conditions": [ { "type": "mekanism:recipe_enabled", - "machineType": "Factory" + "machineType": "PurificationChamber" } ], "key": { - "R": { - "item": "mekanism:cosmicalloy" + "R": { + "item": "mekanism:machineblock", + "data": 0 }, "C": { - "item": "mekanism:controlcircuit", - "data": 4 + "item": "#CIRCUITADVANCED" }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 + "E": { + "ore": "alloyAdvanced", + "type": "forge:ore_dict" }, "O": { - "nbt": { - "recipeType": 0 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" + "ore": "ingotOsmium", + "type": "forge:ore_dict" } } } \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_1.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_1.json deleted file mode 100644 index 3f0005d0..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_1.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 1 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 1 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_10.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_10.json deleted file mode 100644 index eb49ad43..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_10.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 10 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_11.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_11.json deleted file mode 100644 index 87e4b8fc..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_11.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 11 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_12.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_12.json deleted file mode 100644 index c4b7e535..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_12.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 12 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_13.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_13.json deleted file mode 100644 index 6c0e41a2..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_13.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 13 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_14.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_14.json deleted file mode 100644 index f84e19af..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_14.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 14 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_15.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_15.json deleted file mode 100644 index 9dbbf216..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_15.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 15 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_16.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_16.json deleted file mode 100644 index 93e0a9d1..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_16.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 16 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_2.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_2.json deleted file mode 100644 index e85b3608..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_2.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 2 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 2 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_3.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_3.json deleted file mode 100644 index a191b67b..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_3.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 3 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 3 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_4.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_4.json deleted file mode 100644 index 2dad387d..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_4.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 4 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 4 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_5.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_5.json deleted file mode 100644 index c7fdc9be..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_5.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 5 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 5 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_6.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_6.json deleted file mode 100644 index fee4521d..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_6.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 6 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 6 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_7.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_7.json deleted file mode 100644 index cbc542e1..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_7.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 7 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 7 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_8.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_8.json deleted file mode 100644 index c4d25709..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_8.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 8 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 8 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/machineblock_9_9.json b/src/main/resources/assets/mekanism/recipes/machineblock_9_9.json deleted file mode 100644 index a59bd55c..00000000 --- a/src/main/resources/assets/mekanism/recipes/machineblock_9_9.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "result": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 9, - "type": "mekanism:item_nbt" - }, - "pattern": [ - "RCR", - "gOg", - "RCR" - ], - "type": "mekanism:ore_shaped", - "conditions": [ - { - "type": "mekanism:recipe_enabled", - "machineType": "Factory" - } - ], - "key": { - "R": { - "item": "mekanism:cosmicalloy" - }, - "C": { - "item": "mekanism:controlcircuit", - "data": 4 - }, - "g": { - "item": "mekanism:OtherDust", - "data": 11 - }, - "O": { - "nbt": { - "recipeType": 9 - }, - "item": "mekanism:machineblock", - "data": 8, - "type": "mekanism:item_nbt" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/nugget_7.json b/src/main/resources/assets/mekanism/recipes/nugget_7.json deleted file mode 100644 index 3e2634ea..00000000 --- a/src/main/resources/assets/mekanism/recipes/nugget_7.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "mekanism:nugget", - "data": 7, - "count": 9 - }, - "pattern": [ - "*" - ], - "type": "forge:ore_shaped", - "key": { - "*": { - "ore": "ingotLead", - "type": "forge:ore_dict" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/nugget_8.json b/src/main/resources/assets/mekanism/recipes/nugget_8.json deleted file mode 100644 index 1f7fb29f..00000000 --- a/src/main/resources/assets/mekanism/recipes/nugget_8.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "result": { - "item": "mekanism:nugget", - "data": 8, - "count": 9 - }, - "pattern": [ - "*" - ], - "type": "forge:ore_shaped", - "key": { - "*": { - "ore": "ingotUranium", - "type": "forge:ore_dict" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/recipes/robit.json b/src/main/resources/assets/mekanism/recipes/robit.json index 83ce3759..1add6c8a 100644 --- a/src/main/resources/assets/mekanism/recipes/robit.json +++ b/src/main/resources/assets/mekanism/recipes/robit.json @@ -20,8 +20,8 @@ "item": "mekanism:energytablet" }, "I": { - "item": "mekanism:machineblock3", - "data": 9 + "item": "mekanism:machineblock", + "data": 13 }, "O": { "ore": "ingotRefinedObsidian",