Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a problem with OreDict entries getting added for items with stack sizes of 8

Browse source 
Closes #35
This commit is contained in:
Ellpeck 2016-01-03 19:01:40 +01:00
parent caf3fac208
commit 93fcacdacb
2 changed files with 55 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java
View file

@ -145,10 +145,18 @@ public class LensNoneRecipeHandler{
} }
List<ItemStack> stacks = OreDictionary.getOres(this.output, false); List<ItemStack> stacks = OreDictionary.getOres(this.output, false);
if(stacks != null && !stacks.isEmpty()){
List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
for(ItemStack stack : stacks){ for(ItemStack stack : stacks){
stack.stackSize = 1; if(stack != null){
ItemStack stackCopy = stack.copy();
stackCopy.stackSize = 1;
stacksCopy.add(stackCopy);
} }
return stacks; }
return stacksCopy;
}
return null;
} }
public List<ItemStack> getInputs(){ public List<ItemStack> getInputs(){
@ -161,10 +169,18 @@ public class LensNoneRecipeHandler{
} }
List<ItemStack> stacks = OreDictionary.getOres(this.input, false); List<ItemStack> stacks = OreDictionary.getOres(this.input, false);
if(stacks != null && !stacks.isEmpty()){
List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
for(ItemStack stack : stacks){ for(ItemStack stack : stacks){
stack.stackSize = 1; if(stack != null){
ItemStack stackCopy = stack.copy();
stackCopy.stackSize = 1;
stacksCopy.add(stackCopy);
} }
return stacks; }
return stacksCopy;
}
return null;
} }
} }
} }

36
src/main/java/de/ellpeck/actuallyadditions/recipe/CrusherRecipeRegistry.java
View file

@ -172,10 +172,18 @@ public class CrusherRecipeRegistry{
} }
List<ItemStack> stacks = OreDictionary.getOres(this.outputOne, false); List<ItemStack> stacks = OreDictionary.getOres(this.outputOne, false);
if(stacks != null && !stacks.isEmpty()){
List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
for(ItemStack stack : stacks){ for(ItemStack stack : stacks){
stack.stackSize = this.outputOneAmount; if(stack != null){
ItemStack stackCopy = stack.copy();
stackCopy.stackSize = this.outputOneAmount;
stacksCopy.add(stackCopy);
} }
return stacks; }
return stacksCopy;
}
return null;
} }
public List<ItemStack> getRecipeOutputTwos(){ public List<ItemStack> getRecipeOutputTwos(){
@ -188,10 +196,18 @@ public class CrusherRecipeRegistry{
} }
List<ItemStack> stacks = OreDictionary.getOres(this.outputTwo, false); List<ItemStack> stacks = OreDictionary.getOres(this.outputTwo, false);
if(stacks != null && !stacks.isEmpty()){
List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
for(ItemStack stack : stacks){ for(ItemStack stack : stacks){
stack.stackSize = this.outputTwoAmount; if(stack != null){
ItemStack stackCopy = stack.copy();
stackCopy.stackSize = this.outputTwoAmount;
stacksCopy.add(stackCopy);
} }
return stacks; }
return stacksCopy;
}
return null;
} }
public List<ItemStack> getRecipeInputs(){ public List<ItemStack> getRecipeInputs(){
@ -204,10 +220,18 @@ public class CrusherRecipeRegistry{
} }
List<ItemStack> stacks = OreDictionary.getOres(this.input, false); List<ItemStack> stacks = OreDictionary.getOres(this.input, false);
if(stacks != null && !stacks.isEmpty()){
List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
for(ItemStack stack : stacks){ for(ItemStack stack : stacks){
stack.stackSize = 1; if(stack != null){
ItemStack stackCopy = stack.copy();
stackCopy.stackSize = 1;
stacksCopy.add(stackCopy);
} }
return stacks; }
return stacksCopy;
}
return null;
} }
} }