From fe736d673cd2aa05ef248ded0dff6b1a68623f22 Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Fri, 3 Feb 2023 19:21:28 +0100 Subject: Add Extremely Ultimate Battery (#1713) --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 13 +++++++++++++ src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ .../gregtech/textures/items/gt.metaitem.01/594/1.png | Bin 0 -> 2121 bytes .../gregtech/textures/items/gt.metaitem.01/594/2.png | Bin 0 -> 2066 bytes .../gregtech/textures/items/gt.metaitem.01/594/3.png | Bin 0 -> 2078 bytes .../gregtech/textures/items/gt.metaitem.01/594/4.png | Bin 0 -> 2028 bytes .../gregtech/textures/items/gt.metaitem.01/594/5.png | Bin 0 -> 2011 bytes .../gregtech/textures/items/gt.metaitem.01/594/6.png | Bin 0 -> 2025 bytes .../gregtech/textures/items/gt.metaitem.01/594/7.png | Bin 0 -> 2017 bytes .../gregtech/textures/items/gt.metaitem.01/594/8.png | Bin 0 -> 2011 bytes 11 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/1.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/2.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/3.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/4.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/5.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/6.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/7.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/8.png (limited to 'src') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index e260b03936..d6eb24e094 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1563,7 +1563,7 @@ public enum ItemList implements IItemContainer { Distillation_Tower, Energy_LapotronicOrb2, Ore_Processor, - + ZPM4, ZPM3, ZPM2, Energy_Module, 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 2abb7ff209..045961e4db 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 @@ -1856,6 +1856,19 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[12], 12L, -3L, true); OreDictionary.registerOre("UMV", ItemList.ZPM3.get(1)); + // UXV Battery + ItemList.ZPM4.set( + addItem( + tLastID = 594, + "Extremely Ultimate Battery", + "Fill this to be older", + "batteryUXV", + 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[13], 13L, -3L, true); + OreDictionary.registerOre("UXV", ItemList.ZPM4.get(1)); + // 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 4102cc6d66..9509d57a45 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -808,6 +808,8 @@ achievement.gt.metaitem.01.32605=Ultimate Battery achievement.gt.metaitem.01.32605.desc=Pickup this item to see the recipe in NEI 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.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/594/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/1.png new file mode 100644 index 0000000000..30cc87ef5f Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/2.png new file mode 100644 index 0000000000..87d312684a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/3.png new file mode 100644 index 0000000000..92f442a345 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/4.png new file mode 100644 index 0000000000..22164fef97 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/5.png new file mode 100644 index 0000000000..ea9b00b565 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/6.png new file mode 100644 index 0000000000..039166c9fb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/7.png new file mode 100644 index 0000000000..dc637d9ba9 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/8.png new file mode 100644 index 0000000000..ba5f51443a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/8.png differ -- cgit