parent
537345e309
commit
d93badef8f
1 changed files with 12 additions and 7 deletions
|
@ -9,11 +9,8 @@ import gregtechmod.common.RecipeHandler;
|
||||||
import gregtechmod.common.RecipeHandler.IRecipeMatcher;
|
import gregtechmod.common.RecipeHandler.IRecipeMatcher;
|
||||||
import gregtechmod.common.RecipeHandler.InventoryRecipeMatcher;
|
import gregtechmod.common.RecipeHandler.InventoryRecipeMatcher;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Arrays;
|
import java.util.stream.Collectors;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
|
@ -201,10 +198,18 @@ public class GT_RecipeRegistrator {
|
||||||
for (ItemStack a : unifiedStacks) {
|
for (ItemStack a : unifiedStacks) {
|
||||||
ItemStack block = aMaterial.mSmallBlock ? GT_ModHandler.getRecipeOutput(a, a, null, a, a, null) : GT_ModHandler.getRecipeOutput(a, a, a, a, a, a, a, a, a);
|
ItemStack block = aMaterial.mSmallBlock ? GT_ModHandler.getRecipeOutput(a, a, null, a, a, null) : GT_ModHandler.getRecipeOutput(a, a, a, a, a, a, a, a, a);
|
||||||
if (block != null) {
|
if (block != null) {
|
||||||
Optional<String> optional = Arrays.stream(OreDictionary.getOreIDs(block))
|
Set<String> names = Arrays.stream(OreDictionary.getOreIDs(block))
|
||||||
.mapToObj(i -> OreDictionary.getOreName(i))
|
.mapToObj(OreDictionary::getOreName)
|
||||||
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
|
if (names.contains(aPrefix.get(aMaterial))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Optional<String> optional = names.stream()
|
||||||
.filter(name -> name.startsWith(OrePrefixes.block.toString()))
|
.filter(name -> name.startsWith(OrePrefixes.block.toString()))
|
||||||
.findAny();
|
.findAny();
|
||||||
|
|
||||||
if (!optional.isPresent() && !GregTech_API.sUnification.get(GT_ConfigCategories.forceoredict, block, dictName).equals("false")) {
|
if (!optional.isPresent() && !GregTech_API.sUnification.get(GT_ConfigCategories.forceoredict, block, dictName).equals("false")) {
|
||||||
GT_OreDictUnificator.set(dictName, block);
|
GT_OreDictUnificator.set(dictName, block);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue