diff options
| author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2023-03-21 00:55:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 23:55:17 +0000 |
| commit | 0ab6f7ca15d16543a064a407d56a8013c8caff53 (patch) | |
| tree | 99a3cb8243534a0e2e12284e30d64cb478dcd0e4 /src | |
| parent | ea95663045633c7d0caa584de3aefc9f01176d29 (diff) | |
| download | GT5-Unofficial-0ab6f7ca15d16543a064a407d56a8013c8caff53.tar.gz GT5-Unofficial-0ab6f7ca15d16543a064a407d56a8013c8caff53.tar.bz2 GT5-Unofficial-0ab6f7ca15d16543a064a407d56a8013c8caff53.zip | |
Add Insanely & Mega ultimate battery (#1807)
* Add items
* Add error-tier tooltip
* localisation
* textures
Diffstat (limited to 'src')
20 files changed, 136 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( diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index d640c757ce..808bed10f8 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -827,6 +827,10 @@ achievement.gt.metaitem.01.32609=Really Ultimate Battery achievement.gt.metaitem.01.32609.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32594=Extremely Ultimate Battery achievement.gt.metaitem.01.32594.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32145=Insanely Ultimate Battery +achievement.gt.metaitem.01.32145.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.01.32146=Insanely Ultimate Battery +achievement.gt.metaitem.01.32146.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32736=Energy Module achievement.gt.metaitem.01.32736.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.01.32737=Energy Cluster diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/1.png Binary files differnew file mode 100644 index 0000000000..e028da0487 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/1.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/2.png Binary files differnew file mode 100644 index 0000000000..4711daed83 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/2.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/3.png Binary files differnew file mode 100644 index 0000000000..6f9dbf32aa --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/3.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/4.png Binary files differnew file mode 100644 index 0000000000..22164fef97 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/4.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/5.png Binary files differnew file mode 100644 index 0000000000..ea9b00b565 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/5.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/6.png Binary files differnew file mode 100644 index 0000000000..039166c9fb --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/6.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/7.png Binary files differnew file mode 100644 index 0000000000..dc637d9ba9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/7.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/8.png Binary files differnew file mode 100644 index 0000000000..ba5f51443a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/145/8.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/1.png Binary files differnew file mode 100644 index 0000000000..c367eb7a45 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/1.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/2.png Binary files differnew file mode 100644 index 0000000000..54a2a8a9fc --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/2.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/3.png Binary files differnew file mode 100644 index 0000000000..b3a31d3e5a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/3.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/4.png Binary files differnew file mode 100644 index 0000000000..59f0ddb726 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/4.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/5.png Binary files differnew file mode 100644 index 0000000000..2fb324ac89 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/5.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/6.png Binary files differnew file mode 100644 index 0000000000..22993a0660 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/6.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/7.png Binary files differnew file mode 100644 index 0000000000..dc637d9ba9 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/7.png diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/8.png Binary files differnew file mode 100644 index 0000000000..ba5f51443a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/146/8.png |
