upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-10-25 20:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tooltips being boring

Browse Source 
TT armour vis discounts are now in standard purple
KAMI tools now display mode tooltip in dark aqua
This commit is contained in:
KryptonCaptain committed 2017-05-25 21:08:59 +08:00
1 parent 95e0a8350c
commit c74625c8f0
7 files changed
+26 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build.properties
+1 -1
View File
@@ -1,5 +1,5 @@
#Thu, 30 Jan 2014 18:26:58 +0000
version=2.5-549-K
version=2.5-550-K
build_number=0
mc_version=1.7.10
mod_name=ThaumicTinkerer-[1.7.10]
src/main/java/thaumic/tinkerer/common/item/ItemRevealingHelm.java
+4 -2
View File
@@ -25,6 +25,7 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import thaumcraft.api.IGoggles;
@@ -76,8 +77,9 @@ public class ItemRevealingHelm extends ItemArmor implements IRepairable, IReveal
}
@Override
public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
list.add(StatCollector.translateToLocal("tc.visdiscount") + ": " + 5 + "%");
public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean par4) {
list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + this.getVisDiscount(stack, player, null) + "%");
}
@Override
src/main/java/thaumic/tinkerer/common/item/kami/armor/ItemIchorclothArmor.java
+11 -17
View File
@@ -24,6 +24,7 @@ import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraftforge.common.ISpecialArmor;
import net.minecraftforge.common.util.EnumHelper;
@@ -50,8 +51,7 @@ import thaumic.tinkerer.common.research.ResearchHelper;
import java.util.ArrayList;
import java.util.List;
public class ItemIchorclothArmor extends ItemArmor implements IVisDiscountGear,
ISpecialArmor, ITTinkererItem {
public class ItemIchorclothArmor extends ItemArmor implements IVisDiscountGear, ISpecialArmor, ITTinkererItem {
static ItemArmor.ArmorMaterial material = EnumHelper.addArmorMaterial(
"ICHOR", 0, new int[]{3, 8, 6, 3}, 20);
@@ -76,17 +76,14 @@ public class ItemIchorclothArmor extends ItemArmor implements IVisDiscountGear,
}
@Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot,
String type) {
return slot == 2 ? LibResources.MODEL_ARMOR_ICHOR_2
: LibResources.MODEL_ARMOR_ICHOR_1;
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) {
return slot == 2 ? LibResources.MODEL_ARMOR_ICHOR_2 : LibResources.MODEL_ARMOR_ICHOR_1;
}
@Override
public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer,
List list, boolean par4) {
list.add(StatCollector.translateToLocal("tc.visdiscount") + ": "
+ (armorType == 3 ? 3 : 4) + "%");
public void addInformation(final ItemStack stack, final EntityPlayer player, final List list, final boolean par4)
{
list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + this.getVisDiscount(stack, player, null) + "%");
}
@Override
@@ -100,10 +97,8 @@ public class ItemIchorclothArmor extends ItemArmor implements IVisDiscountGear,
}
@Override
public ArmorProperties getProperties(EntityLivingBase player,
ItemStack armor, DamageSource source, double damage, int slot) {
return new ArmorProperties(0, getArmorMaterial()
.getDamageReductionAmount(slot) * 0.0425, Integer.MAX_VALUE);
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
return new ArmorProperties(0, getArmorMaterial().getDamageReductionAmount(slot) * 0.0425, Integer.MAX_VALUE);
}
@Override
@@ -112,14 +107,13 @@ public class ItemIchorclothArmor extends ItemArmor implements IVisDiscountGear,
}
@Override
public void damageArmor(EntityLivingBase entity, ItemStack stack,
DamageSource source, int damage, int slot) {
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
// NO-OP
}
@Override
public int getVisDiscount(ItemStack arg0, EntityPlayer arg1, Aspect arg2) {
return armorType == 3 ? 3 : 4;
return 5;
}
@Override
src/main/java/thaumic/tinkerer/common/item/kami/tool/ItemIchorAxeAdv.java
+2 -1
View File
@@ -24,6 +24,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@@ -135,7 +136,7 @@ public class ItemIchorAxeAdv extends ItemIchorAxe implements IAdvancedTool {
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(ToolHandler.getToolModeStr(this, par1ItemStack));
par3List.add(EnumChatFormatting.DARK_AQUA + ToolHandler.getToolModeStr(this, par1ItemStack));
}
@Override
src/main/java/thaumic/tinkerer/common/item/kami/tool/ItemIchorPickAdv.java
+2 -1
View File
@@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@@ -141,7 +142,7 @@ public class ItemIchorPickAdv extends ItemIchorPick implements IAdvancedTool {
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(ToolHandler.getToolModeStr(this, par1ItemStack));
par3List.add(EnumChatFormatting.DARK_AQUA + ToolHandler.getToolModeStr(this, par1ItemStack));
}
@Override
src/main/java/thaumic/tinkerer/common/item/kami/tool/ItemIchorShovelAdv.java
+2 -1
View File
@@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@@ -112,7 +113,7 @@ public class ItemIchorShovelAdv extends ItemIchorShovel implements IAdvancedTool
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(ToolHandler.getToolModeStr(this, par1ItemStack));
par3List.add(EnumChatFormatting.DARK_AQUA + ToolHandler.getToolModeStr(this, par1ItemStack));
}
@Override
src/main/java/thaumic/tinkerer/common/item/kami/tool/ItemIchorSwordAdv.java
+4 -1
View File
@@ -24,7 +24,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
@@ -110,7 +112,8 @@ public class ItemIchorSwordAdv extends ItemIchorSword implements IAdvancedTool {
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(ToolHandler.getToolModeStr(this, par1ItemStack));
par3List.add(EnumChatFormatting.DARK_AQUA + ToolHandler.getToolModeStr(this, par1ItemStack));
//list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("tc.visdiscount") + ": " + this.getVisDiscount(stack, player, null) + "%");
}
@Override