lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Massive rework of configs, items and blocks.

Browse source 
I redone where the items/blocsks are stored and how the configs are
handled to clean up it and give space. You can change the config line to
AWWayofTime if you want to keep the compatibility with old configs. Now
you reference the blocks from the ModBlocks and Items from the ModItems.
This commit is contained in:
Fenn 2014-01-17 21:05:38 +00:00
parent 8601e9faff
commit e3644f2d2b
304 changed files with 3941 additions and 5108 deletions
BM_src/thaumcraft/api/crafting
InfusionRecipe.java

19
BM_src/thaumcraft/api/crafting/InfusionRecipe.java
View file

@ -1,7 +1,5 @@
package thaumcraft.api.crafting;
import java.util.ArrayList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@ -9,8 +7,9 @@ import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.api.ThaumcraftApiHelper;
import thaumcraft.api.aspects.AspectList;
public class InfusionRecipe
{
import java.util.ArrayList;
public class InfusionRecipe {
public AspectList aspects;
public String research;
public ItemStack[] components;
@ -31,6 +30,7 @@ public class InfusionRecipe
/**
* Used to check if a recipe matches current crafting inventory
*
* @param player
*/
public boolean matches(ArrayList<ItemStack> input, ItemStack central, World world, EntityPlayer player)
@ -54,12 +54,12 @@ public class InfusionRecipe
ArrayList<ItemStack> ii = new ArrayList<ItemStack>();
for (ItemStack is: input)
for (ItemStack is : input)
{
ii.add(is.copy());
}
for (ItemStack comp: components)
for (ItemStack comp : components)
{
boolean b = false;
@ -116,13 +116,12 @@ public class InfusionRecipe
if (od != -1)
{
ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[] {});
ItemStack[] ores = OreDictionary.getOres(od).toArray(new ItemStack[]{});
if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[] {stack1}, ores))
if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{stack1}, ores))
return true;
}
}
else
} else
{
t1 = ItemStack.areItemStackTagsEqual(stack0, stack1);
}