mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 13:09:53 +00:00
Reverted Tool Recipe changes, made colorizing use NBT
This commit is contained in:
1 parent
4022ea185a
commit
ab87cc706e
4 files changed
+43
-48
No files matched your search
@@ -29,8 +29,8 @@ public class ToolBuilder
|
||||
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
|
||||
if (recipe != null)
|
||||
{
|
||||
recipe.addHeadItem(new ItemStack(head));
|
||||
recipe.addHandleItem(new ItemStack(handle));
|
||||
recipe.addHeadItem(head);
|
||||
recipe.addHandleItem(handle);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -46,9 +46,9 @@ public class ToolBuilder
|
||||
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
|
||||
if (recipe != null)
|
||||
{
|
||||
recipe.addHeadItem(new ItemStack(head));
|
||||
recipe.addHandleItem(new ItemStack(handle));
|
||||
recipe.addAccessoryItem(new ItemStack(accessory));
|
||||
recipe.addHeadItem(head);
|
||||
recipe.addHandleItem(handle);
|
||||
recipe.addAccessoryItem(accessory);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -63,10 +63,10 @@ public class ToolBuilder
|
||||
ToolRecipe recipe = instance.recipeList.get(output.getToolName());
|
||||
if (recipe != null)
|
||||
{
|
||||
recipe.addHeadItem(new ItemStack(head));
|
||||
recipe.addHandleItem(new ItemStack(handle));
|
||||
recipe.addAccessoryItem(new ItemStack(accessory));
|
||||
recipe.addExtraItem(new ItemStack(extra));
|
||||
recipe.addHeadItem(head);
|
||||
recipe.addHandleItem(handle);
|
||||
recipe.addAccessoryItem(accessory);
|
||||
recipe.addExtraItem(extra);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -91,7 +91,7 @@ public class ToolBuilder
|
||||
addNormalToolRecipe(output, items[0], items[1], items[2], items[3]);
|
||||
}
|
||||
|
||||
public ToolCore getMatchingRecipe (ItemStack head, ItemStack handle, ItemStack accessory, ItemStack extra)
|
||||
public ToolCore getMatchingRecipe (Item head, Item handle, Item accessory, Item extra)
|
||||
{
|
||||
for (ToolRecipe recipe : combos)
|
||||
{
|
||||
@@ -156,7 +156,7 @@ public class ToolBuilder
|
||||
|
||||
if (accessoryStack == null)
|
||||
{
|
||||
item = getMatchingRecipe(headStack, handleStack, null, null);
|
||||
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), null, null);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -172,11 +172,11 @@ public class ToolBuilder
|
||||
if (extra == -1)
|
||||
return null;
|
||||
|
||||
item = getMatchingRecipe(headStack, handleStack, accessoryStack, extraStack);
|
||||
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), extraStack.getItem());
|
||||
}
|
||||
else
|
||||
{
|
||||
item = getMatchingRecipe(headStack, handleStack, accessoryStack, null);
|
||||
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), accessoryStack.getItem(), null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user