diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java | 37 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java | 5 |
2 files changed, 28 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index 53b4911faa..d06ad2324e 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.common.compat; +import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; + import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; @@ -9,6 +12,8 @@ import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; @@ -33,23 +38,27 @@ public class COMPAT_Baubles { public static void baublesLoaded() { Logger.INFO("Baubles Found - Loading Wearables."); ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0); - // itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; ModItems.itemPersonalHealingDevice = new ItemHealingDevice(); ModItems.itemPersonalFireProofDevice = new FireProtectionBauble(); - try { - ModItems.itemChargePack_Low_1 = new BatteryPackBaseBauble(1); - ModItems.itemChargePack_Low_2 = new BatteryPackBaseBauble(2); - ModItems.itemChargePack_Low_3 = new BatteryPackBaseBauble(3); - ModItems.itemChargePack_Low_4 = new BatteryPackBaseBauble(4); - ModItems.itemChargePack_Low_5 = new BatteryPackBaseBauble(5); - ModItems.itemChargePack_High_1 = new BatteryPackBaseBauble(6); - ModItems.itemChargePack_High_2 = new BatteryPackBaseBauble(7); - ModItems.itemChargePack_High_3 = new BatteryPackBaseBauble(8); - ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9); - } catch (Throwable t) { - t.printStackTrace(); - } + ModItems.itemChargePack_Low_1 = new BatteryPackBaseBauble(1); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_1, 1, OreDictionary.WILDCARD_VALUE), LV); + ModItems.itemChargePack_Low_2 = new BatteryPackBaseBauble(2); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_2, 1, OreDictionary.WILDCARD_VALUE), MV); + ModItems.itemChargePack_Low_3 = new BatteryPackBaseBauble(3); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_3, 1, OreDictionary.WILDCARD_VALUE), HV); + ModItems.itemChargePack_Low_4 = new BatteryPackBaseBauble(4); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_4, 1, OreDictionary.WILDCARD_VALUE), EV); + ModItems.itemChargePack_Low_5 = new BatteryPackBaseBauble(5); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_Low_5, 1, OreDictionary.WILDCARD_VALUE), IV); + ModItems.itemChargePack_High_1 = new BatteryPackBaseBauble(6); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_1, 1, OreDictionary.WILDCARD_VALUE), LuV); + ModItems.itemChargePack_High_2 = new BatteryPackBaseBauble(7); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_2, 1, OreDictionary.WILDCARD_VALUE), ZPM); + ModItems.itemChargePack_High_3 = new BatteryPackBaseBauble(8); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_3, 1, OreDictionary.WILDCARD_VALUE), UV); + ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9); + registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_4, 1, OreDictionary.WILDCARD_VALUE), UHV); ModItems.itemAmuletMonsterKiller_Zombie = new MonsterKillerBaseBauble( new Class[] { EntityZombie.class }, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 38148b91ed..292ecf807d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.items; +import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import static gtPlusPlus.core.util.Utils.getTcAspectStack; import net.minecraft.item.EnumAction; @@ -70,6 +72,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { getTcAspectStack(TC_Aspects.METALLUM, 2L), getTcAspectStack(TC_Aspects.POTENTIA, 2L) })); this.setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true); + registerTieredTooltip(GregtechItemList.Battery_RE_EV_Sodium.get(1), EV); GregtechItemList.Battery_RE_EV_Cadmium.set( this.addItem( @@ -80,6 +83,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L) })); this.setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true); + registerTieredTooltip(GregtechItemList.Battery_RE_EV_Cadmium.get(1), EV); GregtechItemList.Battery_RE_EV_Lithium.set( this.addItem( @@ -90,6 +94,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { getTcAspectStack(TC_Aspects.METALLUM, 3L), getTcAspectStack(TC_Aspects.POTENTIA, 3L) })); this.setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true); + registerTieredTooltip(GregtechItemList.Battery_RE_EV_Lithium.get(1), EV); /** * Power Gems |