Add colors to the custom materials, same as regular tool materials

This commit is contained in:
Bernhard Bonigl committed 2014-09-30 19:40:22 +02:00
1 parent 6ca11c5dbf
commit 7c3e21be8d
6 files changed
+63 -11

No files matched your search

@@ -426,12 +426,27 @@ public class TConstructRegistry
customMaterials.add(mat);
}
public static void addBowstringMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed, int color)
{
BowstringMaterial mat = new BowstringMaterial(materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed, color);
customMaterials.add(mat);
}
public static void addFletchingMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float accuracy, float breakChance, float mass, int color)
{
FletchingMaterial mat = new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance, mass, color);
customMaterials.add(mat);
}
@Deprecated
public static void addBowstringMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float durability, float drawSpeed, float flightSpeed)
{
BowstringMaterial mat = new BowstringMaterial(materialID, value, input, craftingMaterial, durability, drawSpeed, flightSpeed);
customMaterials.add(mat);
}
@Deprecated
public static void addFletchingMaterial (int materialID, int value, ItemStack input, ItemStack craftingMaterial, float accuracy, float breakChance, float mass)
{
FletchingMaterial mat = new FletchingMaterial(materialID, value, input, craftingMaterial, accuracy, breakChance, mass);
@@ -8,6 +8,15 @@ public class BowstringMaterial extends CustomMaterial
public final float drawspeedModifier;
public final float flightSpeedModifier;
public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed, int color)
{
super(materialID, value, input, craftingItem, color);
this.durabilityModifier = durability;
this.drawspeedModifier = drawspeed;
this.flightSpeedModifier = flightspeed;
}
@Deprecated
public BowstringMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float durability, float drawspeed, float flightspeed)
{
super(materialID, value, input, craftingItem);
@@ -11,23 +11,39 @@ public abstract class CustomMaterial
public final ItemStack input;
public final ItemStack craftingItem;
public final String oredict;
public final int color;
@Deprecated
public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem)
{
this(materialID, value, input, craftingItem, 0xffffffff);
}
public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, int color)
{
this.materialID = materialID;
this.value = value;
this.input = input;
this.craftingItem = craftingItem;
this.oredict = null;
this.color = color;
}
@Deprecated
public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem)
{
this(materialID, value, oredict, craftingItem, 0xffffffff);
}
public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem, int color)
{
this.materialID = materialID;
this.value = value;
this.input = null;
this.craftingItem = craftingItem;
this.oredict = oredict;
this.color = color;
}
/**
@@ -8,19 +8,31 @@ public class FletchingMaterial extends CustomMaterial
public final float breakChance;
public final float mass;
public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, float breakChance, float mass)
public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, float breakChance, float mass, int color)
{
super(materialID, value, input, craftingItem);
super(materialID, value, input, craftingItem, color);
this.accuracy = accuracy;
this.breakChance = breakChance;
this.mass = mass;
}
public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass)
@Deprecated
public FletchingMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, float accuracy, float breakChance, float mass)
{
super(materialID, value, oredict, craftingItem);
this(materialID, value, input, craftingItem, accuracy, breakChance, mass, 0xffffffff);
}
public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass, int color)
{
super(materialID, value, oredict, craftingItem, color);
this.accuracy = accuracy;
this.breakChance = breakChance;
this.mass = mass;
}
@Deprecated
public FletchingMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass)
{
this(materialID, value, oredict, craftingItem, accuracy, breakChance, mass, 0xffffffff);
}
}
@@ -8,7 +8,7 @@ public class FletchlingLeafMaterial extends FletchingMaterial
{
public FletchlingLeafMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, float breakChance, float mass)
{
super(materialID, value, oredict, craftingItem, accuracy, breakChance, mass);
super(materialID, value, oredict, craftingItem, accuracy, breakChance, mass, 0x5ece46);
}
@Override
@@ -695,7 +695,7 @@ public class TinkerTools
TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, 31, new ItemStack(TinkerTools.patternOutputs[meta], 1, 31));
}
TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 1), 1F, 1F, 0.9f);
TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 1), 1F, 1F, 0.9f, 0x63bcd9);
TConstructRegistry.addBowMaterial(31, 576, 40, 1.2f);
TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F, 100F);
}
@@ -709,7 +709,7 @@ public class TinkerTools
try
{
Object plantItem = ItemHelper.getStaticItem("plantItem", "mods.natura.common.NContent");
TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 2), 1.2F, 0.8F, 1.3f);
TConstructRegistry.addBowstringMaterial(2, 2, new ItemStack((Item) plantItem, 1, 7), new ItemStack(TinkerTools.bowstring, 1, 2), 1.2F, 0.8F, 1.3f, 0xd3414f);
}
catch (Exception e)
{
@@ -782,11 +782,11 @@ public class TinkerTools
TConstructRegistry.addArrowMaterial(MaterialID.BlueSlime, 0.22F, 0.0F, 100F); //Blue Slime
TConstructRegistry.addArrowMaterial(MaterialID.PigIron, 3.6F, 0.5F, 100F); //Pigiron
TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TinkerTools.bowstring, 1, 0), 1F, 1F, 1f); // String
TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TinkerTools.fletching, 1, 0), 100F, 0F, 0.05F); // Feather
TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TinkerTools.bowstring, 1, 0), 1F, 1F, 1f, 0xeeeeee); // String
TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TinkerTools.fletching, 1, 0), 100F, 0F, 0.05F, 0xffffff); // Feather
TConstructRegistry.addCustomMaterial(new FletchlingLeafMaterial(1, 2, "treeLeaves", new ItemStack(TinkerTools.fletching, 1, 1), 75F, 0F, 0.2F)); // all vanilla and oredicted leaves. and all leaves in general.
TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TinkerTools.materials, 1, 1), new ItemStack(TinkerTools.fletching, 1, 2), 100F, 0F, 0.12F); // Slime
TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TinkerTools.materials, 1, 17), new ItemStack(TinkerTools.fletching, 1, 3), 100F, 0F, 0.12F); // BlueSlime
TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TinkerTools.materials, 1, 1), new ItemStack(TinkerTools.fletching, 1, 2), 100F, 0F, 0.12F, 0x82c873); // Slime
TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TinkerTools.materials, 1, 17), new ItemStack(TinkerTools.fletching, 1, 3), 100F, 0F, 0.12F, 0x74c8c7); // BlueSlime
PatternBuilder pb = PatternBuilder.instance;
if (PHConstruct.enableTWood)