dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat

Browse Source
This commit is contained in:
raoulvdberge
2017-11-11 13:33:19 +01:00
parent f321e76036
commit 9b10d907c9
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
View File

@@ -29,7 +29,7 @@ public class CraftingPattern implements ICraftingPattern {
private List<ItemStack> outputs = new ArrayList<>(); private List<ItemStack> outputs = new ArrayList<>();
private List<ItemStack> byproducts = new ArrayList<>(); private List<ItemStack> byproducts = new ArrayList<>();
private Integer hashCodeCached = null; private Integer hashCodeCached = null;
public CraftingPattern(World world, ICraftingPatternContainer container, ItemStack stack) { public CraftingPattern(World world, ICraftingPatternContainer container, ItemStack stack) {
this.container = container; this.container = container;
this.stack = Comparer.stripTags(stack); this.stack = Comparer.stripTags(stack);
@@ -274,12 +274,12 @@ public class CraftingPattern implements ICraftingPattern {
", byproducts=" + byproducts + ", byproducts=" + byproducts +
'}'; '}';
} }
@Override @Override
public boolean equals (Object obj) { public boolean equals(Object obj) {
return this == obj || (obj instanceof ICraftingPattern && this.alike((ICraftingPattern) obj)); return this == obj || (obj instanceof ICraftingPattern && this.alike((ICraftingPattern) obj));
} }
@Override @Override
public int hashCode() { public int hashCode() {
if (hashCodeCached == null) { if (hashCodeCached == null) {
@@ -295,7 +295,7 @@ public class CraftingPattern implements ICraftingPattern {
} }
return hashCodeCached; return hashCodeCached;
} }
@Override @Override
public boolean alike(ICraftingPattern other) { public boolean alike(ICraftingPattern other) {
if (other == this) { if (other == this) {

11
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java
View File

@@ -3,18 +3,13 @@ package com.raoulvdberge.refinedstorage.apiimpl.autocrafting;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternChain;
import java.util.Collection; import java.util.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class CraftingPatternChainList implements Iterable<CraftingPatternChainList.CraftingPatternChain> { public class CraftingPatternChainList implements Iterable<CraftingPatternChainList.CraftingPatternChain> {
LinkedList<CraftingPatternChain> innerChain = new LinkedList<>(); LinkedList<CraftingPatternChain> innerChain = new LinkedList<>();
Map<ICraftingPattern, CraftingPatternChain> innerChainMap = new HashMap<>(); Map<ICraftingPattern, CraftingPatternChain> innerChainMap = new HashMap<>();
public void add(ICraftingPattern pattern) { public void add(ICraftingPattern pattern) {
CraftingPatternChain chain = innerChainMap.get(pattern); CraftingPatternChain chain = innerChainMap.get(pattern);
if (chain == null) { if (chain == null) {
@@ -26,7 +21,7 @@ public class CraftingPatternChainList implements Iterable<CraftingPatternChainLi
chain = new CraftingPatternChain(pattern); chain = new CraftingPatternChain(pattern);
innerChain.add(chain); innerChain.add(chain);
innerChainMap.put(pattern, chain); innerChainMap.put(pattern, chain);
} }
} }
} }