Skip to content
This repository has been archived by the owner on May 22, 2018. It is now read-only.

Commit

Permalink
Merge pull request #4 from jotac0/master
Browse files Browse the repository at this point in the history 
Updated for Terrafirmacraft 0-79-15
  • Loading branch information
@dries007
dries007 committed Feb 15, 2015
2 parents 4f12e7b + 082cca0 commit df346f3
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
Binary file renamed ...[1.7.10]TerraFirmaCraft-deobf-0.79.13.jar → ...[1.7.10]TerraFirmaCraft-deobf-0.79.15.jar
View file
Binary file not shown.
Binary file renamed ...s/[1.7.10]TerraFirmaCraft-src-0.79.13.jar → ...s/[1.7.10]TerraFirmaCraft-src-0.79.15.jar
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions src/main/java/net/dries007/tfcnei/recipeHandlers/AlloyRecipeHandler.java
View file
Expand Up @@ -43,7 +43,7 @@
import com.bioxx.tfc.Core.Metal.AlloyMetal;
import com.bioxx.tfc.Core.Metal.AlloyMetalCompare;
import com.bioxx.tfc.Items.ItemOre;
import com.bioxx.tfc.TFCItems;
import com.bioxx.tfc.ItemSetup;
import com.bioxx.tfc.api.Metal;
import com.google.common.collect.HashMultimap;
import net.dries007.tfcnei.util.Constants;
Expand Down Expand Up @@ -91,8 +91,8 @@ public TemplateRecipeHandler newInstance()
{
alloyList = AlloyManager.instance.Alloys;
Metal metal;
ItemStack itemStack = new ItemStack(TFCItems.OreChunk);
while ((metal = ((ItemOre) TFCItems.OreChunk).GetMetalType(itemStack)) != null)
ItemStack itemStack = new ItemStack(ItemSetup.OreChunk);
while ((metal = ((ItemOre) ItemSetup.OreChunk).GetMetalType(itemStack)) != null)
{
metalItemMap.put(metal, itemStack.copy());
itemStack.setItemDamage(itemStack.getItemDamage() + 1);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/dries007/tfcnei/recipeHandlers/AnvilRecipeHandler.java
View file
Expand Up @@ -41,7 +41,7 @@
import com.bioxx.tfc.Core.Recipes;
import com.bioxx.tfc.GUI.GuiAnvil;
import com.bioxx.tfc.Items.Tools.ItemHammer;
import com.bioxx.tfc.TFCItems;
import com.bioxx.tfc.ItemSetup;
import com.bioxx.tfc.api.Crafting.AnvilManager;
import com.bioxx.tfc.api.Crafting.AnvilRecipe;
import com.bioxx.tfc.api.Crafting.AnvilReq;
Expand Down Expand Up @@ -120,7 +120,7 @@ public void loadUsageRecipes(ItemStack ingredient)
for (AnvilRecipe recipe : recipeList) arecipes.add(new CachedAnvilRecipe(HAMMER_NORMAL, recipe));
for (AnvilRecipe recipe : weldRecipeList) arecipes.add(new CachedAnvilRecipe(HAMMER_WELD, recipe));
}
else if (ingredient.getItem() == TFCItems.Powder && ingredient.getItemDamage() == 0)
else if (ingredient.getItem() == ItemSetup.Powder && ingredient.getItemDamage() == 0)
{
for (AnvilRecipe recipe : weldRecipeList) arecipes.add(new CachedAnvilRecipe(WELD, recipe));
}
Expand Down Expand Up @@ -247,7 +247,7 @@ public List<PositionedStack> getOtherStacks()
List<PositionedStack> stacks = new ArrayList<>();

stacks.add(new PositionedStack(hammers, -14, 100, false));
if (type.isWeld()) stacks.add(new PositionedStack(new ItemStack(TFCItems.Powder), 164, 100));
if (type.isWeld()) stacks.add(new PositionedStack(new ItemStack(ItemSetup.Powder), 164, 100));
return stacks;
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/dries007/tfcnei/recipeHandlers/KnappingRecipeHandler.java
View file
Expand Up @@ -41,7 +41,7 @@
import com.bioxx.tfc.Items.ItemFlatGeneric;
import com.bioxx.tfc.Items.ItemLooseRock;
import com.bioxx.tfc.Reference;
import com.bioxx.tfc.TFCItems;
import com.bioxx.tfc.ItemSetup;
import com.bioxx.tfc.api.Crafting.CraftingManagerTFC;
import com.bioxx.tfc.api.Crafting.ShapedRecipesTFC;
import net.dries007.tfcnei.util.Helper;
Expand Down Expand Up @@ -146,7 +146,7 @@ public void loadUsageRecipes(ItemStack ingredient)
for (ItemStack inStack : recipe.getRecipeItems())
{
if (inStack == null || flatType != inStack.getItem()) continue;
if (flatType == TFCItems.FlatClay)
if (flatType == ItemSetup.FlatClay)
{
if (ingredient.getItemDamage() == 0 && inStack.getItemDamage() == 1) // Compare to see if the ingredient is normal clay
arecipes.add(new CachedKnappingRecipe(recipe));
Expand Down Expand Up @@ -175,23 +175,23 @@ public CachedKnappingRecipe(ShapedRecipesTFC recipe)
for (ItemStack inStack : inputItems)
{
if (inStack == null) continue;
if (inStack.getItem() == TFCItems.FlatClay) // if its clay, we need some special code
if (inStack.getItem() == ItemSetup.FlatClay) // if its clay, we need some special code
{
if (inStack.getItemDamage() == 1) // Normal clay (damage value 1)
{
off = new ItemStack(inStack.getItem(), 1, 0); // Dark texture has data value 0
setActualInput(new ItemStack(TFCItems.ClayBall, 5, 0));
setActualInput(new ItemStack(ItemSetup.ClayBall, 5, 0));
}
else if (inStack.getItemDamage() == 3) // Fire clay (damage value 3)
{
off = new ItemStack(inStack.getItem(), 1, 2); // Dark texture has data value 3
setActualInput(new ItemStack(TFCItems.ClayBall, 5, 1));
setActualInput(new ItemStack(ItemSetup.ClayBall, 5, 1));
}
}
else // If not clay (aka Leather or stone) add the recipe without a 'dark' texture in place.
{
if (inStack.getItem() == TFCItems.FlatLeather) setActualInput(new ItemStack(TFCItems.Leather));
else if (inStack.getItem() == TFCItems.FlatRock) setActualInput(new ItemStack(TFCItems.LooseRock, 1, inStack.getItemDamage()));
if (inStack.getItem() == ItemSetup.FlatLeather) setActualInput(new ItemStack(ItemSetup.Leather));
else if (inStack.getItem() == ItemSetup.FlatRock) setActualInput(new ItemStack(ItemSetup.LooseRock, 1, inStack.getItemDamage()));
}
break;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/dries007/tfcnei/recipeHandlers/QuernRecipeHandler.java
View file
Expand Up @@ -39,7 +39,7 @@
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.bioxx.tfc.Reference;
import com.bioxx.tfc.TFCItems;
import com.bioxx.tfc.ItemSetup;
import com.bioxx.tfc.api.Crafting.QuernManager;
import com.bioxx.tfc.api.Crafting.QuernRecipe;
import cpw.mods.fml.relauncher.ReflectionHelper;
Expand Down Expand Up @@ -103,7 +103,7 @@ public void loadCraftingRecipes(ItemStack result)
public void loadUsageRecipes(ItemStack ingredient)
{
for (QuernRecipe recipe : recipeList)
if (ingredient.getItem() == TFCItems.Quern || Helper.areItemStacksEqual(ingredient, recipe.getInItem()))
if (ingredient.getItem() == ItemSetup.Quern || Helper.areItemStacksEqual(ingredient, recipe.getInItem()))
arecipes.add(new CachedQuernRecipe(recipe));
}

Expand Down Expand Up @@ -146,7 +146,7 @@ public PositionedStack getIngredient()
@Override
public PositionedStack getOtherStack()
{
return new PositionedStack(new ItemStack(TFCItems.Quern), 88, 9);
return new PositionedStack(new ItemStack(ItemSetup.Quern), 88, 9);
}
}
}

0 comments on commit df346f3

Please sign in to comment.