diff --git a/src/main/java/net/anvilcraft/ntx4core/ModFilePackResources.java b/src/main/java/net/anvilcraft/ntx4core/ModFilePackResources.java index dc517a3..55aa2a3 100644 --- a/src/main/java/net/anvilcraft/ntx4core/ModFilePackResources.java +++ b/src/main/java/net/anvilcraft/ntx4core/ModFilePackResources.java @@ -1,26 +1,25 @@ package net.anvilcraft.ntx4core; - import java.nio.file.Path; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.resource.PathResourcePack; public class ModFilePackResources extends PathResourcePack { - protected final IModFile modFile; - protected final String sourcePath; + protected final IModFile modFile; + protected final String sourcePath; - public ModFilePackResources(String name, IModFile modFile, String sourcePath) { - super(name, modFile.findResource(sourcePath)); - this.modFile = modFile; - this.sourcePath = sourcePath; - } + public ModFilePackResources(String name, IModFile modFile, String sourcePath) { + super(name, modFile.findResource(sourcePath)); + this.modFile = modFile; + this.sourcePath = sourcePath; + } - @Override - protected Path resolve(String... paths) { - String[] allPaths = new String[paths.length + 1]; - allPaths[0] = sourcePath; - System.arraycopy(paths, 0, allPaths, 1, paths.length); - return modFile.findResource(allPaths); - } + @Override + protected Path resolve(String... paths) { + String[] allPaths = new String[paths.length + 1]; + allPaths[0] = sourcePath; + System.arraycopy(paths, 0, allPaths, 1, paths.length); + return modFile.findResource(allPaths); + } } diff --git a/src/main/java/net/anvilcraft/ntx4core/Ntx4Core.java b/src/main/java/net/anvilcraft/ntx4core/Ntx4Core.java index f3f824f..3bc44b1 100644 --- a/src/main/java/net/anvilcraft/ntx4core/Ntx4Core.java +++ b/src/main/java/net/anvilcraft/ntx4core/Ntx4Core.java @@ -90,9 +90,11 @@ public class Ntx4Core { } } - public void registerRecipeSerializers(RegistryEvent.Register> event) { + public void + registerRecipeSerializers(RegistryEvent.Register> event) { event.getRegistry().registerAll( - new SpecialRecipeSerializer<>(OrbDuplicationRecipe::new).setRegistryName("orb_duplication") + new SpecialRecipeSerializer<>(OrbDuplicationRecipe::new) + .setRegistryName("orb_duplication") ); } } diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java b/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java index be11d27..8103228 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/InputReplacements.java @@ -57,11 +57,11 @@ public class InputReplacements implements IEventBusRegisterable { ) ); - var philosopherStoneMapper = new InputReplaceRecipeMapper() - .replace("#forge:gems/diamond", "ae2:singularity") - .replace("#forge:dusts/redstone", "chemlib:erbium_dust") - .replace("#forge:dusts/glowstone", "psi:ivory_substance") - ; + var philosopherStoneMapper + = new InputReplaceRecipeMapper() + .replace("#forge:gems/diamond", "ae2:singularity") + .replace("#forge:dusts/redstone", "chemlib:erbium_dust") + .replace("#forge:dusts/glowstone", "psi:ivory_substance"); ev.mapRecipeID( new Identifier("projecte", "philosophers_stone"), philosopherStoneMapper ); diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/OrbDuplicationRecipe.java b/src/main/java/net/anvilcraft/ntx4core/recipes/OrbDuplicationRecipe.java index 40cacf6..57d575b 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/OrbDuplicationRecipe.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/OrbDuplicationRecipe.java @@ -15,42 +15,42 @@ import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; -public class OrbDuplicationRecipe extends SpecialCraftingRecipe implements IShapedRecipe -{ +public class OrbDuplicationRecipe + extends SpecialCraftingRecipe implements IShapedRecipe { @ObjectHolder("ntx4core:orb_duplication") public static SpecialRecipeSerializer SERIALIZER; - private Item flux = ForgeRegistries.ITEMS.getValue(new Identifier("fluxnetworks", "flux_dust")); - private Item nitro = ForgeRegistries.ITEMS.getValue(new Identifier("powah", "crystal_nitro")); - private Item orb = ForgeRegistries.ITEMS.getValue(new Identifier("enderrift", "rift_orb")); + private Item flux + = ForgeRegistries.ITEMS.getValue(new Identifier("fluxnetworks", "flux_dust")); + private Item nitro + = ForgeRegistries.ITEMS.getValue(new Identifier("powah", "crystal_nitro")); + private Item orb + = ForgeRegistries.ITEMS.getValue(new Identifier("enderrift", "rift_orb")); private DefaultedList ingredients = DefaultedList.copyOf( - Ingredient.EMPTY, - Ingredient.ofItems(this.flux), - Ingredient.ofItems(this.nitro), - Ingredient.ofItems(this.flux), - Ingredient.ofItems(this.nitro), - Ingredient.ofItems(this.orb), - Ingredient.ofItems(this.nitro), - Ingredient.ofItems(this.flux), - Ingredient.ofItems(this.nitro), - Ingredient.ofItems(this.flux) + Ingredient.EMPTY, + Ingredient.ofItems(this.flux), + Ingredient.ofItems(this.nitro), + Ingredient.ofItems(this.flux), + Ingredient.ofItems(this.nitro), + Ingredient.ofItems(this.orb), + Ingredient.ofItems(this.nitro), + Ingredient.ofItems(this.flux), + Ingredient.ofItems(this.nitro), + Ingredient.ofItems(this.flux) ); private ItemStack output = new ItemStack(this.orb, 2); - public OrbDuplicationRecipe(Identifier recipeId) - { + public OrbDuplicationRecipe(Identifier recipeId) { super(recipeId); } @Override - public DefaultedList getIngredients() - { + public DefaultedList getIngredients() { return ingredients; } @Override - public boolean matches(CraftingInventory crafting, World worldIn) - { + public boolean matches(CraftingInventory crafting, World worldIn) { if (crafting.size() < 9) return false; @@ -92,53 +92,45 @@ public class OrbDuplicationRecipe extends SpecialCraftingRecipe implements IShap return true; } - private boolean slotHasItem(CraftingInventory crafting, int slot, Item item) - { + private boolean slotHasItem(CraftingInventory crafting, int slot, Item item) { ItemStack stack = crafting.getStack(slot); return stack.getItem() == item; } @Override - public ItemStack craft(CraftingInventory crafting) - { + public ItemStack craft(CraftingInventory crafting) { ItemStack stack = crafting.getStack(4).copy(); stack.setCount(2); return stack; } @Override - public boolean fits(int width, int height) - { + public boolean fits(int width, int height) { return (width == 3) && (height == 3); } @Override - public ItemStack getOutput() - { + public ItemStack getOutput() { return output; } @Override - public DefaultedList getRemainder(CraftingInventory inv) - { + public DefaultedList getRemainder(CraftingInventory inv) { return DefaultedList.ofSize(inv.size(), ItemStack.EMPTY); } @Override - public RecipeSerializer getSerializer() - { + public RecipeSerializer getSerializer() { return SERIALIZER; } @Override - public int getRecipeWidth() - { + public int getRecipeWidth() { return 3; } @Override - public int getRecipeHeight() - { + public int getRecipeHeight() { return 3; } } diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeRemovals.java b/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeRemovals.java index f6c92ef..4f98d83 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeRemovals.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeRemovals.java @@ -21,10 +21,12 @@ public class RecipeRemovals implements IEventBusRegisterable { )); ev.removeRecipesMatching((r) -> { var id = r.getId(); - return id.getNamespace().equals("createappliedkinetics") && id.getPath().startsWith("inscriber"); + return id.getNamespace().equals("createappliedkinetics") + && id.getPath().startsWith("inscriber"); }); ev.removeRecipeID(new Identifier("projecte", "red_matter_alt")); - ev.removeRecipeID(new Identifier("draconicevolution", "components/awakened_core")); + ev.removeRecipeID(new Identifier("draconicevolution", "components/awakened_core") + ); ev.removeRecipeID(new Identifier("electrodynamics", "ingotsteel_ingot_smelting")); ev.removeRecipeID(new Identifier("beyond_earth", "steel_ingot_blasting")); ev.removeRecipeID(new Identifier("enderrift", "rift_orb")); diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java b/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java index f7477a6..536936e 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/RecipeReplacements.java @@ -31,7 +31,9 @@ public class RecipeReplacements implements IEventBusRegisterable { ev.mapRecipeID( new Identifier("compactmachines", "personal_shrinking_device"), r - -> new ShapedRecipeBuilder(Ntx4Core.id("personal_shrinking_device"), r.getOutput()) + -> new ShapedRecipeBuilder( + Ntx4Core.id("personal_shrinking_device"), r.getOutput() + ) .pattern("IDI", "TFE", "IDI") .ingredient('I', "#forge:ingots/iron") .ingredient('D', "fluxnetworks:flux_dust") @@ -185,256 +187,296 @@ public class RecipeReplacements implements IEventBusRegisterable { ); ev.mapRecipeID( - new Identifier("laserio", "laser_connector"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("laser_connector"), r.getOutput()) - .pattern(" R ", "BCB", " D ") - .ingredient('R', "#forge:dusts/redstone") - .ingredient('B', "powah:capacitor_blazing") - .ingredient('C', "powah:dielectric_casing") - .ingredient('D', "powah:dielectric_rod") - .build() + new Identifier("laserio", "laser_connector"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("laser_connector"), r.getOutput()) + .pattern(" R ", "BCB", " D ") + .ingredient('R', "#forge:dusts/redstone") + .ingredient('B', "powah:capacitor_blazing") + .ingredient('C', "powah:dielectric_casing") + .ingredient('D', "powah:dielectric_rod") + .build() ); ev.mapRecipeID( - new Identifier("laserio", "laser_node"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("laser_node"), r.getOutput()) - .pattern("BRB", "RCR", "BRB") - .ingredient('R', "#forge:dusts/redstone") - .ingredient('B', "powah:crystal_blazing") - .ingredient('C', "powah:dielectric_casing") - .build() + new Identifier("laserio", "laser_node"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("laser_node"), r.getOutput()) + .pattern("BRB", "RCR", "BRB") + .ingredient('R', "#forge:dusts/redstone") + .ingredient('B', "powah:crystal_blazing") + .ingredient('C', "powah:dielectric_casing") + .build() ); ev.mapRecipeID( - new Identifier("dmlreforged", "simulation_chamber/simulation_chamber"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("simulation_chamber"), r.getOutput()) - .pattern("NPN", "ECE", "NDN") - .ingredient('N', "#forge:nuggets/enderium") - .ingredient('E', "powah:energy_cell_niotic") - .ingredient('C', "dmlreforged:machine_casing") - .ingredient('P', "ae2:engineering_processor") - .ingredient('D', "integrateddynamics:part_display_panel") - .build() + new Identifier("dmlreforged", "simulation_chamber/simulation_chamber"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("simulation_chamber"), r.getOutput()) + .pattern("NPN", "ECE", "NDN") + .ingredient('N', "#forge:nuggets/enderium") + .ingredient('E', "powah:energy_cell_niotic") + .ingredient('C', "dmlreforged:machine_casing") + .ingredient('P', "ae2:engineering_processor") + .ingredient('D', "integrateddynamics:part_display_panel") + .build() ); ev.mapRecipeID( - new Identifier("dmlreforged", "machine_casing"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("machine_casing"), r.getOutput()) - .pattern("NON", "OCO", "NON") - .ingredient('N', "#forge:nuggets/refined_obsidian") - .ingredient('O', "dmlreforged:soot_covered_plate") - .ingredient('C', "rftoolsbase:machine_frame") - .build() + new Identifier("dmlreforged", "machine_casing"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("machine_casing"), r.getOutput()) + .pattern("NON", "OCO", "NON") + .ingredient('N', "#forge:nuggets/refined_obsidian") + .ingredient('O', "dmlreforged:soot_covered_plate") + .ingredient('C', "rftoolsbase:machine_frame") + .build() ); ev.mapRecipeID( - new Identifier("dmlreforged", "extraction_chamber/extraction_chamber"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("extraction_chamber"), r.getOutput()) - .pattern("NPN", "ECE", "NDN") - .ingredient('N', "powah:crystal_blazing") - .ingredient('E', "powah:energy_cell_niotic") - .ingredient('C', "dmlreforged:machine_casing") - .ingredient('P', "ae2:logic_processor") - .ingredient('D', Items.NETHER_STAR) - .build() + new Identifier("dmlreforged", "extraction_chamber/extraction_chamber"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("extraction_chamber"), r.getOutput()) + .pattern("NPN", "ECE", "NDN") + .ingredient('N', "powah:crystal_blazing") + .ingredient('E', "powah:energy_cell_niotic") + .ingredient('C', "dmlreforged:machine_casing") + .ingredient('P', "ae2:logic_processor") + .ingredient('D', Items.NETHER_STAR) + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "reactor_casing"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("reactor_casing"), r.getOutput()) - .pattern("OPO", "PCP", "OPO") - .ingredient('P', "#forge:ingots/platinum") - .ingredient('O', "#forge:ingots/osmium") - .ingredient('C', "mekanism:steel_casing") - .build() + new Identifier("alchemistry", "reactor_casing"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("reactor_casing"), r.getOutput()) + .pattern("OPO", "PCP", "OPO") + .ingredient('P', "#forge:ingots/platinum") + .ingredient('O', "#forge:ingots/osmium") + .ingredient('C', "mekanism:steel_casing") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "fission_chamber_controller"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("fission_chamber_controller"), r.getOutput()) - .pattern("LFL", "GCA", "LFL") - .ingredient('L', "#forge:ingots/lead") - .ingredient('F', "mekanismgenerators:fission_reactor_casing") - .ingredient('C', "#forge:circuits/elite") - .ingredient('A', "#forge:alloys/advanced") - .ingredient('G', "mekanismgenerators:reactor_glass") - .build() + new Identifier("alchemistry", "fission_chamber_controller"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("fission_chamber_controller"), r.getOutput() + ) + .pattern("LFL", "GCA", "LFL") + .ingredient('L', "#forge:ingots/lead") + .ingredient('F', "mekanismgenerators:fission_reactor_casing") + .ingredient('C', "#forge:circuits/elite") + .ingredient('A', "#forge:alloys/advanced") + .ingredient('G', "mekanismgenerators:reactor_glass") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "fusion_chamber_controller"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("fusion_chamber_controller"), r.getOutput()) - .pattern("LFL", "GCA", "LFL") - .ingredient('L', "#forge:ingots/steel") - .ingredient('F', "mekanismgenerators:fusion_reactor_frame") - .ingredient('C', "#forge:circuits/ultimate") - .ingredient('A', "#forge:alloys/advanced") - .ingredient('G', "mekanismgenerators:reactor_glass") - .build() + new Identifier("alchemistry", "fusion_chamber_controller"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("fusion_chamber_controller"), r.getOutput() + ) + .pattern("LFL", "GCA", "LFL") + .ingredient('L', "#forge:ingots/steel") + .ingredient('F', "mekanismgenerators:fusion_reactor_frame") + .ingredient('C', "#forge:circuits/ultimate") + .ingredient('A', "#forge:alloys/advanced") + .ingredient('G', "mekanismgenerators:reactor_glass") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "atomizer"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("atomizer"), r.getOutput()) - .pattern("ACA", "TMP", "ACA") - .ingredient('M', "mekanism:dynamic_tank") - .ingredient('C', "#forge:circuits/basic") - .ingredient('A', "#forge:alloys/advanced") - .ingredient('T', "mekanism:basic_fluid_tank") - .ingredient('P', "#mekanism:personal_storage") - .build() + new Identifier("alchemistry", "atomizer"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("atomizer"), r.getOutput()) + .pattern("ACA", "TMP", "ACA") + .ingredient('M', "mekanism:dynamic_tank") + .ingredient('C', "#forge:circuits/basic") + .ingredient('A', "#forge:alloys/advanced") + .ingredient('T', "mekanism:basic_fluid_tank") + .ingredient('P', "#mekanism:personal_storage") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "liquifier"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("liquifier"), r.getOutput()) - .pattern("ACA", "PMT", "ACA") - .ingredient('M', "mekanism:dynamic_tank") - .ingredient('C', "#forge:circuits/basic") - .ingredient('A', "#forge:alloys/advanced") - .ingredient('T', "mekanism:basic_fluid_tank") - .ingredient('P', "#mekanism:personal_storage") - .build() + new Identifier("alchemistry", "liquifier"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("liquifier"), r.getOutput()) + .pattern("ACA", "PMT", "ACA") + .ingredient('M', "mekanism:dynamic_tank") + .ingredient('C', "#forge:circuits/basic") + .ingredient('A', "#forge:alloys/advanced") + .ingredient('T', "mekanism:basic_fluid_tank") + .ingredient('P', "#mekanism:personal_storage") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "dissolver"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("dissolver"), r.getOutput()) - .pattern("ACA", "PMT", "ACA") - .ingredient('M', "mekanism:steel_casing") - .ingredient('C', "#forge:circuits/elite") - .ingredient('A', "#forge:ingots/refined_obsidian") - .ingredient('T', "mekanism:basic_chemical_tank") - .ingredient('P', "#mekanism:personal_storage") - .build() + new Identifier("alchemistry", "dissolver"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("dissolver"), r.getOutput()) + .pattern("ACA", "PMT", "ACA") + .ingredient('M', "mekanism:steel_casing") + .ingredient('C', "#forge:circuits/elite") + .ingredient('A', "#forge:ingots/refined_obsidian") + .ingredient('T', "mekanism:basic_chemical_tank") + .ingredient('P', "#mekanism:personal_storage") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "combiner"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("combiner"), r.getOutput()) - .pattern("ACA", "PMP", "ACA") - .ingredient('M', "mekanism:steel_casing") - .ingredient('C', "#forge:circuits/advanced") - .ingredient('A', "#forge:alloys/elite") - .ingredient('P', "#mekanism:personal_storage") - .build() + new Identifier("alchemistry", "combiner"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("combiner"), r.getOutput()) + .pattern("ACA", "PMP", "ACA") + .ingredient('M', "mekanism:steel_casing") + .ingredient('C', "#forge:circuits/advanced") + .ingredient('A', "#forge:alloys/elite") + .ingredient('P', "#mekanism:personal_storage") + .build() ); ev.mapRecipeID( - new Identifier("alchemistry", "compactor"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("compactor"), r.getOutput()) - .pattern("AQA", "CMC", "AQA") - .ingredient('M', "mekanism:steel_casing") - .ingredient('C', "#forge:circuits/ultimate") - .ingredient('A', "#forge:ingots/refined_obsidian") - .ingredient('Q', "ae2:charged_certus_quartz_crystal") - .build() + new Identifier("alchemistry", "compactor"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("compactor"), r.getOutput()) + .pattern("AQA", "CMC", "AQA") + .ingredient('M', "mekanism:steel_casing") + .ingredient('C', "#forge:circuits/ultimate") + .ingredient('A', "#forge:ingots/refined_obsidian") + .ingredient('Q', "ae2:charged_certus_quartz_crystal") + .build() ); ev.mapRecipeID( - new Identifier("psi", "programmer"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("psi_programmer"), r.getOutput()) - .pattern("SDS", "SCS", " S ") - .ingredient('S', "#forge:ingots/pure_steel") - .ingredient('D', "psi:psidust") - .ingredient('C', "ae2:calculation_processor") - .build() + new Identifier("psi", "programmer"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("psi_programmer"), r.getOutput()) + .pattern("SDS", "SCS", " S ") + .ingredient('S', "#forge:ingots/pure_steel") + .ingredient('D', "psi:psidust") + .ingredient('C', "ae2:calculation_processor") + .build() ); ev.mapRecipeID( - new Identifier("psi", "assembler"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("psi_assembler"), r.getOutput()) - .pattern("SDS", "SCS", " S ") - .ingredient('S', "#forge:ingots/pure_steel") - .ingredient('D', "ae2:formation_core") - .ingredient('C', "#forge:circuits/elite") - .build() + new Identifier("psi", "assembler"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("psi_assembler"), r.getOutput()) + .pattern("SDS", "SCS", " S ") + .ingredient('S', "#forge:ingots/pure_steel") + .ingredient('D', "ae2:formation_core") + .ingredient('C', "#forge:circuits/elite") + .build() ); ev.mapRecipeID( - new Identifier("sfm", "manager"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("sfm_manager"), r.getOutput()) - .pattern("SRS", "RCR", "SRS") - .ingredient('S', "ae2:smooth_sky_stone_block") - .ingredient('R', "dmlreforged:soot_covered_redstone") - .ingredient('C', "ae2:logic_processor") - .build() + new Identifier("sfm", "manager"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("sfm_manager"), r.getOutput()) + .pattern("SRS", "RCR", "SRS") + .ingredient('S', "ae2:smooth_sky_stone_block") + .ingredient('R', "dmlreforged:soot_covered_redstone") + .ingredient('C', "ae2:logic_processor") + .build() ); ev.mapRecipeID( - new Identifier("sfm", "cable"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("sfm_cable"), r.getOutput()) - .pattern("SNS", "FFF", "SCS") - .ingredient('S', "ae2:sky_dust") - .ingredient('F', "#forge:gems/fluix") - .ingredient('C', "#forge:gems/certus_quartz") - .ingredient('N', "#forge:gems/quartz") - .build() + new Identifier("sfm", "cable"), + r + -> new ShapedRecipeBuilder(Ntx4Core.id("sfm_cable"), r.getOutput()) + .pattern("SNS", "FFF", "SCS") + .ingredient('S', "ae2:sky_dust") + .ingredient('F', "#forge:gems/fluix") + .ingredient('C', "#forge:gems/certus_quartz") + .ingredient('N', "#forge:gems/quartz") + .build() ); ev.mapRecipeID( - new Identifier("modularrouters", "modular_router"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("modular_router"), new ItemStack(r.getOutput().getItem(), 1)) - .pattern("IFI", "NPC", "IFI") - .ingredient('I', "#forge:ingots/iron") - .ingredient('F', "#forge:gems/fluix") - .ingredient('C', "#forge:gems/certus_quartz") - .ingredient('N', "#forge:gems/quartz") - .ingredient('P', "ae2:logic_processor") - .build() + new Identifier("modularrouters", "modular_router"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("modular_router"), + new ItemStack(r.getOutput().getItem(), 1) + ) + .pattern("IFI", "NPC", "IFI") + .ingredient('I', "#forge:ingots/iron") + .ingredient('F', "#forge:gems/fluix") + .ingredient('C', "#forge:gems/certus_quartz") + .ingredient('N', "#forge:gems/quartz") + .ingredient('P', "ae2:logic_processor") + .build() ); ev.mapRecipeID( - new Identifier("mininggadgets", "mininggadget_simple"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("mininggadget_simple"), new ItemStack(r.getOutput().getItem(), 1)) - .pattern("RME", "PCD", "EI ") - .ingredient('I', "#forge:ingots/iron") - .ingredient('R', "#forge:dusts/redstone") - .ingredient('C', "powah:capacitor_blazing") - .ingredient('M', "mininggadgets:upgrade_empty") - .ingredient('E', "powah:steel_energized") - .ingredient('D', "#forge:gems/diamond") - .ingredient('P', "powah:dielectric_paste") - .build() + new Identifier("mininggadgets", "mininggadget_simple"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("mininggadget_simple"), + new ItemStack(r.getOutput().getItem(), 1) + ) + .pattern("RME", "PCD", "EI ") + .ingredient('I', "#forge:ingots/iron") + .ingredient('R', "#forge:dusts/redstone") + .ingredient('C', "powah:capacitor_blazing") + .ingredient('M', "mininggadgets:upgrade_empty") + .ingredient('E', "powah:steel_energized") + .ingredient('D', "#forge:gems/diamond") + .ingredient('P', "powah:dielectric_paste") + .build() ); ev.mapRecipeID( - new Identifier("mininggadgets", "mininggadget_fancy"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("mininggadget_fancy"), new ItemStack(r.getOutput().getItem(), 1)) - .pattern("RME", "PCD", "EI ") - .ingredient('I', "#forge:ingots/iron") - .ingredient('R', "#forge:dusts/redstone") - .ingredient('C', "powah:capacitor_niotic") - .ingredient('M', "mininggadgets:upgrade_empty") - .ingredient('E', "powah:steel_energized") - .ingredient('D', "#forge:gems/diamond") - .ingredient('P', "powah:dielectric_paste") - .build() + new Identifier("mininggadgets", "mininggadget_fancy"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("mininggadget_fancy"), + new ItemStack(r.getOutput().getItem(), 1) + ) + .pattern("RME", "PCD", "EI ") + .ingredient('I', "#forge:ingots/iron") + .ingredient('R', "#forge:dusts/redstone") + .ingredient('C', "powah:capacitor_niotic") + .ingredient('M', "mininggadgets:upgrade_empty") + .ingredient('E', "powah:steel_energized") + .ingredient('D', "#forge:gems/diamond") + .ingredient('P', "powah:dielectric_paste") + .build() ); ev.mapRecipeID( - new Identifier("mininggadgets", "mininggadget"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("mininggadget"), new ItemStack(r.getOutput().getItem(), 1)) - .pattern("RME", "PCD", "EI ") - .ingredient('I', "#forge:ingots/iron") - .ingredient('R', "#forge:dusts/redstone") - .ingredient('C', "powah:capacitor_spirited") - .ingredient('M', "mininggadgets:upgrade_empty") - .ingredient('E', "powah:steel_energized") - .ingredient('D', "#forge:gems/diamond") - .ingredient('P', "powah:dielectric_paste") - .build() + new Identifier("mininggadgets", "mininggadget"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("mininggadget"), new ItemStack(r.getOutput().getItem(), 1) + ) + .pattern("RME", "PCD", "EI ") + .ingredient('I', "#forge:ingots/iron") + .ingredient('R', "#forge:dusts/redstone") + .ingredient('C', "powah:capacitor_spirited") + .ingredient('M', "mininggadgets:upgrade_empty") + .ingredient('E', "powah:steel_energized") + .ingredient('D', "#forge:gems/diamond") + .ingredient('P', "powah:dielectric_paste") + .build() ); ev.mapRecipeID( - new Identifier("mekanism", "metallurgic_infuser"), - r -> new ShapedRecipeBuilder(Ntx4Core.id("metallurgic_infuser"), new ItemStack(r.getOutput().getItem(), 1)) - .pattern("IFI", "DCD", "IFI") - .ingredient('I', "#forge:ingots/osmium") - .ingredient('D', "#forge:dusts/redstone") - .ingredient('C', "industrialforegoing:machine_frame_simple") - .ingredient('F', "minecraft:furnace") - .build() + new Identifier("mekanism", "metallurgic_infuser"), + r + -> new ShapedRecipeBuilder( + Ntx4Core.id("metallurgic_infuser"), + new ItemStack(r.getOutput().getItem(), 1) + ) + .pattern("IFI", "DCD", "IFI") + .ingredient('I', "#forge:ingots/osmium") + .ingredient('D', "#forge:dusts/redstone") + .ingredient('C', "industrialforegoing:machine_frame_simple") + .ingredient('F', "minecraft:furnace") + .build() ); } diff --git a/src/main/java/net/anvilcraft/ntx4core/recipes/ShapedRecipes.java b/src/main/java/net/anvilcraft/ntx4core/recipes/ShapedRecipes.java index c3d6422..e9c87ae 100644 --- a/src/main/java/net/anvilcraft/ntx4core/recipes/ShapedRecipes.java +++ b/src/main/java/net/anvilcraft/ntx4core/recipes/ShapedRecipes.java @@ -29,27 +29,27 @@ public class ShapedRecipes implements IEventBusRegisterable { .ingredient('C', "mekanism:teleportation_core") .ingredient('E', "mekanism:energy_tablet") .build()); - ev.registerRecipe(new ShapedRecipeBuilder( - Ntx4Core.id("dark_matter_conversion"), + ev.registerRecipe( + new ShapedRecipeBuilder( + Ntx4Core.id("dark_matter_conversion"), Util.stackFromRegistry(new Identifier("projecte", "dark_matter")) ) - .pattern("FDF", "DDD", "FDF") - .ingredient('D', "nuclearscience:celldarkmatter") - .ingredient('F', "projecte:aeternalis_fuel") - .build() + .pattern("FDF", "DDD", "FDF") + .ingredient('D', "nuclearscience:celldarkmatter") + .ingredient('F', "projecte:aeternalis_fuel") + .build() ); ev.registerRecipe(new ShapedRecipeBuilder( - Ntx4Core.id("inscriber"), - Util.stackFromRegistry(new Identifier("ae2", "inscriber")) - ) - .pattern("IPI", "DCD", "IPI") - .ingredient('I', "#forge:ingots/steel") - .ingredient('D', "#forge:dusts/fluix") - .ingredient('C', "industrialforegoing:machine_frame_simple") - .ingredient('P', "minecraft:piston") - .build() - ); + Ntx4Core.id("inscriber"), + Util.stackFromRegistry(new Identifier("ae2", "inscriber")) + ) + .pattern("IPI", "DCD", "IPI") + .ingredient('I', "#forge:ingots/steel") + .ingredient('D', "#forge:dusts/fluix") + .ingredient('C', "industrialforegoing:machine_frame_simple") + .ingredient('P', "minecraft:piston") + .build()); } @Override