aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGDCloud <93287602+GDCloudstrike@users.noreply.github.com>2023-02-03 19:21:28 +0100
committerGitHub <noreply@github.com>2023-02-03 19:21:28 +0100
commitfe736d673cd2aa05ef248ded0dff6b1a68623f22 (patch)
tree52e0388d608eb2f7d86a6622acadc6e56b5c63b0 /src
parent5edb6485a83cd64276290df0b323af096d38d7b9 (diff)
downloadGT5-Unofficial-fe736d673cd2aa05ef248ded0dff6b1a68623f22.tar.gz
GT5-Unofficial-fe736d673cd2aa05ef248ded0dff6b1a68623f22.tar.bz2
GT5-Unofficial-fe736d673cd2aa05ef248ded0dff6b1a68623f22.zip
Add Extremely Ultimate Battery (#1713)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java13
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/1.pngbin0 -> 2121 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/2.pngbin0 -> 2066 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/3.pngbin0 -> 2078 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/4.pngbin0 -> 2028 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/5.pngbin0 -> 2011 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/6.pngbin0 -> 2025 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/7.pngbin0 -> 2017 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/8.pngbin0 -> 2011 bytes
11 files changed, 16 insertions, 1 deletions
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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/1.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/2.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/3.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/4.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/5.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/6.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/7.png
Binary files 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
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/594/8.png
Binary files differ