Fixed path blocks so they are actually craftable.
This commit is contained in:
parent
4a1cf11f6d
commit
37227d42f9
|
@ -1,3 +1,8 @@
|
||||||
|
------------------------------------------------------
|
||||||
|
Version 2.0.0-19
|
||||||
|
------------------------------------------------------
|
||||||
|
- Fixed path blocks so they are actually craftable.
|
||||||
|
|
||||||
------------------------------------------------------
|
------------------------------------------------------
|
||||||
Version 2.0.0-18
|
Version 2.0.0-18
|
||||||
------------------------------------------------------
|
------------------------------------------------------
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package WayofTime.bloodmagic.api.recipe;
|
package WayofTime.bloodmagic.api.recipe;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
|
@ -256,11 +256,11 @@ public class ShapedBloodOrbRecipe implements IRecipe
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else if (target instanceof ArrayList)
|
} else if (target instanceof List)
|
||||||
{
|
{
|
||||||
boolean matched = false;
|
boolean matched = false;
|
||||||
|
|
||||||
Iterator<ItemStack> itr = ((ArrayList<ItemStack>) target).iterator();
|
Iterator<ItemStack> itr = ((List<ItemStack>) target).iterator();
|
||||||
while (itr.hasNext() && !matched)
|
while (itr.hasNext() && !matched)
|
||||||
{
|
{
|
||||||
matched = OreDictionary.itemMatches(itr.next(), slot, false);
|
matched = OreDictionary.itemMatches(itr.next(), slot, false);
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class ShapelessBloodOrbRecipe implements IRecipe
|
||||||
tier = ((IBloodOrb) in).getOrbLevel(0);
|
tier = ((IBloodOrb) in).getOrbLevel(0);
|
||||||
input.add(tier);
|
input.add(tier);
|
||||||
}
|
}
|
||||||
}else if (in instanceof ItemStack)
|
} else if (in instanceof ItemStack)
|
||||||
{
|
{
|
||||||
input.add(((ItemStack) in).copy());
|
input.add(((ItemStack) in).copy());
|
||||||
} else if (in instanceof Item)
|
} else if (in instanceof Item)
|
||||||
|
@ -154,9 +154,9 @@ public class ShapelessBloodOrbRecipe implements IRecipe
|
||||||
} else if (next instanceof ItemStack)
|
} else if (next instanceof ItemStack)
|
||||||
{
|
{
|
||||||
match = OreDictionary.itemMatches((ItemStack) next, slot, false);
|
match = OreDictionary.itemMatches((ItemStack) next, slot, false);
|
||||||
} else if (next instanceof ArrayList)
|
} else if (next instanceof List)
|
||||||
{
|
{
|
||||||
Iterator<ItemStack> itr = ((ArrayList<ItemStack>) next).iterator();
|
Iterator<ItemStack> itr = ((List<ItemStack>) next).iterator();
|
||||||
while (itr.hasNext() && !match)
|
while (itr.hasNext() && !match)
|
||||||
{
|
{
|
||||||
match = OreDictionary.itemMatches(itr.next(), slot, false);
|
match = OreDictionary.itemMatches(itr.next(), slot, false);
|
||||||
|
|
|
@ -82,11 +82,11 @@ public class ModRecipes
|
||||||
GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.incenseAltar), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(ModItems.orbWeak), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.coal, 1, 1)));
|
GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.incenseAltar), "s s", "shs", "coc", 'o', OrbRegistry.getOrbStack(ModItems.orbWeak), 's', "stone", 'c', "cobblestone", 'h', new ItemStack(Items.coal, 1, 1)));
|
||||||
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.pathBlock, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(ModItems.orbApprentice)));
|
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.pathBlock, 4, 0), "plankWood", "plankWood", "plankWood", "plankWood", OrbRegistry.getOrbStack(ModItems.orbApprentice)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 1), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0)));
|
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 1), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0), new ItemStack(ModBlocks.pathBlock, 1, 0)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(ModItems.orbMagician)));
|
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.pathBlock, 4, 2), "stone", "stone", "stone", "stone", OrbRegistry.getOrbStack(ModItems.orbMagician)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 3), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2)));
|
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 3), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 4), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), OrbRegistry.getOrbStack(ModItems.orbMagician)));
|
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.pathBlock, 4, 4), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), new ItemStack(ModBlocks.pathBlock, 1, 2), OrbRegistry.getOrbStack(ModItems.orbMaster)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 5), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4)));
|
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 5), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4), new ItemStack(ModBlocks.pathBlock, 1, 4)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 6), Blocks.obsidian, Blocks.obsidian, Blocks.obsidian, Blocks.obsidian, OrbRegistry.getOrbStack(ModItems.orbMagician)));
|
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(new ItemStack(ModBlocks.pathBlock, 4, 6), Blocks.obsidian, Blocks.obsidian, Blocks.obsidian, Blocks.obsidian, OrbRegistry.getOrbStack(ModItems.orbArchmage)));
|
||||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 7), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6)));
|
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 7), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6)));
|
||||||
|
|
||||||
for (int i = 1; i < BlockBloodRune.names.length; i++)
|
for (int i = 1; i < BlockBloodRune.names.length; i++)
|
||||||
|
|
Loading…
Reference in a new issue