diff options
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/recipe/RecipeMaps.java | 23 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GTForestryCompat.java | 11 |
2 files changed, 8 insertions, 26 deletions
diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java index 197c15875d..7f81e58370 100644 --- a/src/main/java/gregtech/api/recipe/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java @@ -79,7 +79,6 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTRecipeConstants; -import gregtech.api.util.GTRecipeMapUtil; import gregtech.api.util.GTUtility; import gregtech.common.tileentities.machines.multi.purification.PurifiedWaterHelpers; import gregtech.nei.formatter.FuelSpecialValueFormatter; @@ -1098,25 +1097,6 @@ public final class RecipeMaps { .maxIO(1, 1, 0, 0) .neiSpecialInfoFormatter(FuelSpecialValueFormatter.INSTANCE) .build(); - public static final RecipeMap<RecipeMapBackend> electrolyzerNonCellRecipes = RecipeMapBuilder - .of("gt.recipe.largeelectrolyzer") - .maxIO(1, 6, 1, 6) - .disableRegisterNEI() - .recipeEmitter(GTRecipeMapUtil::buildRecipeForMultiblock) - .build(); - public static final RecipeMap<RecipeMapBackend> centrifugeNonCellRecipes = RecipeMapBuilder - .of("gt.recipe.largecentrifuge") - .maxIO(2, 6, 1, 6) - .disableOptimize() - .disableRegisterNEI() - .recipeEmitter(GTRecipeMapUtil::buildRecipeForMultiblock) - .build(); - public static final RecipeMap<RecipeMapBackend> mixerNonCellRecipes = RecipeMapBuilder.of("gt.recipe.largemixer") - .maxIO(9, 4, 6, 4) - .disableOptimize() - .disableRegisterNEI() - .recipeEmitter(GTRecipeMapUtil::buildRecipeForMultiblockNoCircuit) - .build(); public static final RecipeMap<LargeBoilerFuelBackend> largeBoilerFakeFuels = RecipeMapBuilder .of("gt.recipe.largeboilerfakefuels", LargeBoilerFuelBackend::new) .maxIO(1, 1, 0, 0) @@ -1230,9 +1210,6 @@ public final class RecipeMaps { .build(); static { - RecipeMaps.centrifugeRecipes.addDownstream(RecipeMaps.centrifugeNonCellRecipes.deepCopyInput()); - RecipeMaps.mixerRecipes.addDownstream(RecipeMaps.mixerNonCellRecipes.deepCopyInput()); - RecipeMaps.electrolyzerRecipes.addDownstream(RecipeMaps.electrolyzerNonCellRecipes.deepCopyInput()); RecipeMaps.dieselFuels.addDownstream( IRecipeMap.newRecipeMap( b -> b.build() diff --git a/src/main/java/gregtech/api/util/GTForestryCompat.java b/src/main/java/gregtech/api/util/GTForestryCompat.java index ca61c955c7..86eaa519e7 100644 --- a/src/main/java/gregtech/api/util/GTForestryCompat.java +++ b/src/main/java/gregtech/api/util/GTForestryCompat.java @@ -7,6 +7,8 @@ import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.util.Map; +import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import forestry.api.recipes.ICentrifugeRecipe; @@ -170,10 +172,13 @@ public class GTForestryCompat { public static void transferSqueezerRecipes() { try { for (ISqueezerRecipe tRecipe : RecipeManagers.squeezerManager.recipes()) { - if ((tRecipe.getResources().length == 1) && (tRecipe.getFluidOutput() != null) - && (tRecipe.getResources()[0] != null)) { + ItemStack[] resources = tRecipe.getResources(); + if ((resources.length == 1) && (tRecipe.getFluidOutput() != null) && (resources[0] != null)) { + Item input = resources[0].getItem(); + if (input == Items.pumpkin_seeds || input == Items.melon_seeds || input == Items.wheat_seeds) + return; GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); - recipeBuilder.itemInputs(tRecipe.getResources()[0]); + recipeBuilder.itemInputs(resources[0]); if (tRecipe.getRemnants() != null) { recipeBuilder.itemOutputs(tRecipe.getRemnants()) .outputChances((int) (tRecipe.getRemnantsChance() * 10000)); |