Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
19 changes: 15 additions & 4 deletions src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -54,6 +58,15 @@ public void preInit(FMLPreInitializationEvent event) {

RecipeMaps.IMPLOSION_RECIPES.onRecipeBuild(
recipeBuilder -> {
List<ItemStack> 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())
Expand All @@ -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<Block> event) {
Expand Down
Loading