Skip to content

Commit

Permalink
Reverted Tool Recipe changes, made colorizing use NBT
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vexatos
Vexatos committed Sep 21, 2014
1 parent 4022ea1 commit ab87cc7
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 48 deletions.
26 changes: 13 additions & 13 deletions src/main/java/tconstruct/library/crafting/ToolBuilder.java
View file
Expand Up @@ -29,8 +29,8 @@ public static void addNormalToolRecipe (ToolCore output, Item head, Item handle)
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
{
Expand All @@ -46,9 +46,9 @@ public static void addNormalToolRecipe (ToolCore output, Item head, Item handle,
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
{
Expand All @@ -63,10 +63,10 @@ public static void addNormalToolRecipe (ToolCore output, Item head, Item handle,
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
{
Expand All @@ -91,7 +91,7 @@ public static void addToolRecipe (ToolCore output, Item... items)
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)
{
Expand Down Expand Up @@ -156,7 +156,7 @@ public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStac

if (accessoryStack == null)
{
item = getMatchingRecipe(headStack, handleStack, null, null);
item = getMatchingRecipe(headStack.getItem(), handleStack.getItem(), null, null);
}
else
{
Expand All @@ -172,11 +172,11 @@ public ItemStack buildTool (ItemStack headStack, ItemStack handleStack, ItemStac
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);
}
}

Expand Down
39 changes: 19 additions & 20 deletions src/main/java/tconstruct/library/crafting/ToolRecipe.java
View file
Expand Up @@ -3,7 +3,6 @@
import java.util.LinkedList;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.ToolCore;

Expand Down Expand Up @@ -46,49 +45,49 @@ public ToolRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore t
result = tool;
}

public void addHeadItem (ItemStack head)
public void addHeadItem (Item head)
{
this.headList.add(head.getItem());
this.headList.add(head);
}

public void addHandleItem (ItemStack handle)
public void addHandleItem (Item head)
{
this.handleList.add(handle.getItem());
this.handleList.add(head);
}

public void addAccessoryItem (ItemStack accessory)
public void addAccessoryItem (Item head)
{
this.accessoryList.add(accessory.getItem());
this.accessoryList.add(head);
}

public void addExtraItem (ItemStack extra)
public void addExtraItem (Item head)
{
this.extraList.add(extra.getItem());
this.extraList.add(head);
}

public boolean validHead (ItemStack input)
public boolean validHead (Item input)
{
for (Item part : headList)
{
if (part == input.getItem())
if (part == input)
return true;
}
return false;
}

public boolean validHandle (ItemStack input)
public boolean validHandle (Item input)
{
for (Item part : handleList)
{
if (part == input.getItem())
if (part == input)
return true;
if (toolRod != null && part == toolRod && (input.getItem() == Items.stick || input.getItem() == Items.bone))
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
return true;
}
return false;
}

public boolean validAccessory (ItemStack input)
public boolean validAccessory (Item input)
{
if (input == null)
{
Expand All @@ -98,15 +97,15 @@ public boolean validAccessory (ItemStack input)
}
for (Item part : accessoryList)
{
if (part == input.getItem())
if (part == input)
return true;
if (toolRod != null && part == toolRod && (input.getItem() == Items.stick || input.getItem() == Items.bone))
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
return true;
}
return false;
}

public boolean validExtra (ItemStack input)
public boolean validExtra (Item input)
{
if (input == null)
{
Expand All @@ -116,9 +115,9 @@ public boolean validExtra (ItemStack input)
}
for (Item part : extraList)
{
if (part == input.getItem())
if (part == input)
return true;
if (toolRod != null && part == toolRod && (input.getItem() == Items.stick || input.getItem() == Items.bone))
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
return true;
}
return false;
Expand Down
19 changes: 8 additions & 11 deletions src/main/java/tconstruct/library/tools/ToolCore.java
View file
Expand Up @@ -662,9 +662,6 @@ public float getDamageModifier ()
return 1.0f;
}


public static HashMap<Integer, Integer> materialColorMap = new HashMap<Integer, Integer>();

@Override
public int getColorFromItemStack(ItemStack stack, int renderPass) {

Expand All @@ -675,24 +672,24 @@ public int getColorFromItemStack(ItemStack stack, int renderPass) {
tags = stack.getTagCompound().getCompoundTag("InfiTool");
if (renderPass < getPartAmount())
{
if (renderPass == 0 && materialColorMap.containsKey(tags.getInteger("Handle"))) // Handle
if (renderPass == 0 && tags.hasKey("HandleColor")) // Handle
{
return materialColorMap.get(tags.getInteger("Handle"));
return tags.getInteger("HandleColor");
}

else if (renderPass == 1 && materialColorMap.containsKey(tags.getInteger("Head"))) // Head
else if (renderPass == 1 && tags.hasKey("HeadColor")) // Head
{
return materialColorMap.get(tags.getInteger("Head"));
return tags.getInteger("HeadColor");
}

else if (renderPass == 2 && materialColorMap.containsKey(tags.getInteger("Accessory"))) // Accessory
else if (renderPass == 2 && tags.hasKey("AccessoryColor")) // Accessory
{
return materialColorMap.get(tags.getInteger("Accessory"));
return tags.getInteger("AccessoryColor");
}

else if (renderPass == 3 && materialColorMap.containsKey(tags.getInteger("Extra"))) // Extra
else if (renderPass == 3 && tags.hasKey("ExtraColor")) // Extra
{
return materialColorMap.get(tags.getInteger("Extra"));
return tags.getInteger("ExtraColor");
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/tconstruct/tools/BowRecipe.java
View file
Expand Up @@ -2,7 +2,6 @@

import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import tconstruct.library.crafting.ToolRecipe;
import tconstruct.library.tools.ToolCore;

Expand All @@ -25,13 +24,13 @@ public BowRecipe(Item head, Item handle, Item accessory, Item extra, ToolCore to
}

@Override
public boolean validHead (ItemStack input)
public boolean validHead (Item input)
{
for (Item part : headList)
{
if (part == input.getItem())
if (part == input)
return true;
if (toolRod != null && part == toolRod && (input.getItem() == Items.stick || input.getItem() == Items.bone))
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
return true;
}
return false;
Expand Down

0 comments on commit ab87cc7

Please sign in to comment.