Skip to content
This repository has been archived by the owner on Mar 10, 2021. It is now read-only.

Commit

Permalink
Update TCon Api
Browse files Browse the repository at this point in the history
  • Loading branch information
bonii-xx committed Sep 17, 2014
1 parent e787b79 commit ecc6672
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.properties
Expand Up @@ -2,5 +2,5 @@ mod_version=2.0.2
minecraft_version=1.7.10
forge_version=10.13.0.1208
mantle_version=0.3.1.jenkins180
tconstruct_version=1.6.0.build622
tconstruct_version=1.6.0.build657
FMP_version=1.1.0.300
Expand Up @@ -197,7 +197,7 @@ private static void updateMaterial(int harvestLevel, String matName, int newDura
int durability = Math.round(newDurability * durabilityMod);
int speed = Math.round(newSpeed * speedMod);
// round everything
ToolMaterial newMaterial = new ToolMaterial(old.materialName, harvestLevel, durability, speed, newAttack, newHandleModifier, old.reinforced, old.stonebound, old.tipStyle);
ToolMaterial newMaterial = new ToolMaterial(old.materialName, harvestLevel, durability, speed, newAttack, newHandleModifier, old.reinforced(), old.shoddy(), old.style(), old.primaryColor());

// replace old material
Integer id = getMaterialID(old);
Expand Down
Expand Up @@ -33,6 +33,7 @@ public boolean isValidArmor(ItemStack stack, int armorType, Entity entity) {
return armorType == 0; // 0 = helmet
}

@SuppressWarnings("unchecked")
@Override
public void addInformation(ItemStack item, EntityPlayer player, List tooltips, boolean advanced) {
// specul tooltips
Expand Down
Expand Up @@ -105,7 +105,7 @@ private ToolMaterial processMaterial(String category, ToolMaterial mat, Configur
tipStyle = mat.style();

// reconstruct the material
return new ToolMaterial(mat.materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, tipStyle);
return new ToolMaterial(mat.materialName, harvestLevel, durability, miningspeed, attack, handleModifier, reinforced, stonebound, tipStyle, mat.primaryColor());
}

private EnumChatFormatting stringToEnum(String s)
Expand Down
Expand Up @@ -52,7 +52,7 @@ public void postInit(FMLPostInitializationEvent event)
// add string bindings. yay.
if(Config.allowStringBinding) {
Log.info("Register String binding");
TConstructRegistry.addToolMaterial(40, "String", 0, 33, 1, 0, 0.01F, 0, 0f, EnumChatFormatting.WHITE.toString(), "");
TConstructRegistry.addToolMaterial(40, "String", 0, 33, 1, 0, 0.01F, 0, 0f, EnumChatFormatting.WHITE.toString(), 0xFFFFFF);
TConstructClientRegistry.addMaterialRenderMapping(40, "tinker", "paper", true);
MinecraftForge.EVENT_BUS.register(new StringBindingHandler());
}
Expand Down

0 comments on commit ecc6672

Please sign in to comment.