update to tcon 1.5.1RC1 commits

This commit is contained in:
Progwml6 committed 2013-11-25 18:57:54 -05:00
1 parent 6a898f97d7
commit f2da066da2
42 files changed
+1262 -1045

No files matched your search

@@ -75,7 +75,7 @@ public class GoldenHead extends ItemFood
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
list.add(StatCollector.translateToLocal("goldenhead1.tooltip"));
list.add(StatCollector.translateToLocal("goldenhead2.tooltip"));
list.add("\u00a75\u00a7o"+StatCollector.translateToLocal("goldenhead1.tooltip"));
list.add("\u00a75\u00a7o"+StatCollector.translateToLocal("goldenhead2.tooltip"));
}
}
+5 -5
View File
@@ -15,8 +15,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class Manual extends CraftingItem
{
static String[] name = new String[] { "beginner", "toolstation", "smeltery" };
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery" };
static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" };
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue" };
public Manual(int id)
{
@@ -41,13 +41,13 @@ public class Manual extends CraftingItem
switch (stack.getItemDamage())
{
case 0:
list.add(StatCollector.translateToLocal("manual1.tooltip"));
list.add("\u00a7o"+StatCollector.translateToLocal("manual1.tooltip"));
break;
case 1:
list.add(StatCollector.translateToLocal("manual2.tooltip"));
list.add("\u00a7o"+StatCollector.translateToLocal("manual2.tooltip"));
break;
case 2:
list.add(StatCollector.translateToLocal("manual3.tooltip"));
list.add("\u00a7o"+StatCollector.translateToLocal("manual3.tooltip"));
break;
}
}
@@ -19,7 +19,7 @@ public class StrangeFood extends SpecialFood
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
list.add(StatCollector.translateToLocal("strangefood1.tooltip"));
list.add(StatCollector.translateToLocal("strangefood2.tooltip"));
list.add("\u00a7b\u00a7o"+StatCollector.translateToLocal("strangefood1.tooltip"));
list.add("\u00a7b\u00a7o"+StatCollector.translateToLocal("strangefood2.tooltip"));
}
}
@@ -39,7 +39,7 @@ public class HamboneItemBlock extends ItemBlock
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
list.add(StatCollector.translateToLocal("hambone1.tooltip"));
list.add("\u00A74"+StatCollector.translateToLocal("hambone1.tooltip"));
list.add(StatCollector.translateToLocal("hambone2.tooltip"));
}
@@ -1,8 +1,14 @@
package tconstruct.items.blocks;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
public class SmelteryItemBlock extends ItemBlock
{
@@ -25,4 +31,27 @@ public class SmelteryItemBlock extends ItemBlock
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("Smeltery.").append(blockType[pos]).toString();
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
switch (stack.getItemDamage())
{
case 0:
list.add(StatCollector.translateToLocal("smeltery.controller.tooltip"));
break;
case 1:
list.add(StatCollector.translateToLocal("smeltery.drain.tooltip1"));
list.add(StatCollector.translateToLocal("smeltery.drain.tooltip2"));
break;
case 3:
list.add(StatCollector.translateToLocal("smeltery.furnace.tooltip"));
break;
default:
list.add(StatCollector.translateToLocal("smeltery.brick.tooltip1"));
list.add(StatCollector.translateToLocal("smeltery.brick.tooltip2"));
break;
}
}
}