From 022e45861fb2310150e02c6563ffce1be8e1437b Mon Sep 17 00:00:00 2001 From: Thiakil Date: Mon, 13 Nov 2023 17:27:49 +0800 Subject: [PATCH] update projecte to 1.20 api --- gradle.properties | 4 ++-- .../projecte/mappers/ChemicalCrystallizerRecipeMapper.java | 3 ++- .../projecte/mappers/ChemicalDissolutionRecipeMapper.java | 3 ++- .../projecte/mappers/ChemicalInfuserRecipeMapper.java | 3 ++- .../integration/projecte/mappers/CombinerRecipeMapper.java | 3 ++- .../projecte/mappers/ElectrolysisRecipeMapper.java | 3 ++- .../projecte/mappers/FluidSlurryToSlurryRecipeMapper.java | 3 ++- .../projecte/mappers/FluidToFluidRecipeMapper.java | 3 ++- .../integration/projecte/mappers/GasToGasRecipeMapper.java | 3 ++- .../projecte/mappers/ItemStackGasToItemStackRecipeMapper.java | 3 ++- .../projecte/mappers/ItemStackToGasRecipeMapper.java | 3 ++- .../projecte/mappers/ItemStackToInfuseTypeRecipeMapper.java | 3 ++- .../projecte/mappers/ItemStackToItemStackRecipeMapper.java | 3 ++- .../projecte/mappers/ItemStackToPigmentRecipeMapper.java | 3 ++- .../projecte/mappers/MetallurgicInfuserRecipeMapper.java | 3 ++- .../projecte/mappers/PaintingMachineRecipeMapper.java | 3 ++- .../projecte/mappers/PigmentMixerRecipeMapper.java | 3 ++- .../projecte/mappers/PressurizedReactionRecipeMapper.java | 3 ++- .../integration/projecte/mappers/RotaryRecipeMapper.java | 3 ++- .../integration/projecte/mappers/SawmillRecipeMapper.java | 3 ++- 20 files changed, 40 insertions(+), 21 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3e2350382ec..f020e6223cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,11 +61,11 @@ terrablender_id=4647094 #Outdated mod dependencies ctm_version=1.1.7+11 -projecte_api_id=3955049 +projecte_api_id=4860862 oc2_id=3896581 #Outdated mod dependencies for recipes byg_id=4602199 ilikewood_bop_id=4068509 ilikewood_byg_id=4068511 -projecte_id=3955047 \ No newline at end of file +projecte_id=4860859 \ No newline at end of file diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalCrystallizerRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalCrystallizerRecipeMapper.java index d8888176056..866c35b38e3 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalCrystallizerRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalCrystallizerRecipeMapper.java @@ -10,6 +10,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -33,7 +34,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ChemicalCrystallizerRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalDissolutionRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalDissolutionRecipeMapper.java index 7bf8aebcff2..d234ddf156c 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalDissolutionRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalDissolutionRecipeMapper.java @@ -13,6 +13,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -37,7 +38,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ChemicalDissolutionRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalInfuserRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalInfuserRecipeMapper.java index 0658840b045..3e2a5e94dd9 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalInfuserRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ChemicalInfuserRecipeMapper.java @@ -11,6 +11,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import org.jetbrains.annotations.NotNull; @@ -34,7 +35,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ChemicalInfuserRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/CombinerRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/CombinerRecipeMapper.java index 5f9c67c2827..6dc3aaf6791 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/CombinerRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/CombinerRecipeMapper.java @@ -10,6 +10,7 @@ import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NSSItem; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -34,7 +35,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof CombinerRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ElectrolysisRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ElectrolysisRecipeMapper.java index a2cd8c6dfd0..60faf585b16 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ElectrolysisRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ElectrolysisRecipeMapper.java @@ -13,6 +13,7 @@ import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NSSFluid; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.fluids.FluidStack; @@ -36,7 +37,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ElectrolysisRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/FluidSlurryToSlurryRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/FluidSlurryToSlurryRecipeMapper.java index d240e6841ef..11f632685cc 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/FluidSlurryToSlurryRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/FluidSlurryToSlurryRecipeMapper.java @@ -11,6 +11,7 @@ import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NSSFluid; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.fluids.FluidStack; @@ -35,7 +36,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof FluidSlurryToSlurryRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/FluidToFluidRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/FluidToFluidRecipeMapper.java index e453b935036..4f61e5e8e4e 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/FluidToFluidRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/FluidToFluidRecipeMapper.java @@ -8,6 +8,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.fluids.FluidStack; @@ -31,7 +32,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof FluidToFluidRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/GasToGasRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/GasToGasRecipeMapper.java index 55a9b081b2c..87a5cbf0421 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/GasToGasRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/GasToGasRecipeMapper.java @@ -9,6 +9,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -31,7 +32,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof GasToGasRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackGasToItemStackRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackGasToItemStackRecipeMapper.java index 0699389a2c2..2eb3ffa3d3b 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackGasToItemStackRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackGasToItemStackRecipeMapper.java @@ -12,6 +12,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -36,7 +37,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ItemStackGasToItemStackRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToGasRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToGasRecipeMapper.java index 1b55341a354..dbcf44e9964 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToGasRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToGasRecipeMapper.java @@ -9,6 +9,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -32,7 +33,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ItemStackToGasRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToInfuseTypeRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToInfuseTypeRecipeMapper.java index df4c2b4ede3..d740f2a5eba 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToInfuseTypeRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToInfuseTypeRecipeMapper.java @@ -9,6 +9,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -32,7 +33,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ItemStackToInfuseTypeRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToItemStackRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToItemStackRecipeMapper.java index 75db16ac78b..8bdbb33af9d 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToItemStackRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToItemStackRecipeMapper.java @@ -8,6 +8,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -31,7 +32,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ItemStackToItemStackRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToPigmentRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToPigmentRecipeMapper.java index 95571270994..6239d32fd0d 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToPigmentRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/ItemStackToPigmentRecipeMapper.java @@ -9,6 +9,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -32,7 +33,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof ItemStackToPigmentRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/MetallurgicInfuserRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/MetallurgicInfuserRecipeMapper.java index bb6b2d9f61c..1d740dc916b 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/MetallurgicInfuserRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/MetallurgicInfuserRecipeMapper.java @@ -11,6 +11,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -35,7 +36,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof MetallurgicInfuserRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/PaintingMachineRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/PaintingMachineRecipeMapper.java index 35d5c0afc94..5c15133c755 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/PaintingMachineRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/PaintingMachineRecipeMapper.java @@ -11,6 +11,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -35,7 +36,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof PaintingRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/PigmentMixerRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/PigmentMixerRecipeMapper.java index a33315d522f..a068e438b21 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/PigmentMixerRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/PigmentMixerRecipeMapper.java @@ -11,6 +11,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import org.jetbrains.annotations.NotNull; @@ -34,7 +35,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof PigmentMixingRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/PressurizedReactionRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/PressurizedReactionRecipeMapper.java index 7fa9de34559..8a06403844b 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/PressurizedReactionRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/PressurizedReactionRecipeMapper.java @@ -14,6 +14,7 @@ import moze_intel.projecte.api.nss.NSSFluid; import moze_intel.projecte.api.nss.NSSItem; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -44,7 +45,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof PressurizedReactionRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/RotaryRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/RotaryRecipeMapper.java index 6ce9da47a40..9588dfd81a7 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/RotaryRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/RotaryRecipeMapper.java @@ -9,6 +9,7 @@ import moze_intel.projecte.api.mapper.recipe.IRecipeTypeMapper; import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.fluids.FluidStack; @@ -32,7 +33,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof RotaryRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false; diff --git a/src/main/java/mekanism/common/integration/projecte/mappers/SawmillRecipeMapper.java b/src/main/java/mekanism/common/integration/projecte/mappers/SawmillRecipeMapper.java index 4e9adb2540c..0b19e179956 100644 --- a/src/main/java/mekanism/common/integration/projecte/mappers/SawmillRecipeMapper.java +++ b/src/main/java/mekanism/common/integration/projecte/mappers/SawmillRecipeMapper.java @@ -11,6 +11,7 @@ import moze_intel.projecte.api.mapper.recipe.RecipeTypeMapper; import moze_intel.projecte.api.nss.NSSItem; import moze_intel.projecte.api.nss.NormalizedSimpleStack; +import net.minecraft.core.RegistryAccess; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeType; @@ -40,7 +41,7 @@ public boolean canHandle(RecipeType recipeType) { } @Override - public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, INSSFakeGroupManager groupManager) { + public boolean handleRecipe(IMappingCollector mapper, Recipe iRecipe, RegistryAccess registryAccess, INSSFakeGroupManager groupManager) { if (!(iRecipe instanceof SawmillRecipe recipe)) { //Double check that we have a type of recipe we know how to handle return false;