aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java2
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java22
2 files changed, 21 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index c97401bd1d..3514a87046 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -306,7 +306,7 @@ public final class ModItems {
//TC Style Shards, for use in making energy crystal mix.
//A dull shard, able to be infused with an element.
- shardDull = new BaseItemTCShard("Drained", Utils.rgbtoHexValue(25, 25, 25));
+ shardDull = new BaseItemTCShard("Drained", Utils.rgbtoHexValue(75, 75, 75), "Small chance to be mined from Stone.", "Only useful if you do not have Thaumcraft installed.");
//Generates four elemental shards when TC is not installed.
if (!LoadedMods.Thaumcraft){
shardAer = new BaseItemTCShard("Aer", Utils.rgbtoHexValue(225, 225, 5));
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java
index 684736db40..a8c51df7c4 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTCShard.java
@@ -12,6 +12,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -19,12 +20,24 @@ public class BaseItemTCShard extends Item{
public final String unlocalName;
public final String displayName;
+ public final String descriptionString;
+ public final String descriptionString2;
public final int itemColour;
-
+
public BaseItemTCShard(String DisplayName, int colour) {
+ this(DisplayName, colour, "");
+ }
+
+ public BaseItemTCShard(String DisplayName, int colour, String Description) {
+ this(DisplayName, colour, "", Description);
+ }
+
+ public BaseItemTCShard(String DisplayName, int colour, String Description, String Description2) {
this.unlocalName = "item"+Utils.sanitizeString(DisplayName);
this.displayName = DisplayName;
this.itemColour = colour;
+ this.descriptionString = Description;
+ this.descriptionString2 = Description2;
this.setCreativeTab(AddToCreativeTab.tabMisc);
this.setUnlocalizedName(unlocalName);
this.setMaxStackSize(64);
@@ -42,7 +55,12 @@ public class BaseItemTCShard extends Item{
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
- //super.addInformation(stack, aPlayer, list, bool);
+ if (descriptionString != "" || !descriptionString.equals("")){
+ list.add(EnumChatFormatting.GRAY+descriptionString);
+ }
+ if (descriptionString2 != "" || !descriptionString2.equals("")){
+ list.add(EnumChatFormatting.GRAY+descriptionString2);
+ }
}