diff options
Diffstat (limited to 'src/main/java')
3 files changed, 132 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 71d7e9b205..fe28c237e5 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1571,6 +1571,8 @@ public enum ItemList implements IItemContainer { Distillation_Tower, Energy_LapotronicOrb2, Ore_Processor, + ZPM6, + ZPM5, ZPM4, ZPM3, ZPM2, diff --git a/src/main/java/gregtech/client/GT_TooltipHandler.java b/src/main/java/gregtech/client/GT_TooltipHandler.java index 49cf40ab3b..221e000b13 100644 --- a/src/main/java/gregtech/client/GT_TooltipHandler.java +++ b/src/main/java/gregtech/client/GT_TooltipHandler.java @@ -61,7 +61,110 @@ public class GT_TooltipHandler { AQUA + OBFUSCATED + BOLD + UNDERLINE, BLUE + OBFUSCATED + BOLD + UNDERLINE, LIGHT_PURPLE + OBFUSCATED + BOLD + UNDERLINE, - RED + OBFUSCATED + BOLD + UNDERLINE))); + RED + OBFUSCATED + BOLD + UNDERLINE))), + ERV(chain( + animatedText( + "E", + 1, + 100, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "R", + 1, + 100, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "R", + 1, + 200, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "O", + 1, + 150, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "R", + 1, + 150, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "-", + 1, + 150, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "T", + 1, + 200, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "i", + 1, + 100, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "e", + 1, + 150, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE), + animatedText( + "r", + 1, + 100, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_RED + BOLD + UNDERLINE, + DARK_GRAY + OBFUSCATED + BOLD + UNDERLINE))); private final Supplier<String> tooltip; diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 87814c6fc2..f63a535555 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -1868,6 +1868,32 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[13], 13L, -3L, true); registerTieredTooltip(ItemList.ZPM4.get(1), UXV); + // MAX Battery + ItemList.ZPM5.set( + addItem( + tLastID = 145, + "Insanely Ultimate Battery", + "Fill this for fun", + "batteryMAX", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); + setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[14], 14L, -3L, true); + registerTieredTooltip(ItemList.ZPM5.get(1), MAX); + + // ERROR Battery + ItemList.ZPM6.set( + addItem( + tLastID = 146, + "Mega Ultimate Battery", + "Fill the capacitor to reach enlightenment", + "batteryERV", + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); + setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[15], 15L, -3L, true); + registerTieredTooltip(ItemList.ZPM6.get(1), ERV); + // ZPM Cluster ItemList.Energy_Module.set( addItem( |