diff --git a/gradle.properties b/gradle.properties index 8b7d6db3..535561dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,9 +37,10 @@ mod_license=MIT mod_version=1.21.1_1.7.10 -create_version = 6.0.6-97 -flywheel_version = 1.0.2 -ponder_version = 1.0.46 +create_version = 6.0.6-98 +flywheel_version = 1.0.4 +ponder_version = 1.0.56 + registrate_version = MC1.21-1.3.0+62 jei_version=19.10.0.126 diff --git a/src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java b/src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java index b4d45060..769f5d9f 100644 --- a/src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java +++ b/src/main/java/com/rae/creatingspace/content/datagen/CSDatagen.java @@ -4,8 +4,7 @@ import com.google.gson.JsonObject; import com.rae.creatingspace.CreatingSpace; -import com.rae.creatingspace.content.datagen.recipe.CSPressingRecipeGen; -import com.rae.creatingspace.content.datagen.recipe.CSStandardRecipeGen; +import com.rae.creatingspace.content.datagen.recipe.*; import com.simibubi.create.foundation.utility.FilesHelper; import com.tterrag.registrate.providers.ProviderType; import com.tterrag.registrate.providers.RegistrateDataProvider; @@ -47,10 +46,13 @@ public static void gatherData(GatherDataEvent event) { // AllOreFeatureConfigEntries.gatherData(event); //CS Recipes - generator.addProvider(true, new CSStandardRecipeGen(output, lookupProvider)); - generator.addProvider(true, new CSPressingRecipeGen(output, lookupProvider)); + //generator.addProvider(true, new CSStandardRecipeGen(output, lookupProvider)); + generator.addProvider(true, new CSPressingRecipeGen(output, lookupProvider, CreatingSpace.MODID)); + generator.addProvider(true, new CSCrushingRecipeGen(output, lookupProvider, CreatingSpace.MODID)); + generator.addProvider(true, new CSMixingRecipeGen(output, lookupProvider, CreatingSpace.MODID)); + generator.addProvider(true, new CSWashingRecipeGen(output, lookupProvider, CreatingSpace.MODID)); - event.getGenerator().addProvider(true, REGISTRATE.setDataProvider(new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event))); + event.getGenerator().addProvider(true, new RegistrateDataProvider(REGISTRATE, CreatingSpace.MODID, event)); } } diff --git a/src/main/java/com/rae/creatingspace/content/datagen/CSMetalSets.java b/src/main/java/com/rae/creatingspace/content/datagen/CSMetalSets.java deleted file mode 100644 index 54f81ae2..00000000 --- a/src/main/java/com/rae/creatingspace/content/datagen/CSMetalSets.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.rae.creatingspace.content.datagen; - -import com.rae.creatingspace.content.datagen.recipe.CSMetalRecipeHelper; -import com.rae.creatingspace.init.ingameobject.BlockInit; -import com.rae.creatingspace.init.ingameobject.ItemInit; -import com.simibubi.create.AllTags; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.world.item.Item; - -import javax.annotation.Nullable; -import java.util.List; - -public class CSMetalSets { - - public static final MetalSet ALUMINUM = new MetalSet( - "aluminum", - true, - ItemInit.ALUMINUM_NUGGET.get(), - ItemInit.ALUMINUM_INGOT.get(), - BlockInit.ALUMINUM_BLOCK.asItem(), - ItemInit.RAW_ALUMINUM.get(), - BlockInit.MOON_ALUMINUM_ORE.asItem(), - null - ); - - public static final MetalSet COBALT = new MetalSet( - "cobalt", - true, - ItemInit.COBALT_NUGGET.get(), - ItemInit.COBALT_INGOT.get(), - BlockInit.COBALT_BLOCK.asItem(), - ItemInit.RAW_COBALT.get(), - BlockInit.MOON_COBALT_ORE.asItem(), - null - ); - - public static final MetalSet NICKEL = new MetalSet( - "nickel", - true, - ItemInit.NICKEL_NUGGET.get(), - ItemInit.NICKEL_INGOT.get(), - BlockInit.NICKEL_BLOCK.asItem(), - ItemInit.RAW_NICKEL.get(), - BlockInit.NICKEL_ORE.asItem(), - BlockInit.MOON_NICKEL_ORE.asItem() - ); - - public static final List ALL = List.of("aluminum","cobalt", "nickel"); - - public record MetalSet( - String name, - boolean generateSmelting, - Item nugget, - Item ingot, - Item block, - @Nullable Item rawOre, - @Nullable Item ore, - @Nullable Item deepslateOre - ){} - - protected void buildRecipes(RecipeOutput recipeOutput) { - } - -} diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCrushingRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCrushingRecipeGen.java new file mode 100644 index 00000000..10054eab --- /dev/null +++ b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCrushingRecipeGen.java @@ -0,0 +1,54 @@ +package com.rae.creatingspace.content.datagen.recipe; + +import com.rae.creatingspace.CreatingSpace; +import com.rae.creatingspace.init.ingameobject.BlockInit; +import com.rae.creatingspace.init.ingameobject.ItemInit; +import com.simibubi.create.api.data.recipe.CrushingRecipeGen; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Items; + +import java.util.concurrent.CompletableFuture; + +import static com.simibubi.create.AllTags.commonItemTag; + +@SuppressWarnings("unused") +public class CSCrushingRecipeGen extends CrushingRecipeGen { + public CSCrushingRecipeGen(PackOutput output, CompletableFuture registries, String defaultNamespace) { + super(output, registries, CreatingSpace.MODID); + } + + GeneratedRecipe + + COAL_DUST = create("coal_dust", b -> b + .duration(400) + .require(Items.COAL) + .output(ItemInit.COAL_DUST, 2)), + + NICKEL_DUST = create("nickel_dust", b -> b + .duration(400) + .require(commonItemTag("ingots/nickel")) + .output(ItemInit.NICKEL_DUST, 2) + .output(0.5F, ItemInit.NICKEL_DUST, 1)), + + MOON_REGOLITH = create("moon_stone", b -> b + .duration(400) + .require(BlockInit.MOON_STONE) + .output(BlockInit.MOON_REGOLITH, 1)), + + MARS_REGOLITH = create("mars_stone", b -> b + .duration(400) + .require(BlockInit.MARS_STONE) + .output(BlockInit.MARS_REGOLITH, 1)), + + NICKEL_ORE = stoneOre(() -> BlockInit.NICKEL_ORE, ItemInit.CRUSHED_NICKEL_ORE::get, 1.75f, 400), + DEEPSLATE_NICKEL_ORE = deepslateOre(() -> BlockInit.DEEPSLATE_NICKEL_ORE, ItemInit.CRUSHED_NICKEL_ORE::get, 2.25f, 400), + ALUMINUM_ORE = ore(() -> BlockInit.MOON_STONE.asItem(), BlockInit.MOON_ALUMINUM_ORE::get, ItemInit.CRUSHED_ALUMINUM_ORE::get, 1.75f, 400), + COBALT_ORE = ore(() -> BlockInit.MOON_STONE.asItem(), BlockInit.MOON_COBALT_ORE::get, ItemInit.CRUSHED_COBALT_ORE::get, 1.75f, 400), + RAW_NICKEL_ORE = rawOre("nickel", () -> commonItemTag("raw_materials/nickel"), ItemInit.CRUSHED_NICKEL_ORE::get, 1), + RAW_ALUMINUM_ORE = rawOre("aluminum", () -> commonItemTag("raw_materials/aluminum"), ItemInit.CRUSHED_ALUMINUM_ORE::get, 1), + RAW_COBALT_ORE = rawOre("cobalt", () -> commonItemTag("raw_materials/cobalt"), ItemInit.CRUSHED_COBALT_ORE::get, 1), + RAW_NICKEL_BLOCK = rawOreBlock("nickel", () -> commonItemTag("storage_blocks/raw_nickel"), ItemInit.CRUSHED_NICKEL_ORE::get, 1), + RAW_ALUMINUM_BLOCK = rawOreBlock("aluminum", () -> commonItemTag("storage_blocks/raw_aluminum"), ItemInit.CRUSHED_ALUMINUM_ORE::get, 1), + RAW_COBALT_BLOCK = rawOreBlock("cobalt", () -> commonItemTag("storage_blocks/raw_cobalt"), ItemInit.CRUSHED_COBALT_ORE::get, 1); +} diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCuttingRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCuttingRecipeGen.java new file mode 100644 index 00000000..784541c0 --- /dev/null +++ b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSCuttingRecipeGen.java @@ -0,0 +1,58 @@ +package com.rae.creatingspace.content.datagen.recipe; + +import com.rae.creatingspace.CreatingSpace; +import com.simibubi.create.AllItems; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.api.data.recipe.CuttingRecipeGen; +import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.ItemLike; + +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; + +import static com.rae.creatingspace.CreatingSpace.resource; +import static com.simibubi.create.AllTags.commonItemTag; + +@SuppressWarnings("unused") +public class CSCuttingRecipeGen extends CuttingRecipeGen { + public CSCuttingRecipeGen(PackOutput output, CompletableFuture registries, String defaultNamespace) { + super(output, registries, CreatingSpace.MODID); + + GeneratedRecipe + + ANDESITE_ENGINE_WALL = create(AllItems.ANDESITE_ALLOY::get, b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("andesite_engine_wall")))), + COPPER_ENGINE_WALL = create(Items.COPPER_INGOT::asItem,b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("copper_engine_wall")))), + IRON_ENGINE_WALL = create(Items.IRON_INGOT::asItem,b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("iron_engine_wall")))), + BRASS_ENGINE_WALL = create(AllItems.BRASS_SHEET::get,b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("brass_engine_wall")))), + REINFORCED_COPPER_ENGINE_WALL = create("reinforced_copper_sheet", b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("reinforced_copper_engine_wall")))), + COPRONICKEL_ENGINE_WALL = create("copronickel_sheet", b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("copronickel_engine_wall")))), + MONEL_ENGINE_WALL = create("monel_sheet", b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("monel_engine_wall")))), + INCONEL_ENGINE_WALL = create("inconel_sheet", b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("inconel_engine_wall")))), + HASTELLOY_ENGINE_WALL = create("hastelloy_sheet", b -> b + .duration(100) + .output(BuiltInRegistries.ITEM.get(resource("hastelloy_engine_wall")))); + } +} diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMetalRecipeHelper.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMetalRecipeHelper.java deleted file mode 100644 index 46ada80c..00000000 --- a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMetalRecipeHelper.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.rae.creatingspace.content.datagen.recipe; - -import com.rae.creatingspace.CreatingSpace; -import com.rae.creatingspace.content.datagen.CSMetalSets; -import com.rae.creatingspace.init.EngineMaterialInit; -import com.rae.creatingspace.init.ingameobject.ItemInit; -import com.simibubi.create.AllTags; -import com.simibubi.create.foundation.data.recipe.PressingRecipeGen; -import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.InventoryChangeTrigger; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.RecipeCategory; -import net.minecraft.data.recipes.RecipeOutput; -import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.data.recipes.ShapelessRecipeBuilder; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; - -import java.util.concurrent.CompletableFuture; - -import static com.rae.creatingspace.CreatingSpace.resource; - -public class CSMetalRecipeHelper { - - public static void generateMetalRecipes(RecipeOutput output, CSMetalSets.MetalSet metal) { - // 9 Nuggets → 1 Ingot - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, metal.ingot()) - .define('#', AllTags.commonItemTag("nuggets/" + metal.name())) - .pattern("###") - .pattern("###") - .pattern("###") - .unlockedBy("has_nugget", has(metal.nugget())) - .save(output, resource(metal.name() + "_ingot_from_nuggets")); - - // 1 Ingot → 9 Nuggets - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, metal.nugget(), 9) - .requires(AllTags.commonItemTag("ingots/" + metal.name())) - .unlockedBy("has_ingot", has(metal.ingot())) - .save(output, resource(metal.name() + "_nugget")); - - // 9 Ingots → 1 Block - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, metal.block()) - .define('#', AllTags.commonItemTag("ingots/" + metal.name())) - .pattern("###") - .pattern("###") - .pattern("###") - .unlockedBy("has_ingot", has(metal.ingot())) - .save(output, resource(metal.name() + "_block")); - - // 1 Block → 9 Ingots - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, metal.ingot(), 9) - .requires(AllTags.commonItemTag("storage_blocks/" + metal.name())) - .unlockedBy("has_block", has(metal.block())) - .save(output, resource(metal.name() + "_ingot_from_block")); - } - - public static void generateMetalAlloyRecipes(RecipeOutput output, CSMetalSets.MetalSet metal) { - // 9 Nuggets → 1 Ingot - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, metal.ingot()) - .define('#', AllTags.commonItemTag("nuggets/" + metal.name())) - .pattern("###") - .pattern("###") - .pattern("###") - .unlockedBy("has_nugget", has(metal.nugget())) - .save(output, ResourceLocation.fromNamespaceAndPath(CreatingSpace.MODID, metal.name() + "_ingot_from_nuggets")); - - // 1 Ingot → 9 Nuggets - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, metal.nugget(), 9) - .requires(AllTags.commonItemTag("ingots/" + metal.name())) - .unlockedBy("has_ingot", has(metal.ingot())) - .save(output, ResourceLocation.fromNamespaceAndPath(CreatingSpace.MODID, metal.name() + "_nugget")); - - // 9 Ingots → 1 Block - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, metal.block()) - .define('#', AllTags.commonItemTag("ingots/" + metal.name())) - .pattern("###") - .pattern("###") - .pattern("###") - .unlockedBy("has_ingot", has(metal.ingot())) - .save(output, ResourceLocation.fromNamespaceAndPath(CreatingSpace.MODID, metal.name() + "_block")); - - // 1 Block → 9 Ingots - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, metal.ingot(), 9) - .requires(AllTags.commonItemTag("storage_blocks/" + metal.name())) - .unlockedBy("has_block", has(metal.block())) - .save(output, ResourceLocation.fromNamespaceAndPath(CreatingSpace.MODID, metal.name() + "_ingot_from_block")); - } - - public static void generateMetalPressingRecipes(RecipeOutput output, CSMetalSets.MetalSet metal) { - - } - - // helper for criteria - private static Criterion has(Item item) { - return InventoryChangeTrigger.TriggerInstance.hasItems(item); - } - - private ResourceLocation createLocation(String recipeName) { - return ResourceLocation.fromNamespaceAndPath(CreatingSpace.MODID, recipeName); - } -} - diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMixingRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMixingRecipeGen.java new file mode 100644 index 00000000..c53d8a63 --- /dev/null +++ b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSMixingRecipeGen.java @@ -0,0 +1,64 @@ +package com.rae.creatingspace.content.datagen.recipe; + +import com.rae.creatingspace.CreatingSpace; +import com.simibubi.create.api.data.recipe.MixingRecipeGen; +import com.simibubi.create.content.processing.recipe.HeatCondition; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Items; + +import java.util.concurrent.CompletableFuture; + +import static com.rae.creatingspace.CreatingSpace.resource; +import static com.simibubi.create.AllTags.commonItemTag; + +@SuppressWarnings("unused") +public class CSMixingRecipeGen extends MixingRecipeGen { + + GeneratedRecipe + + COPRONICKEL_INGOT = create("copronickel_ingot", b -> b + .require(Items.COPPER_INGOT) + .require(Items.COPPER_INGOT) + .require(commonItemTag("ingots/nickel")) + .output(BuiltInRegistries.ITEM.get(resource("copronickel_ingot")), 2) + .requiresHeat(HeatCondition.HEATED)), + + HASTELLOY_INGOT = create("hastelloy_ingot", b -> b + .require(Items.COPPER_INGOT) + .require(Items.IRON_INGOT) + .require(commonItemTag("ingots/nickel")) + .require(commonItemTag("ingots/nickel")) + .require(commonItemTag("ingots/cobalt")) + .require(commonItemTag("ingots/cobalt")) + .output(BuiltInRegistries.ITEM.get(resource("copronickel_ingot")), 1) + .requiresHeat(HeatCondition.SUPERHEATED)), + + INCONEL_INGOT = create("inconel_ingot", b -> b + .require(Items.IRON_INGOT) + .require(commonItemTag("ingots/nickel")) + .require(commonItemTag("ingots/nickel")) + .output(BuiltInRegistries.ITEM.get(resource("inconel_ingot")), 1) + .requiresHeat(HeatCondition.SUPERHEATED)), + + MONEL_INGOT = create("monel_ingot", b -> b + .require(Items.COPPER_INGOT) + .require(commonItemTag("ingots/nickel")) + .require(commonItemTag("ingots/nickel")) + .output(BuiltInRegistries.ITEM.get(resource("monel_ingot")), 1) + .requiresHeat(HeatCondition.SUPERHEATED)), + + REINFORCED_COPPER_INGOT = create("inconel_ingot", b -> b + .require(Items.IRON_INGOT) + .require(Items.COPPER_INGOT) + .require(Items.COPPER_INGOT) + .output(BuiltInRegistries.ITEM.get(resource("reinforced_copper_ingot")), 1) + .requiresHeat(HeatCondition.HEATED)); + + public CSMixingRecipeGen(PackOutput output, CompletableFuture registries, String defaultNamespace) { + super(output, registries, CreatingSpace.MODID); + } + + +} diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSPressingRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSPressingRecipeGen.java index 5621b6f9..83604bac 100644 --- a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSPressingRecipeGen.java +++ b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSPressingRecipeGen.java @@ -1,57 +1,48 @@ package com.rae.creatingspace.content.datagen.recipe; -import com.rae.creatingspace.content.datagen.CSRecipeProvider; import com.rae.creatingspace.init.ingameobject.ItemInit; import com.simibubi.create.AllRecipeTypes; -import com.simibubi.create.AllTags; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer; -import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen; -import net.createmod.catnip.registry.RegisteredObjectsHelper; + +import com.simibubi.create.api.data.recipe.PressingRecipeGen; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.level.ItemLike; import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; -import java.util.function.UnaryOperator; + import static com.rae.creatingspace.CreatingSpace.resource; +import static com.simibubi.create.AllTags.commonItemTag; @SuppressWarnings("unused") -public class CSPressingRecipeGen extends ProcessingRecipeGen { +public class CSPressingRecipeGen extends PressingRecipeGen { GeneratedRecipe ALUMINUM_SHEET = create(resource("aluminum_sheet"), b -> b - .require(AllTags.commonItemTag("ingots/aluminum")) + .require(commonItemTag("ingots/aluminum")) .output(ItemInit.ALUMINUM_SHEET)), - NICKEL_SHEET = create(resource( "nickel_sheet"), b -> b.require(AllTags.commonItemTag("ingots/nickel")) + NICKEL_SHEET = create(resource( "nickel_sheet"), b -> b.require(commonItemTag("ingots/nickel")) .output(ItemInit.NICKEL_SHEET)), - COBALT_SHEET = create(resource("cobalt_sheet"), b -> b.require(AllTags.commonItemTag("ingots/cobalt")) + COBALT_SHEET = create(resource("cobalt_sheet"), b -> b.require(commonItemTag("ingots/cobalt")) .output(ItemInit.COBALT_SHEET)), COPRONICKEL_SHEET = create(resource("copronickel_sheet"), b -> b - .require(AllTags.commonItemTag("ingots/copronickel")) + .require(commonItemTag("ingots/copronickel")) .output(resource("copronickel_sheet"))), REINFORCED_COPPER_SHEET = create(resource("reinforced_copper_sheet"), b -> b - .require(AllTags.commonItemTag("ingots/reinforced_copper")) + .require(commonItemTag("ingots/reinforced_copper")) .output(resource("reinforced_copper_sheet"))), MONEL_SHEET = create(resource("monel_sheet"), b -> b - .require(AllTags.commonItemTag("ingots/monel")) + .require(commonItemTag("ingots/monel")) .output(resource("monel_sheet"))), INCONEL_SHEET = create(resource("inconel_sheet"), b -> b - .require(AllTags.commonItemTag("ingots/inconel")) + .require(commonItemTag("ingots/inconel")) .output(resource("inconel_sheet"))), HASTELLOY_SHEET = create(resource("hastelloy_sheet"), b -> b - .require(AllTags.commonItemTag("ingots/hastelloy")) + .require(commonItemTag("ingots/hastelloy")) .output(resource("hastelloy_sheet"))); - public CSPressingRecipeGen(PackOutput output, CompletableFuture registries) { - super(output, registries); + public CSPressingRecipeGen(PackOutput output, CompletableFuture registries, String defaultNamespace) { + super(output, registries, defaultNamespace); } @Override diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSStandardRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSStandardRecipeGen.java index f68d0db5..8b58df47 100644 --- a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSStandardRecipeGen.java +++ b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSStandardRecipeGen.java @@ -4,16 +4,11 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import com.rae.creatingspace.content.datagen.CSMetalSets; import com.rae.creatingspace.content.datagen.CSRecipeProvider; -import com.rae.creatingspace.init.ingameobject.BlockInit; import com.rae.creatingspace.init.ingameobject.ItemInit; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.simibubi.create.AllTags; import com.simibubi.create.foundation.data.recipe.CompatMetals; import com.simibubi.create.foundation.data.recipe.Mods; -import com.simibubi.create.foundation.data.recipe.PressingRecipeGen; import com.simibubi.create.foundation.mixin.accessor.MappedRegistryAccessor; import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.entry.ItemEntry; @@ -32,7 +27,6 @@ import net.minecraft.network.codec.StreamCodec; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -60,267 +54,44 @@ public class CSStandardRecipeGen extends CSRecipeProvider { - private Marker RESOURCES = enterFolder("resources"); - - /* - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ItemInit.ALUMINUM_NUGGET.get(), 9) - .requires(AllTags.commonItemTag("ingots/aluminum")) - .unlockedBy("has_aluminum_ingot", has(ItemInit.ALUMINUM_INGOT)).save(recipeOutput, createSimpleLocation("aluminum_nugget")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ItemInit.ALUMINUM_INGOT.get(), 9) - .requires(AllTags.commonItemTag("storage_blocks/aluminum")) - .unlockedBy("has_aluminum_ingot", has(ItemInit.ALUMINUM_INGOT)).save(recipeOutput, withSuffix("_from_block").createLocation("aluminum_ingot")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ItemInit.ALUMINUM_INGOT.get()) - .pattern("###") - .pattern("###") - .pattern("###") - .define('#', AllTags.commonItemTag("nuggets/aluminum")) - .unlockedBy("has_aluminum_ingot", has(ItemInit.ALUMINUM_INGOT)) - .save(recipeOutput, withSuffix("_from_nuggets").createLocation("aluminum_ingot")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, BlockInit.ALUMINUM_BLOCK.get()) - .pattern("###") - .pattern("###") - .pattern("###") - .define('#', AllTags.commonItemTag("ingots/aluminum")) - .unlockedBy("has_aluminum_ingot", has(ItemInit.ALUMINUM_INGOT)) - .save(recipeOutput, createSimpleLocation("aluminum_block")); - - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ItemInit.NICKEL_NUGGET.get(), 9) - .requires(AllTags.commonItemTag("ingots/nickel")) - .unlockedBy("has_nickel_ingot", has(ItemInit.NICKEL_INGOT)).save(recipeOutput, createSimpleLocation("nickel_nugget")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ItemInit.NICKEL_INGOT.get(), 9) - .requires(AllTags.commonItemTag("storage_blocks/nickel")) - .unlockedBy("has_nickel_ingot", has(ItemInit.NICKEL_INGOT)).save(recipeOutput, withSuffix("_from_block").createLocation("nickel_ingot")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ItemInit.NICKEL_INGOT.get()) - .pattern("###") - .pattern("###") - .pattern("###") - .define('#', AllTags.commonItemTag("nuggets/nickel")) - .unlockedBy("has_nickel_ingot", has(ItemInit.NICKEL_INGOT)) - .save(recipeOutput, withSuffix("_from_nuggets").createLocation("nickel_ingot")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, BlockInit.NICKEL_BLOCK.get()) - .pattern("###") - .pattern("###") - .pattern("###") - .define('#', AllTags.commonItemTag("ingots/nickel")) - .unlockedBy("has_nickel_ingot", has(ItemInit.NICKEL_INGOT)) - .save(recipeOutput, createSimpleLocation("nickel_block")); - - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ItemInit.COBALT_NUGGET.get(), 9) - .requires(AllTags.commonItemTag("ingots/cobalt")) - .unlockedBy("has_cobalt_ingot", has(ItemInit.COBALT_INGOT)).save(recipeOutput, createSimpleLocation("cobalt_nugget")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ItemInit.COBALT_INGOT.get(), 9) - .requires(AllTags.commonItemTag("storage_blocks/cobalt")) - .unlockedBy("has_cobalt_ingot", has(ItemInit.COBALT_INGOT)).save(recipeOutput, withSuffix("_from_block").createLocation("cobalt_ingot")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ItemInit.COBALT_INGOT.get()) - .pattern("###") - .pattern("###") - .pattern("###") - .define('#', AllTags.commonItemTag("nuggets/cobalt")) - .unlockedBy("has_cobalt_ingot", has(ItemInit.COBALT_INGOT)) - .save(recipeOutput, withSuffix("_from_nuggets").createLocation("cobalt_ingot")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, BlockInit.COBALT_BLOCK.get()) - .pattern("###") - .pattern("###") - .pattern("###") - .define('#', AllTags.commonItemTag("ingots/cobalt")) - .unlockedBy("has_cobalt_ingot", has(ItemInit.COBALT_INGOT)) - .save(recipeOutput, createSimpleLocation("cobalt_block")); - */ - - - private Marker ARMOR = enterFolder("armor"); + private Marker MISC = enterFolder("misc"); GeneratedRecipe - ADVANCED_SPACESUIT_BOOTS = create(ItemInit.ADVANCED_SPACESUIT_BOOTS).returns(1) - .unlockedBy(ItemInit.ADVANCED_SPACESUIT_FABRIC::get) - .viaShaped(b -> b.define('F', ItemInit.ADVANCED_SPACESUIT_FABRIC::get) - .pattern("F F") - .pattern("F F")), - - ADVANCED_SPACESUIT_HELMET = create(ItemInit.ADVANCED_SPACESUIT_HELMET).returns(1) - .unlockedBy(ItemInit.ADVANCED_SPACESUIT_FABRIC::get) - .viaShaped(b -> b.define('F', ItemInit.ADVANCED_SPACESUIT_FABRIC::get) - .define('G', AllItems.GOLDEN_SHEET::get) - .pattern("FFF") - .pattern("FGF")), - - ADVANCED_SPACESUIT_LEGGINGS = create(ItemInit.ADVANCED_SPACESUIT_LEGGINGS).returns(1) - .unlockedBy(ItemInit.ADVANCED_SPACESUIT_FABRIC::get) - .viaShaped(b -> b.define('F', ItemInit.ADVANCED_SPACESUIT_FABRIC::get) - .pattern("FFF") - .pattern("F F") - .pattern("F F")), - - BASIC_SPACESUIT_BOOTS = create(ItemInit.BASIC_SPACESUIT_BOOTS).returns(1) - .unlockedBy(ItemInit.BASIC_SPACESUIT_FABRIC::get) - .viaShaped(b -> b.define('F', ItemInit.BASIC_SPACESUIT_FABRIC::get) - .pattern("F F") - .pattern("F F")), - - BASIC_SPACESUIT_HELMET = create(ItemInit.BASIC_SPACESUIT_HELMET).returns(1) - .unlockedBy(ItemInit.BASIC_SPACESUIT_FABRIC::get) - .viaShaped(b -> b.define('F', ItemInit.BASIC_SPACESUIT_FABRIC::get) - .define('G', AllItems.GOLDEN_SHEET::get) - .pattern("FFF") - .pattern("FGF")), - - BASIC_SPACESUIT_LEGGINGS = create(ItemInit.BASIC_SPACESUIT_LEGGINGS).returns(1) - .unlockedBy(ItemInit.BASIC_SPACESUIT_FABRIC::get) - .viaShaped(b -> b.define('F', ItemInit.BASIC_SPACESUIT_FABRIC::get) - .pattern("FFF") - .pattern("F F") - .pattern("F F")) - ; - - Marker MACHINES = enterFolder("machines"); + COBALT_ORE = create(ItemInit.COBALT_INGOT::get).withSuffix("_from_ore") + .viaCookingTag(() -> AllTags.commonItemTag("ores/cobalt")) + .rewardXP(1) + .inBlastFurnace(), - GeneratedRecipe + RAW_COBALT_ORE = create(ItemInit.COBALT_INGOT::get).withSuffix("_from_raw_ore") + .viaCookingTag(() -> AllTags.commonItemTag("raw_materials/cobalt")) + .rewardXP(.7f) + .inBlastFurnace(), - AIR_LIQUIFIER = create(BlockInit.AIR_LIQUEFIER).returns(1) - .unlockedBy(AllBlocks.FLUID_TANK::get) - .viaShaped(b -> b.define('S', AllItems.BRASS_SHEET::get) - .define('T', AllBlocks.FLUID_TANK.get()) - .define('C', AllBlocks.BRASS_CASING.get()) - .define('P', AllBlocks.ENCASED_FAN.get()) - .pattern(" S ") - .pattern("CPC") - .pattern(" T ")), - - CATALYST_CARRIER = create(BlockInit.CATALYST_CARRIER).returns(1) - .unlockedBy(AllBlocks.MECHANICAL_PRESS::get) - .viaShaped(b -> b - .define('N', AllTags.commonItemTag("ingots/nickel")) - .define('G', AllTags.commonItemTag("plates/gold")) - .define('P', AllBlocks.MECHANICAL_PRESS.get()) - .pattern(" G ") - .pattern("NPN") - .pattern(" G ")), - - CLAMPS = create(BlockInit.CLAMPS).returns(4) - .unlockedBy(AllBlocks.COPPER_CASING::get) - .viaShaped(b -> b - .define('I', Blocks.IRON_BLOCK) - .define('C', AllBlocks.COPPER_CASING.get()) - .pattern("ICI") - .pattern("CIC") - .pattern("ICI")), - - CRYOGENIC_TANK = create(BlockInit.CRYOGENIC_TANK).returns(1) - .unlockedBy(AllBlocks.FLUID_TANK::get) - .viaShaped(b -> b - .define('N', AllTags.commonItemTag("plates/nickel")) - .define('W', Items.RED_WOOL) - .define('T', AllBlocks.FLUID_TANK.get()) - .pattern("NWN") - .pattern("WTW") - .pattern("NWN")), - - FLIGHT_RECORDER = create(BlockInit.FLIGHT_RECORDER).returns(1) - .unlockedBy(AllBlocks.BRASS_CASING::get) - .viaShaped(b -> b - .define('B', AllBlocks.BRASS_CASING.get()) - .define('A', AllBlocks.SHAFT.get()) - .define('K', Items.DRIED_KELP_BLOCK) - .pattern(" B ") - .pattern("AKA") - .pattern(" B ")), - - FLOW_METER = create(BlockInit.FLOW_METER).returns(1) - .unlockedBy(AllBlocks.COPPER_CASING::get) - .viaShaped(b -> b - .define('C', AllBlocks.COPPER_CASING.get()) - .define('G', Items.COMPASS) - .pattern("G") - .pattern("C")), - - MECHANICAL_ELECTROLYZER = create(BlockInit.MECHANICAL_ELECTROLYZER).returns(1) - .unlockedBy(AllBlocks.FLUID_TANK::get) - .viaShaped(b -> b - .define('C', ItemInit.COPPER_COIL.get()) - .define('X', AllBlocks.COPPER_CASING.get()) - .define('T', AllBlocks.FLUID_TANK.get()) - .define('S', AllBlocks.SHAFT.get()) - .define('G', AllTags.commonItemTag("plates/gold")) - .pattern("XSX") - .pattern("CCC") - .pattern("GTG")), - - OXYGEN_SEALER = create(BlockInit.OXYGEN_SEALER).returns(1) - .unlockedBy(AllBlocks.FLUID_TANK::get) - .viaShaped(b -> b - .define('P', AllItems.PROPELLER.get()) - .define('C', AllBlocks.COPPER_CASING.get()) - .define('T', AllBlocks.FLUID_TANK.get()) - .define('N', AllTags.commonItemTag("plates/nickel")) - .pattern("NPN") - .pattern("CTC") - .pattern("CCC")), - - ROCKET_CASING = create(BlockInit.ROCKET_CASING).returns(1) - .unlockedBy(ItemInit.COBALT_INGOT::get) - .viaShaped(b -> b - .define('S', AllTags.commonItemTag("plates/aluminum")) - .define('C', AllTags.commonItemTag("ingots/cobalt")) - .pattern("CSC") - .pattern("SCS") - .pattern("CSC")), - - ROCKET_CONTROLS_RESET = create(BlockInit.ROCKET_CONTROLS).withSuffix("_reset").returns(1) - .unlockedBy(BlockInit.ROCKET_CONTROLS::get) - .viaShapeless(b -> b - .requires(BlockInit.ROCKET_CONTROLS.get())), - - ROCKET_CONTROLS = create(BlockInit.ROCKET_CONTROLS).returns(1) - .unlockedBy(AllBlocks.TRAIN_CONTROLS::get) - .viaShaped(b -> b - .define('E', AllItems.ELECTRON_TUBE.get()) - .define('R', AllBlocks.REDSTONE_LINK.get()) - .define('T', AllBlocks.TRAIN_CONTROLS.get()) - .define('S', AllItems.STURDY_SHEET.get()) - .pattern("ERE") - .pattern("ETE") - .pattern("SSS")), - - ROCKET_ENGINEER_TABLE = create(BlockInit.ROCKET_ENGINEER_TABLE).returns(1) - .unlockedBy(BlockInit.ROCKET_ENGINEER_TABLE::get) - .viaShaped(b -> b - .define('W', ItemTags.WOODEN_SLABS) - .define('S', Items.SMOOTH_STONE) - .pattern("WWW") - .pattern("WWW") - .pattern(" S ")) - ; + ALUMINUM_ORE = create(ItemInit.ALUMINUM_INGOT::get).withSuffix("_from_ore") + .viaCookingTag(() -> AllTags.commonItemTag("ores/aluminum")) + .rewardXP(1) + .inBlastFurnace(), - private Marker MISC = enterFolder("misc"); + RAW_ALUMINUM_ORE = create(ItemInit.ALUMINUM_INGOT::get).withSuffix("_from_raw_ore") + .viaCookingTag(() -> AllTags.commonItemTag("raw_materials/aluminum")) + .rewardXP(.7f) + .inBlastFurnace(), - GeneratedRecipe + NICKEL_ORE = create(ItemInit.NICKEL_INGOT::get).withSuffix("_from_ore") + .viaCookingTag(() -> AllTags.commonItemTag("ores/nickel")) + .rewardXP(1) + .inBlastFurnace(), + + RAW_NICKEL_ORE = create(ItemInit.NICKEL_INGOT::get).withSuffix("_from_raw_ore") + .viaCookingTag(() -> AllTags.commonItemTag("raw_materials/nickel")) + .rewardXP(.7f) + .inBlastFurnace(), + + CRUSHED_COBALT = blastCrushedMetal(() -> ItemInit.COBALT_INGOT, ItemInit.CRUSHED_COBALT_ORE::get), + CRUSHED_ALUMINUM = blastCrushedMetal(() -> ItemInit.ALUMINUM_INGOT, ItemInit.CRUSHED_ALUMINUM_ORE::get), + CRUSHED_NICKEL = blastCrushedMetal(() -> ItemInit.NICKEL_INGOT, ItemInit.CRUSHED_NICKEL_ORE::get); - COPPER_COIL = create(ItemInit.COPPER_COIL).returns(1) - .unlockedBy(ItemInit.COPPER_COIL::get) - .viaShaped(b -> b - .define('C', AllTags.commonItemTag("ingots/copper")) - .pattern("CCC") - .pattern("C C") - .pattern("CCC")), - - STARTER_CHARGE = create(ItemInit.STARTER_CHARGE).returns(1) - .unlockedBy(ItemInit.STARTER_CHARGE::get) - .viaShaped(b -> b - .define('P', Items.PAPER) - .define('G', Items.GUNPOWDER) - .pattern("PGP") - .pattern("PGP") - .pattern("PGP")), - - STURDY_PROPELLER = create(ItemInit.STURDY_PROPELLER).returns(1) - .unlockedBy(AllItems.STURDY_SHEET::get) - .viaShaped(b -> b - .define('I', Items.IRON_INGOT) - .define('S', AllItems.STURDY_SHEET) - .pattern(" S ") - .pattern("SIS") - .pattern(" S ")); String currentFolder = ""; @@ -554,7 +325,7 @@ GeneratedCookingRecipeBuilder viaCookingIngredient(Supplier ingredie return new GeneratedCookingRecipeBuilder(ingredient); } - class GeneratedCookingRecipeBuilder { + public class GeneratedCookingRecipeBuilder { private Supplier ingredient; private float exp; diff --git a/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSWashingRecipeGen.java b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSWashingRecipeGen.java new file mode 100644 index 00000000..a76d9c60 --- /dev/null +++ b/src/main/java/com/rae/creatingspace/content/datagen/recipe/CSWashingRecipeGen.java @@ -0,0 +1,45 @@ +package com.rae.creatingspace.content.datagen.recipe; + +import com.rae.creatingspace.CreatingSpace; +import com.rae.creatingspace.init.ingameobject.BlockInit; +import com.rae.creatingspace.init.ingameobject.ItemInit; +import com.simibubi.create.api.data.recipe.WashingRecipeGen; +import com.tterrag.registrate.util.entry.ItemEntry; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; + +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; + +@SuppressWarnings("unused") +public class CSWashingRecipeGen extends WashingRecipeGen { + public CSWashingRecipeGen(PackOutput output, CompletableFuture registries, String defaultNamespace) { + super(output, registries, CreatingSpace.MODID); + } + + GeneratedRecipe + + MOON_REGOLITH = create(() -> BlockInit.MOON_REGOLITH, b -> b + .output(.125f, Items.GOLD_NUGGET, 2) + .output(.08f, ItemInit.NICKEL_NUGGET, 2) + .output(.04f, ItemInit.ALUMINUM_NUGGET) + .output(.04f, ItemInit.COBALT_NUGGET)), + + MARS_REGOLITH = create(() -> BlockInit.MARS_REGOLITH, b -> b + .output(.125f, ItemInit.COBALT_NUGGET, 3) + .output(.08f, ItemInit.NICKEL_NUGGET, 3) + .output(.04f, ItemInit.ALUMINUM_NUGGET, 3)), + + CRUSHED_ALUMINUM = crushedOreNoSecondary(ItemInit.CRUSHED_ALUMINUM_ORE, ItemInit.ALUMINUM_NUGGET::get), + CRUSHED_NICKEL = crushedOreNoSecondary(ItemInit.CRUSHED_NICKEL_ORE, ItemInit.NICKEL_NUGGET::get), + CRUSHED_COBALT = crushedOreNoSecondary(ItemInit.CRUSHED_COBALT_ORE, ItemInit.COBALT_NUGGET::get); + + + public GeneratedRecipe crushedOreNoSecondary(ItemEntry crushed, Supplier nugget) { + return create(crushed::get, b -> b.output(nugget.get(), 9)); + } + +} diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java index 0f734729..c35dd1eb 100644 --- a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java +++ b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java @@ -29,7 +29,11 @@ import com.rae.creatingspace.content.rocket.engine.EngineItem; import com.rae.creatingspace.legacy.server.items.SmallEngineItem; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllItems; import com.simibubi.create.AllTags; +//import com.simibubi.create.api.data.recipe.MechanicalCraftingRecipeBuilder; +import com.simibubi.create.api.data.recipe.MechanicalCraftingRecipeBuilder; import com.simibubi.create.content.decoration.encasing.CasingBlock; import com.simibubi.create.content.processing.AssemblyOperatorBlockItem; import com.simibubi.create.foundation.data.*; @@ -38,7 +42,11 @@ import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.ShovelItem; import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; @@ -47,6 +55,7 @@ import static com.rae.creatingspace.CreatingSpace.REGISTRATE; import static com.rae.creatingspace.CreatingSpace.resource; import static com.simibubi.create.AllTags.commonItemTag; +import static com.simibubi.create.AllTags.optionalTag; import static com.simibubi.create.api.behaviour.interaction.MovingInteractionBehaviour.interactionBehaviour; import static com.simibubi.create.api.behaviour.movement.MovementBehaviour.movementBehaviour; import static com.simibubi.create.foundation.data.ModelGen.customItemModel; @@ -58,11 +67,19 @@ public class BlockInit { REGISTRATE.setCreativeTab(CreativeModeTabsInit.MACHINE_TAB); } //just blocks - //TODO add geode's blocks public static final BlockEntry ROCKET_ENGINEER_TABLE = REGISTRATE .block("rocket_engineer_table", RocketEngineerTableBlock::new) .properties(p -> p.strength(1.0f).noOcclusion()) .blockstate((c, p)-> p.horizontalBlock(c.getEntry(), p.models().getExistingFile(c.getId()))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('W', ItemTags.WOODEN_SLABS) + .define('S', Items.SMOOTH_STONE) + .pattern("WWW") + .pattern("WWW") + .pattern(" S ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .build().register(); public static final BlockEntry SMALL_ROCKET_ENGINE = REGISTRATE @@ -129,12 +146,30 @@ public class BlockInit { public static final BlockEntry CLAMPS = REGISTRATE .block("clamps",Block::new).initialProperties(()-> Blocks.STONE) .properties(p -> p.strength(1.0f)) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 4) + .define('I', Blocks.IRON_BLOCK) + .define('C', AllBlocks.COPPER_CASING.get()) + .pattern("ICI") + .pattern("CIC") + .pattern("ICI") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .transform(customItemModel("clamps")) .register(); public static final BlockEntry ROCKET_CASING = REGISTRATE .block("rocket_casing",CasingBlock::new) .transform(BuilderTransformers.casing(() -> SpriteShiftInit.ROCKET_CASING)) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('S', AllTags.commonItemTag("plates/aluminum")) + .define('C', AllTags.commonItemTag("ingots/cobalt")) + .pattern("CSC") + .pattern("SCS") + .pattern("CSC") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .build() .register(); @@ -145,6 +180,22 @@ public class BlockInit { .properties(p -> p.strength(1.0f).dynamicShape().noOcclusion().requiresCorrectToolForDrops()) .transform(axeOrPickaxe()) .onRegister(interactionBehaviour(new RocketControlInteraction())) + .recipe((c,p) -> { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('E', AllItems.ELECTRON_TUBE.get()) + .define('R', AllBlocks.REDSTONE_LINK.get()) + .define('T', AllBlocks.TRAIN_CONTROLS.get()) + .define('S', AllItems.STURDY_SHEET.get()) + .pattern("ERE") + .pattern("ETE") + .pattern("SSS") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName())); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 1) + .requires(c.get()) + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/" + c.getName() + "_reset")); + }) .item(RocketControlsItem::new) .transform(customItemModel("rocket_controls")) .register(); @@ -155,6 +206,16 @@ public class BlockInit { .blockstate(BlockStateGen.directionalAxisBlockProvider()) .transform(axeOrPickaxe()) .onRegister(interactionBehaviour(new FlightRecorderInteraction())) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('B', AllBlocks.BRASS_CASING.get()) + .define('A', AllBlocks.SHAFT.get()) + .define('K', Items.DRIED_KELP_BLOCK) + .pattern(" B ") + .pattern("AKA") + .pattern(" B ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .transform(customItemModel()) .register(); @@ -167,6 +228,18 @@ public class BlockInit { .blockstate(BlockStateGen.horizontalBlockProvider(true)) .transform(CSStress.setImpact(2000)) .transform(axeOrPickaxe()) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('C', ItemInit.COPPER_COIL.get()) + .define('X', AllBlocks.COPPER_CASING.get()) + .define('T', AllBlocks.FLUID_TANK.get()) + .define('S', AllBlocks.SHAFT.get()) + .define('G', commonItemTag("plates/gold")) + .pattern("XSX") + .pattern("CCC") + .pattern("GTG") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .transform(customItemModel()) .onRegisterAfter(Registries.ITEM, i -> ItemDescription.useKey(i, "block.creatingspace.mechanical_electrolyzer")) @@ -178,6 +251,16 @@ public class BlockInit { .transform(axeOrPickaxe()) .blockstate(BlockStateGen.horizontalBlockProvider(true)) .transform(CSStress.setImpact(8.0)) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('N', commonItemTag("ingots/nickel")) + .define('G', commonItemTag("plates/gold")) + .define('P', AllBlocks.MECHANICAL_PRESS.get()) + .pattern(" G ") + .pattern("NPN") + .pattern(" G ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item(AssemblyOperatorBlockItem::new) .transform(customItemModel()) .register(); @@ -186,9 +269,19 @@ public class BlockInit { .block("oxygen_sealer", RoomPressuriserBlock::new) .properties(p -> p.strength(1.0f).dynamicShape().requiresCorrectToolForDrops()) .blockstate(BlockStateGen.directionalAxisBlockProvider()) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('P', AllItems.PROPELLER.get()) + .define('C', AllBlocks.COPPER_CASING.get()) + .define('T', AllBlocks.FLUID_TANK.get()) + .define('N', commonItemTag("plates/nickel")) + .pattern("NPN") + .pattern("CTC") + .pattern("CCC") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .transform(customItemModel()) - // .build() .register(); public static final BlockEntry AIR_LIQUEFIER = REGISTRATE.block( "air_liquefier", AirLiquefierBlock::new) @@ -197,6 +290,17 @@ public class BlockInit { .blockstate(BlockStateGen.directionalAxisBlockProvider()) .transform(CSStress.setImpact(500)) .transform(axeOrPickaxe()) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('S', commonItemTag("plates/brass")) + .define('T', AllBlocks.FLUID_TANK.get()) + .define('C', AllBlocks.BRASS_CASING.get()) + .define('P', AllBlocks.ENCASED_FAN.get()) + .pattern(" S ") + .pattern("CPC") + .pattern(" T ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .transform(customItemModel()) .register(); @@ -207,6 +311,14 @@ public class BlockInit { .blockstate((c, p) -> p.getVariantBuilder(c.get()) .forAllStatesExcept(BlockStateGen.mapToAir(p), FlowGaugeBlock.FACING)) .transform(axeOrPickaxe()) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('C', AllBlocks.COPPER_CASING.get()) + .define('G', Items.COMPASS) + .pattern("G") + .pattern("C") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item() .transform(customItemModel("flow_meter/block")) .register(); @@ -216,6 +328,16 @@ public class BlockInit { .initialProperties(SharedProperties::copperMetal) .blockstate((c,p)-> p.horizontalBlock(c.getEntry(),p.models().getExistingFile(resource("block/oxygen_backtank/copper")))) .properties(BlockBehaviour.Properties::dynamicShape) + .recipe((c,p) -> + MechanicalCraftingRecipeBuilder.shapedRecipe(c.get(), 1) + .key('F', ItemInit.BASIC_SPACESUIT_FABRIC.get()) + .key('N', commonItemTag("plates/nickel")) + .key('W', Items.RED_WOOL) + .key('T', AllBlocks.FLUID_TANK.get()) + .patternLine(" F F ") + .patternLine("WTNTW") + .patternLine(" FWF ") + .build(p, resource("mechanical_crafting/armor/" + c.getName()))) .transform(pickaxeOnly()) .register(); @@ -224,6 +346,16 @@ public class BlockInit { .initialProperties(SharedProperties::netheriteMetal) .blockstate((c,p)-> p.horizontalBlock(c.getEntry(),p.models().getExistingFile(resource("block/oxygen_backtank/netherite")))) .properties(BlockBehaviour.Properties::dynamicShape) + .recipe((c,p) -> + MechanicalCraftingRecipeBuilder.shapedRecipe(c.get(), 1) + .key('F', ItemInit.ADVANCED_SPACESUIT_FABRIC.get()) + .key('N', commonItemTag("plates/aluminum")) + .key('W', Items.WHITE_WOOL) + .key('T', AllBlocks.FLUID_TANK.get()) + .patternLine(" F F ") + .patternLine("WTNTW") + .patternLine(" FWF ") + .build(p, resource("mechanical_crafting/armor/" + c.getName()))) .transform(pickaxeOnly()) .register(); @@ -232,6 +364,16 @@ public class BlockInit { .initialProperties(SharedProperties::copperMetal) .blockstate((c,p)-> p.simpleBlock(c.getEntry(), p.models().getExistingFile(resource("block/cryogenic_tank")))) .transform(pickaxeOnly()) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('N', commonItemTag("plates/nickel")) + .define('W', Items.RED_WOOL) + .define('T', AllBlocks.FLUID_TANK.get()) + .pattern("NWN") + .pattern("WTW") + .pattern("NWN") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/machines/" + c.getName()))) .item(CryogenicTankItem::new) .build() .register(); diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java index fb331c9d..d2c79374 100644 --- a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java +++ b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java @@ -1,6 +1,7 @@ package com.rae.creatingspace.init.ingameobject; import com.rae.creatingspace.CreatingSpace; +import com.rae.creatingspace.content.datagen.recipe.CSStandardRecipeGen; import com.rae.creatingspace.init.CreativeModeTabsInit; import com.rae.creatingspace.init.EngineMaterialInit; import com.rae.creatingspace.init.TagsInit; @@ -8,6 +9,10 @@ import com.rae.creatingspace.content.life_support.spacesuit.SpacesuitHelmetItem; import com.rae.creatingspace.content.rocket.engine.design.DesignBlueprintItem; import com.rae.creatingspace.content.rocket.engine.table.EngineFabricationBlueprint; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllItems; +import com.simibubi.create.AllTags; +import com.simibubi.create.api.data.recipe.BaseRecipeProvider; import com.simibubi.create.content.equipment.armor.AllArmorMaterials; import com.simibubi.create.content.equipment.armor.BaseArmorItem; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; @@ -16,6 +21,7 @@ import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.tags.ItemTags; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; @@ -23,6 +29,9 @@ import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterials; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.BlastingRecipe; +import net.minecraft.world.item.crafting.Ingredient; import java.util.ArrayList; @@ -45,34 +54,103 @@ public class ItemInit { public static final ArrayList> ENGINE_INGREDIENTS = EngineMaterialInit.collectMaterials(); public static final ArrayList> METALS_INGREDIENTS = EngineMaterialInit.collectMetals(); - public static ArrayList> registerEngineIngredientForMaterial(String name) { ArrayList> collector = new ArrayList<>(); - collector.addAll(smartRegisterSequencedItem(name + "_injector")); collector.addAll(smartRegisterSequencedItem(name + "_turbine")); collector.addAll(smartRegisterSequencedItem(name + "_injector_grid")); collector.add(REGISTRATE.item( name + "_engine_wall", Item::new) - .defaultModel() - .register()); - collector.add(REGISTRATE.item((name + "_blisk"), Item::new) - .defaultModel() - .register()); - collector.add(REGISTRATE.item( - name + "_rib", Item::new) - .defaultModel() .recipe((c,p) -> - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) - .define('N', commonItemTag("nuggets/" + name)) - .define('I', commonItemTag("ingots/" + name)) - .pattern("NIN") - .pattern(" N ") - .unlockedBy("has_" + c.getName(), has(c.get())) - .save(p, resource("crafting/" + name + "_rib"))) + BaseRecipeProvider.GeneratedRecipe() + ).defaultModel() .register()); + // Splitting off Andesite because we had to be difficult XD + if (name == "andesite") { + collector.add(REGISTRATE.item((name + "_blisk"), Item::new) + .defaultModel() + .recipe((c, p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('N', AllItems.ANDESITE_ALLOY) + .define('I', AllBlocks.SHAFT) + .define('P', Items.IRON_NUGGET) + .pattern("NPN") + .pattern("PIP") + .pattern("NPN") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/rocket_ingredients/" + name + "_blisk"))) + .register()); + + collector.add(REGISTRATE.item( + name + "_turbine_shaft", Item::new) + .defaultModel() + .recipe((c, p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('I', AllItems.ANDESITE_ALLOY) + .pattern("I ") + .pattern(" I ") + .pattern(" I") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/rocket_ingredients/" + name + "_turbine_shaft"))) + .register()); + + collector.add(REGISTRATE.item( + name + "_rib", Item::new) + .defaultModel() + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('N', AllItems.ANDESITE_ALLOY) + .define('I', Items.IRON_NUGGET) + .pattern("NIN") + .pattern(" N ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/rocket_ingredients/" + name + "_rib"))) + .register()); + } + else { + collector.add(REGISTRATE.item((name + "_blisk"), Item::new) + .defaultModel() + .recipe((c, p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('N', commonItemTag("nuggets/" + name)) + .define('I', commonItemTag("ingots/" + name)) + .define('P', commonItemTag("plates/" + name)) + .pattern("NPN") + .pattern("PIP") + .pattern("NPN") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/rocket_ingredients/" + name + "_blisk"))) + .register()); + + collector.add(REGISTRATE.item( + name + "_turbine_shaft", Item::new) + .defaultModel() + .recipe((c, p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('I', commonItemTag("ingots/" + name)) + .pattern("I ") + .pattern(" I ") + .pattern(" I") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/rocket_ingredients/" + name + "_turbine_shaft"))) + .register()); + + collector.add(REGISTRATE.item( + name + "_rib", Item::new) + .defaultModel() + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('N', commonItemTag("nuggets/" + name)) + .define('I', commonItemTag("ingots/" + name)) + .pattern("NIN") + .pattern(" N ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/rocket_ingredients/" + name + "_rib"))) + .register()); + } + /*collector.add(CreatingSpace.REGISTRATE.item( name + "_canal", Item::new) .defaultModel() @@ -81,10 +159,6 @@ public static ArrayList> registerEngineIngredientForMa name + "_engine_pipe", Item::new) .defaultModel() .register());*/ - collector.add(REGISTRATE.item( - name + "_turbine_shaft", Item::new) - .defaultModel() - .register()); return collector; } public static ArrayList> registerMetalVariants(String name) { @@ -197,11 +271,28 @@ private static ItemEntry registerSequencedEngineItem(Stri public static final ItemEntry COPPER_COIL = REGISTRATE.item( "copper_coil",Item::new) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('C', AllTags.commonItemTag("ingots/copper")) + .pattern("CCC") + .pattern("C C") + .pattern("CCC") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/misc/" + c.getName()))) .register(); public static final ItemEntry BASIC_CATALYST = REGISTRATE.item( "basic_catalyst",Item::new) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 4) + .define('B', Items.BONE_MEAL) + .define('N', ItemInit.NICKEL_DUST) + .pattern("NBN") + .pattern("BNB") + .pattern("NBN") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/misc/" + c.getName()))) .register(); public static final ItemEntry COAL_DUST = REGISTRATE.item( @@ -441,18 +532,41 @@ private static ItemEntry registerSequencedEngineItem(Stri REGISTRATE .item("basic_spacesuit_leggings", p -> new BaseArmorItem(AllArmorMaterials.COPPER, ArmorItem.Type.LEGGINGS, p, CreatingSpace.resource("basic_spacesuit"))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('F', ItemInit.BASIC_SPACESUIT_FABRIC::get) + .pattern("FFF") + .pattern("F F") + .pattern("F F") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/armor/" + c.getName()))) .tag(ItemTags.LEG_ARMOR) .register(); public static final ItemEntry BASIC_SPACESUIT_BOOTS = REGISTRATE .item("basic_spacesuit_boots", p -> new BaseArmorItem(AllArmorMaterials.COPPER, ArmorItem.Type.BOOTS, p, CreatingSpace.resource("basic_spacesuit"))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('F', ItemInit.BASIC_SPACESUIT_FABRIC::get) + .pattern("F F") + .pattern("F F") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/armor/" + c.getName()))) .tag(ItemTags.FOOT_ARMOR) .register(); public static final ItemEntry BASIC_SPACESUIT_HELMET = REGISTRATE .item("basic_spacesuit_helmet", p -> new SpacesuitHelmetItem(AllArmorMaterials.COPPER, p, CreatingSpace.resource("basic_spacesuit"))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('F', ItemInit.BASIC_SPACESUIT_FABRIC::get) + .define('G', AllItems.GOLDEN_SHEET::get) + .pattern("FFF") + .pattern("FGF") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/armor/" + c.getName()))) .tag(ItemTags.HEAD_ARMOR) .register(); @@ -460,18 +574,41 @@ private static ItemEntry registerSequencedEngineItem(Stri REGISTRATE .item("advanced_spacesuit_leggings", p -> new BaseArmorItem(ArmorMaterials.NETHERITE, ArmorItem.Type.LEGGINGS, p, CreatingSpace.resource("advanced_spacesuit"))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('F', ItemInit.ADVANCED_SPACESUIT_FABRIC::get) + .pattern("FFF") + .pattern("F F") + .pattern("F F") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/armor/" + c.getName()))) .tag(ItemTags.LEG_ARMOR) .register(); public static final ItemEntry ADVANCED_SPACESUIT_BOOTS = REGISTRATE .item("advanced_spacesuit_boots", p -> new BaseArmorItem(ArmorMaterials.NETHERITE, ArmorItem.Type.BOOTS, p, CreatingSpace.resource("advanced_spacesuit"))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('F', ItemInit.ADVANCED_SPACESUIT_FABRIC::get) + .pattern("F F") + .pattern("F F") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/armor/" + c.getName()))) .tag(ItemTags.FOOT_ARMOR) .register(); public static final ItemEntry ADVANCED_SPACESUIT_HELMET = REGISTRATE .item("advanced_spacesuit_helmet", p -> new SpacesuitHelmetItem(ArmorMaterials.NETHERITE, p, CreatingSpace.resource("advanced_spacesuit"))) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('F', ItemInit.ADVANCED_SPACESUIT_FABRIC::get) + .define('G', AllItems.GOLDEN_SHEET::get) + .pattern("FFF") + .pattern("FGF") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/armor/" + c.getName()))) .tag(ItemTags.HEAD_ARMOR) .register(); @@ -481,6 +618,15 @@ private static ItemEntry registerSequencedEngineItem(Stri "starter_charge", CombustibleItem::new) .onRegister(i -> i.setBurnTime(500)) //.properties(p->p.tab(CreativeModeTabsInit.COMPONENT_TAB)) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('P', Items.PAPER) + .define('G', Items.GUNPOWDER) + .pattern("PGP") + .pattern("PGP") + .pattern("PGP") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/misc/" + c.getName()))) .register(); public static final ItemEntry INJECTOR = REGISTRATE.item( "injector", Item::new) @@ -493,6 +639,15 @@ private static ItemEntry registerSequencedEngineItem(Stri public static final ItemEntry STURDY_PROPELLER = REGISTRATE.item( "sturdy_propeller", Item::new) //.properties(p->p.tab(CreativeModeTabsInit.COMPONENT_TAB)) + .recipe((c,p) -> + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) + .define('I', commonItemTag("ingots/iron")) + .define('S', AllItems.STURDY_SHEET) + .pattern(" S ") + .pattern("SIS") + .pattern(" S ") + .unlockedBy("has_" + c.getName(), has(c.get())) + .save(p, resource("crafting/misc/" + c.getName()))) .register(); public static final ItemEntry INJECTOR_GRID = REGISTRATE.item( diff --git a/src/main/resources/data/creatingspace/recipe/alloy_recipe/copronickel_ingot_mixing.json b/src/main/resources/data/creatingspace/recipe/alloy_recipe/copronickel_ingot_mixing.json index 4be8ece3..70a3da06 100644 --- a/src/main/resources/data/creatingspace/recipe/alloy_recipe/copronickel_ingot_mixing.json +++ b/src/main/resources/data/creatingspace/recipe/alloy_recipe/copronickel_ingot_mixing.json @@ -13,7 +13,7 @@ ], "results": [ { - "item": "creatingspace:copronickel_ingot", + "id": "creatingspace:copronickel_ingot", "count": 2 } ], diff --git a/src/main/resources/data/creatingspace/recipe/alloy_recipe/hastelloy_ingot_mixing.json b/src/main/resources/data/creatingspace/recipe/alloy_recipe/hastelloy_ingot_mixing.json index b4f2e047..a0a28b31 100644 --- a/src/main/resources/data/creatingspace/recipe/alloy_recipe/hastelloy_ingot_mixing.json +++ b/src/main/resources/data/creatingspace/recipe/alloy_recipe/hastelloy_ingot_mixing.json @@ -22,7 +22,7 @@ ], "results": [ { - "item": "creatingspace:hastelloy_ingot", + "id": "creatingspace:hastelloy_ingot", "count": 1 } ], diff --git a/src/main/resources/data/creatingspace/recipe/alloy_recipe/inconel_ingot_mixing.json b/src/main/resources/data/creatingspace/recipe/alloy_recipe/inconel_ingot_mixing.json index 63c8d90b..39904e37 100644 --- a/src/main/resources/data/creatingspace/recipe/alloy_recipe/inconel_ingot_mixing.json +++ b/src/main/resources/data/creatingspace/recipe/alloy_recipe/inconel_ingot_mixing.json @@ -13,7 +13,7 @@ ], "results": [ { - "item": "creatingspace:inconel_ingot", + "id": "creatingspace:inconel_ingot", "count": 1 } ], diff --git a/src/main/resources/data/creatingspace/recipe/alloy_recipe/monel_ingot_mixing.json b/src/main/resources/data/creatingspace/recipe/alloy_recipe/monel_ingot_mixing.json index 7bda501d..fddc8547 100644 --- a/src/main/resources/data/creatingspace/recipe/alloy_recipe/monel_ingot_mixing.json +++ b/src/main/resources/data/creatingspace/recipe/alloy_recipe/monel_ingot_mixing.json @@ -14,7 +14,7 @@ ], "results": [ { - "item": "creatingspace:monel_ingot", + "id": "creatingspace:monel_ingot", "count": 1 } ], diff --git a/src/main/resources/data/creatingspace/recipe/alloy_recipe/reinforced_copper_ingot_mixing.json b/src/main/resources/data/creatingspace/recipe/alloy_recipe/reinforced_copper_ingot_mixing.json index da3aeb86..ce2b6e12 100644 --- a/src/main/resources/data/creatingspace/recipe/alloy_recipe/reinforced_copper_ingot_mixing.json +++ b/src/main/resources/data/creatingspace/recipe/alloy_recipe/reinforced_copper_ingot_mixing.json @@ -14,7 +14,7 @@ ], "results": [ { - "item": "creatingspace:reinforced_copper_ingot", + "id": "creatingspace:reinforced_copper_ingot", "count": 3 } ], diff --git a/src/main/resources/data/creatingspace/recipe/ressources/coal_dust.json b/src/main/resources/data/creatingspace/recipe/crushing/coal_dust.json similarity index 81% rename from src/main/resources/data/creatingspace/recipe/ressources/coal_dust.json rename to src/main/resources/data/creatingspace/recipe/crushing/coal_dust.json index 870d0805..2742ded5 100644 --- a/src/main/resources/data/creatingspace/recipe/ressources/coal_dust.json +++ b/src/main/resources/data/creatingspace/recipe/crushing/coal_dust.json @@ -9,7 +9,7 @@ "processingTime": 400, "results": [ {"count": 2, - "item": "creatingspace:coal_dust" + "id": "creatingspace:coal_dust" } ] } \ No newline at end of file diff --git a/src/main/resources/data/creatingspace/recipe/ressources/crushed_cobalt_ore.json b/src/main/resources/data/creatingspace/recipe/crushing/crushed_cobalt_ore.json similarity index 53% rename from src/main/resources/data/creatingspace/recipe/ressources/crushed_cobalt_ore.json rename to src/main/resources/data/creatingspace/recipe/crushing/crushed_cobalt_ore.json index 83024283..1c19950e 100644 --- a/src/main/resources/data/creatingspace/recipe/ressources/crushed_cobalt_ore.json +++ b/src/main/resources/data/creatingspace/recipe/crushing/crushed_cobalt_ore.json @@ -3,21 +3,21 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:ores/cobalt" + "tag": "c:ores/cobalt" } ], "processingTime": 400, "results": [ { - "item": "creatingspace:crushed_cobalt_ore" + "id": "creatingspace:crushed_cobalt_ore" }, { "chance": 0.75, - "item": "creatingspace:crushed_cobalt_ore" + "id": "creatingspace:crushed_cobalt_ore" }, { "chance": 0.75, - "item": "create:experience_nugget" + "id": "create:experience_nugget" } ] } \ No newline at end of file diff --git a/src/main/resources/data/creatingspace/recipe/ressources/crushed_cobalt_ore_from_raw.json b/src/main/resources/data/creatingspace/recipe/crushing/crushed_cobalt_ore_from_raw.json similarity index 54% rename from src/main/resources/data/creatingspace/recipe/ressources/crushed_cobalt_ore_from_raw.json rename to src/main/resources/data/creatingspace/recipe/crushing/crushed_cobalt_ore_from_raw.json index a37a4772..723c8bf5 100644 --- a/src/main/resources/data/creatingspace/recipe/ressources/crushed_cobalt_ore_from_raw.json +++ b/src/main/resources/data/creatingspace/recipe/crushing/crushed_cobalt_ore_from_raw.json @@ -3,17 +3,17 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:raw_materials/cobalt" + "tag": "c:raw_materials/cobalt" } ], "processingTime": 400, "results": [ { - "item": "creatingspace:crushed_cobalt_ore" + "id": "creatingspace:crushed_cobalt_ore" }, { "chance": 0.75, - "item": "create:experience_nugget" + "id": "create:experience_nugget" } ] } \ No newline at end of file diff --git a/src/main/resources/data/creatingspace/recipe/ressources/crushing_moon_stone.json b/src/main/resources/data/creatingspace/recipe/crushing/crushing_moon_stone.json similarity index 80% rename from src/main/resources/data/creatingspace/recipe/ressources/crushing_moon_stone.json rename to src/main/resources/data/creatingspace/recipe/crushing/crushing_moon_stone.json index 7e10befd..6575fbc1 100644 --- a/src/main/resources/data/creatingspace/recipe/ressources/crushing_moon_stone.json +++ b/src/main/resources/data/creatingspace/recipe/crushing/crushing_moon_stone.json @@ -9,7 +9,7 @@ "processingTime": 400, "results": [ {"count": 1, - "item": "creatingspace:moon_regolith" + "id": "creatingspace:moon_regolith" } ] } \ No newline at end of file diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/duplicate_blueprint.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/duplicate_blueprint.json index 1fc26854..32f3fd23 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/duplicate_blueprint.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/duplicate_blueprint.json @@ -11,7 +11,7 @@ "results": [ { "count": 2, - "item": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint" } ], "sequence": [ @@ -27,7 +27,7 @@ ], "results": [ { - "item": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint" } ] }, @@ -43,12 +43,12 @@ ], "results": [ { - "item": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint" } ] } ], "transitionalItem": { - "item": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint" } } \ No newline at end of file diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/engine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/engine.json index f4b7ce72..7ca35223 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/engine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/engine.json @@ -10,7 +10,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:rocket_engine" + "id": "creatingspace:rocket_engine" } ], "sequence": [ @@ -30,7 +30,7 @@ ], "results": [ { - "item": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint" } ] }, @@ -50,12 +50,12 @@ ], "results": [ { - "item": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint" } ] } ], "transitionalItem": { - "item": "creatingspace:incomplete_rocket_engine" + "id": "creatingspace:incomplete_rocket_engine" } } \ No newline at end of file diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/aerospike.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/aerospike.json index 85e669b0..659c71b5 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/aerospike.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/aerospike.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:exhaust_pack" + "id": "creatingspace:exhaust_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/bell_nozzle.json index b4f53756..d6f9bee3 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/bell_nozzle.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:exhaust_pack" + "id": "creatingspace:exhaust_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/combustion_chamber/combustion_chamber.json index 40e541d7..49467ba4 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/combustion_chamber/combustion_chamber.json @@ -80,7 +80,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_combustion_chamber" + "id": "creatingspace:incomplete_combustion_chamber" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/aerospike_plug.json index bd81ab3e..05f95ba7 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/aerospike_plug.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_aerospike_plug" + "id": "creatingspace:incomplete_aerospike_plug" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/bell_nozzle.json index 061925a4..4dac27a2 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl0/exhaust/bell_nozzle.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_bell_nozzle" + "id": "creatingspace:incomplete_bell_nozzle" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/combustion_chamber/combustion_chamber.json index 2b3a062a..415df3b2 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/combustion_chamber/combustion_chamber.json @@ -80,7 +80,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_combustion_chamber" + "id": "creatingspace:incomplete_combustion_chamber" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/aerospike_plug.json index b04e0aa4..2f96cff9 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/aerospike_plug.json @@ -81,7 +81,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_bell_nozzle" + "id": "creatingspace:incomplete_bell_nozzle" } ] }, diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/bell_nozzle.json index 43b3ba31..cd0bb54c 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl1/exhaust/bell_nozzle.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_bell_nozzle" + "id": "creatingspace:incomplete_bell_nozzle" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/combustion_chamber/combustion_chamber.json index 57f4bf7b..cf8c802a 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/combustion_chamber/combustion_chamber.json @@ -80,7 +80,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_combustion_chamber" + "id": "creatingspace:incomplete_combustion_chamber" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/aerospike_plug.json index a68630b7..9669d9b2 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/aerospike_plug.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_aerospike_plug" + "id": "creatingspace:incomplete_aerospike_plug" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/bell_nozzle.json index ca425699..02809d79 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl2/exhaust/bell_nozzle.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_bell_nozzle" + "id": "creatingspace:incomplete_bell_nozzle" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/combustion_chamber/combustion_chamber.json index 7356fc69..ad57d558 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/combustion_chamber/combustion_chamber.json @@ -80,7 +80,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_combustion_chamber" + "id": "creatingspace:incomplete_combustion_chamber" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/aerospike_plug.json index 0917f18e..c6efa769 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/aerospike_plug.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_aerospike_plug" + "id": "creatingspace:incomplete_aerospike_plug" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/bell_nozzle.json index c3b72b42..2c08da11 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl3/exhaust/bell_nozzle.json @@ -97,7 +97,7 @@ ], "results": [ { - "item": "creatingspace:incomplete_bell_nozzle" + "id": "creatingspace:incomplete_bell_nozzle" } ] } diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/combustion_chamber/combustion_chamber.json index 37665e7f..2740adbf 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/combustion_chamber/combustion_chamber.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:combustion_chamber" + "id": "creatingspace:combustion_chamber" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/aerospike_plug.json index f4cd5163..8a0b5d15 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/aerospike_plug.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:aerospike_plug" + "id": "creatingspace:aerospike_plug" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/bell_nozzle.json index b7b891bf..4fad5c18 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl4/exhaust/bell_nozzle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:bell_nozzle" + "id": "creatingspace:bell_nozzle" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/combustion_chamber/combustion_chamber.json index 8507f3d6..db9d1f31 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/combustion_chamber/combustion_chamber.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:combustion_chamber" + "id": "creatingspace:combustion_chamber" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/aerospike_plug.json index 8b6935d4..d82d8b3d 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/aerospike_plug.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:aerospike_plug" + "id": "creatingspace:aerospike_plug" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/bell_nozzle.json index bde7795b..137a7cb3 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl5/exhaust/bell_nozzle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:bell_nozzle" + "id": "creatingspace:bell_nozzle" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/combustion_chamber/combustion_chamber.json index 5ea971cb..f2648473 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/combustion_chamber/combustion_chamber.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:combustion_chamber" + "id": "creatingspace:combustion_chamber" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/aerospike_plug.json index cdcf066c..6b9570c5 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/aerospike_plug.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:aerospike_plug" + "id": "creatingspace:aerospike_plug" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/bell_nozzle.json index 6da0fec4..7a1962db 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl6/exhaust/bell_nozzle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:bell_nozzle" + "id": "creatingspace:bell_nozzle" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/combustion_chamber/combustion_chamber.json index 807b7b48..cb9fbdd7 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/combustion_chamber/combustion_chamber.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:combustion_chamber" + "id": "creatingspace:combustion_chamber" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/aerospike_plug.json index 7c2d0295..af3a88da 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/aerospike_plug.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:aerospike_plug" + "id": "creatingspace:aerospike_plug" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/bell_nozzle.json index d69e9c91..36329c6a 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl7/exhaust/bell_nozzle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:bell_nozzle" + "id": "creatingspace:bell_nozzle" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/combustion_chamber/combustion_chamber.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/combustion_chamber/combustion_chamber.json index 9cbbdd96..3be25c7a 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/combustion_chamber/combustion_chamber.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/combustion_chamber/combustion_chamber.json @@ -16,7 +16,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:combustion_chamber" + "id": "creatingspace:combustion_chamber" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/aerospike_plug.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/aerospike_plug.json index ec2b6e22..909fb626 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/aerospike_plug.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/aerospike_plug.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:aerospike_plug" + "id": "creatingspace:aerospike_plug" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/bell_nozzle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/bell_nozzle.json index e17f0874..139cf10e 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/bell_nozzle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/exhaust_pack/lvl8/exhaust/bell_nozzle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:bell_nozzle" + "id": "creatingspace:bell_nozzle" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/fuel_rich_staged_cycle.json index 6ec02e2f..239297d4 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/full_flow_staged_cycle.json index 7cbaae06..f02802d6 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/injector_grid/injector_grid.json index fa3bba84..c3d55128 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:andesite_injector_grid" + "id": "creatingspace:andesite_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/open_cycle.json index 744c5699..86df7636 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/ox_rich_staged_cycle.json index 6f958620..6fb4c888 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/turbo_pump/turbine.json index 3d4fec07..c42557c1 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl0/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:andesite_turbine" + "id": "creatingspace:andesite_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/fuel_rich_staged_cycle.json index 9583fafb..6da7654f 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/full_flow_staged_cycle.json index 0ebc14be..e52f0c95 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/injector_grid/injector_grid.json index 8983bb94..8d755f36 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:iron_injector_grid" + "id": "creatingspace:iron_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/open_cycle.json index 65971322..0289d16a 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/ox_rich_staged_cycle.json index b99bbdfb..786731f0 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/turbo_pump/turbine.json index 85fcce1d..1f4a702b 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl1/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:iron_turbine" + "id": "creatingspace:iron_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/fuel_rich_staged_cycle.json index c2f79172..b472090d 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/full_flow_staged_cycle.json index be1339bd..f08b4cac 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/injector_grid/injector_grid.json index 54cda266..46d2ec68 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:copper_injector_grid" + "id": "creatingspace:copper_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/open_cycle.json index 115aff04..2239fc5e 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/ox_rich_staged_cycle.json index 9fea26c0..de9c9212 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/turbo_pump/turbine.json index 20875490..5cc7df65 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl2/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:copper_turbine" + "id": "creatingspace:copper_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/fuel_rich_staged_cycle.json index 0c752df6..10740de2 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/full_flow_staged_cycle.json index e05ad6a0..908bfefe 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/injector_grid/injector_grid.json index fdd957c4..14d4570d 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:brass_injector_grid" + "id": "creatingspace:brass_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/open_cycle.json index 27a17962..d2b9a5b9 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/ox_rich_staged_cycle.json index ccde3e09..fc9a50a9 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/turbo_pump/turbine.json index 0e5e7542..db66c269 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl3/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:brass_turbine" + "id": "creatingspace:brass_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/fuel_rich_staged_cycle.json index af5dd850..587cf167 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/full_flow_staged_cycle.json index 9f0e14c8..1a5f720b 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/injector_grid/injector_grid.json index ac082bf6..d891dab3 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:reinforced_copper_injector_grid" + "id": "creatingspace:reinforced_copper_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/open_cycle.json index b8bffca1..3aa113a5 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/ox_rich_staged_cycle.json index e3971259..057ac8f4 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/turbo_pump/turbine.json index 0d5b0eb4..695fbe41 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl4/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:reinforced_copper_turbine" + "id": "creatingspace:reinforced_copper_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/fuel_rich_staged_cycle.json index 55082319..4ad44339 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/full_flow_staged_cycle.json index bdd63d33..1a51e4a6 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/injector_grid/injector_grid.json index 427985c2..2c2e0655 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:copronickel_injector_grid" + "id": "creatingspace:copronickel_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/open_cycle.json index 245b28a4..0fe3e58b 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/ox_rich_staged_cycle.json index 4370dbdb..e9b20bac 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/turbo_pump/turbine.json index a3a42665..617d67fb 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl5/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:copronickel_turbine" + "id": "creatingspace:copronickel_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/fuel_rich_staged_cycle.json index bd09f5fb..0f1482bb 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/full_flow_staged_cycle.json index b980690a..170c2c45 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/injector_grid/injector_grid.json index 884a6142..3133f822 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:monel_injector_grid" + "id": "creatingspace:monel_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/open_cycle.json index b8991f99..dd17f978 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/ox_rich_staged_cycle.json index fa71cdf3..aa8a06ba 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/turbo_pump/turbine.json index 36123b6b..f97d3637 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl6/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:monel_turbine" + "id": "creatingspace:monel_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/fuel_rich_staged_cycle.json index fb6e9cb6..4ad254fa 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/full_flow_staged_cycle.json index 16b08903..ee7286a3 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/injector_grid/injector_grid.json index 4717b223..99dc7f45 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:inconel_injector_grid" + "id": "creatingspace:inconel_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/open_cycle.json index ed3d7137..28f4137f 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/ox_rich_staged_cycle.json index 46eb5bdc..a23e2c48 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/turbo_pump/turbine.json index 98ad0771..5521b38b 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl7/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:inconel_turbine" + "id": "creatingspace:inconel_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/fuel_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/fuel_rich_staged_cycle.json index e2d52cfa..2823948e 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/fuel_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/fuel_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/full_flow_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/full_flow_staged_cycle.json index ad79cc03..fcfee04f 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/full_flow_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/full_flow_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/injector_grid/injector_grid.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/injector_grid/injector_grid.json index 6a79ce71..895731ff 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/injector_grid/injector_grid.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/injector_grid/injector_grid.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:hastelloy_injector_grid" + "id": "creatingspace:hastelloy_injector_grid" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/open_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/open_cycle.json index 7c9f64ad..4c038e9b 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/open_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/open_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/ox_rich_staged_cycle.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/ox_rich_staged_cycle.json index 4b21ad7c..54e81f85 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/ox_rich_staged_cycle.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/ox_rich_staged_cycle.json @@ -17,7 +17,7 @@ "loops": 1, "results": [ { - "item": "creatingspace:power_pack" + "id": "creatingspace:power_pack" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/turbo_pump/turbine.json b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/turbo_pump/turbine.json index bf272dc5..a9ddc83e 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/turbo_pump/turbine.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipes/power_pack/lvl8/turbo_pump/turbine.json @@ -16,7 +16,7 @@ "loops": 2, "results": [ { - "item": "creatingspace:hastelloy_turbine" + "id": "creatingspace:hastelloy_turbine" } ], "sequence": [ diff --git a/src/main/resources/data/creatingspace/recipe/co2.json b/src/main/resources/data/creatingspace/recipe/fluids/co2.json similarity index 100% rename from src/main/resources/data/creatingspace/recipe/co2.json rename to src/main/resources/data/creatingspace/recipe/fluids/co2.json diff --git a/src/main/resources/data/creatingspace/recipe/methane.json b/src/main/resources/data/creatingspace/recipe/fluids/methane.json similarity index 100% rename from src/main/resources/data/creatingspace/recipe/methane.json rename to src/main/resources/data/creatingspace/recipe/fluids/methane.json diff --git a/src/main/resources/data/creatingspace/recipe/o2.json b/src/main/resources/data/creatingspace/recipe/fluids/o2.json similarity index 100% rename from src/main/resources/data/creatingspace/recipe/o2.json rename to src/main/resources/data/creatingspace/recipe/fluids/o2.json diff --git a/src/main/resources/data/creatingspace/recipe/water_electrolysis.json b/src/main/resources/data/creatingspace/recipe/fluids/water_electrolysis.json similarity index 100% rename from src/main/resources/data/creatingspace/recipe/water_electrolysis.json rename to src/main/resources/data/creatingspace/recipe/fluids/water_electrolysis.json diff --git a/src/main/resources/data/creatingspace/recipe/reinforced_injector.json b/src/main/resources/data/creatingspace/recipe/reinforced_injector.json index 6aaa4b52..ae33205e 100644 --- a/src/main/resources/data/creatingspace/recipe/reinforced_injector.json +++ b/src/main/resources/data/creatingspace/recipe/reinforced_injector.json @@ -7,11 +7,11 @@ "results": [ { "chance": 120.0, - "item": "creatingspace:reinforced_injector" + "id": "creatingspace:reinforced_injector" }, { "chance": 8.0, - "item": "creatingspace:cobalt_nugget" + "id": "creatingspace:cobalt_nugget" } ], "sequence": [ diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json index 714ad815..8007246a 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -2,6 +2,8 @@ "replace": false, "values": [ "creatingspace:moon_regolith", - "creatingspace:moon_surface_regolith" + "creatingspace:moon_surface_regolith", + "creatingspace:mars_regolith", + "creatingspace:mars_surface_regolith" ] } \ No newline at end of file