Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a bug that showed how few people were actually using the manual.

Browse source 
Closes #168
This commit is contained in:
Ellpeck 2016-07-26 13:35:20 +02:00
parent bcbf40a163
commit 48c3c0c848
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java
View file

@ -85,12 +85,20 @@ public class PageCrafting extends BookletPageAA{
ShapedRecipes shaped = (ShapedRecipes)recipe; ShapedRecipes shaped = (ShapedRecipes)recipe;
width = shaped.recipeWidth; width = shaped.recipeWidth;
height = shaped.recipeHeight; height = shaped.recipeHeight;
stacks = shaped.recipeItems; for(int i = 0; i < shaped.recipeItems.length; i++){
ItemStack stack = shaped.recipeItems[i];
if(stack != null){
stacks[i] = stack.copy();
}
}
} }
else if(recipe instanceof ShapelessRecipes){ else if(recipe instanceof ShapelessRecipes){
ShapelessRecipes shapeless = (ShapelessRecipes)recipe; ShapelessRecipes shapeless = (ShapelessRecipes)recipe;
for(int i = 0; i < shapeless.recipeItems.size(); i++){ for(int i = 0; i < shapeless.recipeItems.size(); i++){
stacks[i] = shapeless.recipeItems.get(i); ItemStack stack = shapeless.recipeItems.get(i);
if(stack != null){
stacks[i] = stack.copy();
}
} }
} }
else if(recipe instanceof ShapedOreRecipe){ else if(recipe instanceof ShapedOreRecipe){
@ -105,7 +113,10 @@ public class PageCrafting extends BookletPageAA{
for(int i = 0; i < shaped.getInput().length; i++){ for(int i = 0; i < shaped.getInput().length; i++){
Object input = shaped.getInput()[i]; Object input = shaped.getInput()[i];
if(input != null){ if(input != null){
stacks[i] = input instanceof ItemStack ? (ItemStack)input : (((List<ItemStack>)input).isEmpty() ? null : ((List<ItemStack>)input).get(0)); ItemStack stack = input instanceof ItemStack ? (ItemStack)input : (((List<ItemStack>)input).isEmpty() ? null : ((List<ItemStack>)input).get(0));
if(stack != null){
stacks[i] = stack.copy();
}
} }
} }
} }
@ -113,7 +124,10 @@ public class PageCrafting extends BookletPageAA{
ShapelessOreRecipe shapeless = (ShapelessOreRecipe)recipe; ShapelessOreRecipe shapeless = (ShapelessOreRecipe)recipe;
for(int i = 0; i < shapeless.getInput().size(); i++){ for(int i = 0; i < shapeless.getInput().size(); i++){
Object input = shapeless.getInput().get(i); Object input = shapeless.getInput().get(i);
stacks[i] = input instanceof ItemStack ? (ItemStack)input : (((List<ItemStack>)input).isEmpty() ? null : ((List<ItemStack>)input).get(0)); ItemStack stack = input instanceof ItemStack ? (ItemStack)input : (((List<ItemStack>)input).isEmpty() ? null : ((List<ItemStack>)input).get(0));
if(stack != null){
stacks[i] = stack.copy();
}
} }
} }