From 721ea24a226c2dca5cfef4b3f638d251547df0b8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 4 Aug 2019 22:11:07 +0800 Subject: yes thank you --- .../me/shedaniel/rei/client/RecipeHelperImpl.java | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java') diff --git a/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java index 492aa8b7c..979776040 100644 --- a/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/client/RecipeHelperImpl.java @@ -58,18 +58,18 @@ public class RecipeHelperImpl implements RecipeHelper { @Override public List findCraftableByItems(List inventoryItems) { List craftables = new ArrayList<>(); - for(List value : recipeCategoryListMap.values()) - for(RecipeDisplay recipeDisplay : value) { + for (List value : recipeCategoryListMap.values()) + for (RecipeDisplay recipeDisplay : value) { int slotsCraftable = 0; List> requiredInput = (List>) recipeDisplay.getRequiredItems(); - for(List slot : requiredInput) { + for (List slot : requiredInput) { if (slot.isEmpty()) { slotsCraftable++; continue; } boolean slotDone = false; - for(ItemStack possibleType : inventoryItems) { - for(ItemStack slotPossible : slot) + for (ItemStack possibleType : inventoryItems) { + for (ItemStack slotPossible : slot) if (ItemStack.areItemsEqualIgnoreDamage(slotPossible, possibleType)) { slotsCraftable++; slotDone = true; @@ -126,21 +126,21 @@ public class RecipeHelperImpl implements RecipeHelper { public Map, List> getRecipesFor(ItemStack stack) { Map> categoriesMap = new HashMap<>(); categories.forEach(f -> categoriesMap.put(f.getIdentifier(), Lists.newArrayList())); - for(Map.Entry> entry : recipeCategoryListMap.entrySet()) { + for (Map.Entry> entry : recipeCategoryListMap.entrySet()) { RecipeCategory category = getCategory(entry.getKey()); - for(RecipeDisplay recipeDisplay : entry.getValue()) - for(ItemStack outputStack : (List) recipeDisplay.getOutput()) + for (RecipeDisplay recipeDisplay : entry.getValue()) + for (ItemStack outputStack : (List) recipeDisplay.getOutput()) if (category.checkTags() ? ItemStack.areEqualIgnoreDamage(stack, outputStack) : ItemStack.areItemsEqualIgnoreDamage(stack, outputStack)) categoriesMap.get(recipeDisplay.getRecipeCategory()).add(recipeDisplay); } - for(LiveRecipeGenerator liveRecipeGenerator : liveRecipeGenerators) + for (LiveRecipeGenerator liveRecipeGenerator : liveRecipeGenerators) ((Optional) liveRecipeGenerator.getRecipeFor(stack)).ifPresent(o -> categoriesMap.get(liveRecipeGenerator.getCategoryIdentifier()).addAll(o)); Map, List> recipeCategoryListMap = Maps.newLinkedHashMap(); categories.forEach(category -> { if (categoriesMap.containsKey(category.getIdentifier()) && !categoriesMap.get(category.getIdentifier()).isEmpty()) recipeCategoryListMap.put(category, categoriesMap.get(category.getIdentifier()).stream().filter(display -> isDisplayVisible(display)).collect(Collectors.toList())); }); - for(RecipeCategory category : Lists.newArrayList(recipeCategoryListMap.keySet())) + for (RecipeCategory category : Lists.newArrayList(recipeCategoryListMap.keySet())) if (recipeCategoryListMap.get(category).isEmpty()) recipeCategoryListMap.remove(category); return recipeCategoryListMap; @@ -160,12 +160,12 @@ public class RecipeHelperImpl implements RecipeHelper { public Map, List> getUsagesFor(ItemStack stack) { Map> categoriesMap = new HashMap<>(); categories.forEach(f -> categoriesMap.put(f.getIdentifier(), Lists.newArrayList())); - for(Map.Entry> entry : recipeCategoryListMap.entrySet()) { + for (Map.Entry> entry : recipeCategoryListMap.entrySet()) { RecipeCategory category = getCategory(entry.getKey()); - for(RecipeDisplay recipeDisplay : entry.getValue()) { + for (RecipeDisplay recipeDisplay : entry.getValue()) { boolean found = false; - for(List input : (List>) recipeDisplay.getInput()) { - for(ItemStack itemStack : input) { + for (List input : (List>) recipeDisplay.getInput()) { + for (ItemStack itemStack : input) { if (category.checkTags() ? ItemStack.areEqualIgnoreDamage(itemStack, stack) : ItemStack.areItemsEqualIgnoreDamage(itemStack, stack)) { categoriesMap.get(recipeDisplay.getRecipeCategory()).add(recipeDisplay); found = true; @@ -177,14 +177,14 @@ public class RecipeHelperImpl implements RecipeHelper { } } } - for(LiveRecipeGenerator liveRecipeGenerator : liveRecipeGenerators) + for (LiveRecipeGenerator liveRecipeGenerator : liveRecipeGenerators) ((Optional) liveRecipeGenerator.getUsageFor(stack)).ifPresent(o -> categoriesMap.get(liveRecipeGenerator.getCategoryIdentifier()).addAll(o)); Map, List> recipeCategoryListMap = Maps.newLinkedHashMap(); categories.forEach(category -> { if (categoriesMap.containsKey(category.getIdentifier()) && !categoriesMap.get(category.getIdentifier()).isEmpty()) recipeCategoryListMap.put(category, categoriesMap.get(category.getIdentifier()).stream().filter(display -> isDisplayVisible(display)).collect(Collectors.toList())); }); - for(RecipeCategory category : Lists.newArrayList(recipeCategoryListMap.keySet())) + for (RecipeCategory category : Lists.newArrayList(recipeCategoryListMap.keySet())) if (recipeCategoryListMap.get(category).isEmpty()) recipeCategoryListMap.remove(category); return recipeCategoryListMap; @@ -367,7 +367,7 @@ public class RecipeHelperImpl implements RecipeHelper { public boolean isDisplayVisible(RecipeDisplay display) { RecipeCategory category = getCategory(display.getRecipeCategory()); List list = getDisplayVisibilityHandlers().stream().sorted(VISIBILITY_HANDLER_COMPARATOR).collect(Collectors.toList()); - for(DisplayVisibilityHandler displayVisibilityHandler : list) { + for (DisplayVisibilityHandler displayVisibilityHandler : list) { try { ActionResult visibility = displayVisibilityHandler.handleDisplay(category, display); if (visibility != ActionResult.PASS) -- cgit