diff --git a/CHANGELOG.md b/CHANGELOG.md index e699269..d7a6007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,14 @@ +# v1.1.1 +- Prevent duplicate recipe registration in Electric Implosion Compressor +- Remove unnecessary RecyclingRecipes initialization + +* * * + # v1.1.0 - Fix dependence issues - Add logo -******** +* * * # v1.0.0 - Initial release diff --git a/build.gradle b/build.gradle index d53c0e4..1204711 100644 --- a/build.gradle +++ b/build.gradle @@ -565,7 +565,7 @@ dependencies { compileOnlyApi 'org.jetbrains:annotations:24.1.0' annotationProcessor 'org.jetbrains:annotations:24.1.0' - patchedMinecraft('net.minecraft:launchwrapper:1.17.2') { + patchedMinecraft('net.minecraft:launchwrapper:1.12') { transitive = false } diff --git a/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java b/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java index 99516db..2040c71 100644 --- a/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java +++ b/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java @@ -1,7 +1,12 @@ package com.github.gtexpert.inb.core; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.SidedProxy; @@ -17,7 +22,6 @@ import gregtech.api.recipes.RecipeMaps; import gregtech.api.recipes.ingredients.GTRecipeInput; -import gregtech.loaders.recipe.RecyclingRecipes; import com.github.gtexpert.inb.api.INBValues; import com.github.gtexpert.inb.api.modules.IINBModule; @@ -54,6 +58,15 @@ public void preInit(FMLPreInitializationEvent event) { RecipeMaps.IMPLOSION_RECIPES.onRecipeBuild( recipeBuilder -> { + List inputs = recipeBuilder.getInputs().stream() + .map(GTRecipeInput::getInputStacks) + .filter(stacks -> stacks.length > 0) + .map(stacks -> stacks[0]) + .collect(Collectors.toList()); + if (INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES + .findRecipe(Long.MAX_VALUE, inputs, Collections.emptyList()) != null) { + return; + } INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder() .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) .outputs(recipeBuilder.getOutputs()) @@ -66,9 +79,7 @@ public void preInit(FMLPreInitializationEvent event) { public void init(FMLInitializationEvent event) {} @Override - public void postInit(FMLPostInitializationEvent event) { - RecyclingRecipes.init(); - } + public void postInit(FMLPostInitializationEvent event) {} @Override public void registerBlocks(RegistryEvent.Register event) {