aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-08-31 22:33:37 +0200
committerDream-Master <dream-master@gmx.net>2018-08-31 22:33:37 +0200
commit9ee6433e4080921dbb0f6a0c8da30f3eb055b0d7 (patch)
tree240e40c2d6b57f64754b2b3f869e42c12b6c854a
parent606f0340671b22e413cf3afc8bfa3b613209c57d (diff)
downloadGT5-Unofficial-9ee6433e4080921dbb0f6a0c8da30f3eb055b0d7.tar.gz
GT5-Unofficial-9ee6433e4080921dbb0f6a0c8da30f3eb055b0d7.tar.bz2
GT5-Unofficial-9ee6433e4080921dbb0f6a0c8da30f3eb055b0d7.zip
Added new Solar Panels from UHV to UIV (no recipes yet)
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java3
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java6
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.pngbin0 -> 178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.pngbin0 -> 178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.pngbin0 -> 178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.pngbin434 -> 3146 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.pngbin478 -> 3181 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.pngbin447 -> 3154 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.pngbin462 -> 3188 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.pngbin459 -> 3176 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.pngbin463 -> 3160 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.pngbin466 -> 3168 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.pngbin464 -> 3187 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.pngbin477 -> 3195 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.pngbin444 -> 3151 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.pngbin0 -> 3197 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.pngbin0 -> 3222 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.pngbin0 -> 3198 bytes
19 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index af88db972f..80cd537b08 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -416,6 +416,9 @@ public enum ItemList implements IItemContainer {
Cover_SolarPanel_LuV,
Cover_SolarPanel_ZPM,
Cover_SolarPanel_UV,
+ Cover_SolarPanel_UHV,
+ Cover_SolarPanel_UEV,
+ Cover_SolarPanel_UIV,
Ingot_IridiumAlloy,
Plank_Oak,
Plank_Spruce,
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index 9bd00b2836..15609b3ff6 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -35,7 +35,7 @@ public class Textures {
VOID // The Empty Texture
, RENDERING_ERROR, PIPE_RESTRICTOR, INSULATION_FULL, INSULATION_TINY, INSULATION_SMALL, INSULATION_MEDIUM, INSULATION_MEDIUM_PLUS, INSULATION_LARGE, INSULATION_HUGE, CFOAM_FRESH,
CFOAM_HARDENED, SOLARPANEL, SOLARPANEL_8V, SOLARPANEL_LV, SOLARPANEL_MV, SOLARPANEL_HV, SOLARPANEL_EV, SOLARPANEL_IV, SOLARPANEL_LuV, SOLARPANEL_ZPM,
- SOLARPANEL_UV, VENT_NORMAL, VENT_ADVANCED, COVER_WOOD_PLATE, ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, AUTOMATION_FILTER, AUTOMATION_TYPEFILTER,
+ SOLARPANEL_UV, SOLARPANEL_UHV, SOLARPANEL_UEV, SOLARPANEL_UIV, VENT_NORMAL, VENT_ADVANCED, COVER_WOOD_PLATE, ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT, AUTOMATION_FILTER, AUTOMATION_TYPEFILTER,
AUTOMATION_CHESTBUFFER, AUTOMATION_SUPERBUFFER, AUTOMATION_REGULATOR, AUTOMATION_ITEMDISTRIBUTOR, CONCRETE_LIGHT_STONE, CONCRETE_LIGHT_COBBLE, CONCRETE_LIGHT_COBBLE_MOSSY,
CONCRETE_LIGHT_BRICKS, CONCRETE_LIGHT_BRICKS_CRACKED, CONCRETE_LIGHT_BRICKS_MOSSY, CONCRETE_LIGHT_BRICKS_CHISELED, CONCRETE_LIGHT_SMOOTH, CONCRETE_DARK_STONE,
CONCRETE_DARK_COBBLE, CONCRETE_DARK_COBBLE_MOSSY, CONCRETE_DARK_BRICKS, CONCRETE_DARK_BRICKS_CRACKED, CONCRETE_DARK_BRICKS_MOSSY, CONCRETE_DARK_BRICKS_CHISELED,
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 db26ca6e71..8a00dc60b6 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
@@ -799,6 +799,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
ItemList.Cover_SolarPanel_LuV.set(addItem(tLastID = 757, "Solar Panel (LuV)", "Ludicrous Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)}));
ItemList.Cover_SolarPanel_ZPM.set(addItem(tLastID = 758, "Solar Panel (ZPM)", "ZPM Voltage Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)}));
ItemList.Cover_SolarPanel_UV.set(addItem(tLastID = 759, "Solar Panel (UV)", "Ultimate Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 64L)}));
+ ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 770, "Solar Panel (UHV)", "UHV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 128L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L)}));
+ ItemList.Cover_SolarPanel_UEV.set(addItem(tLastID = 771, "Solar Panel (UEV)", "UEV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L)}));
+ ItemList.Cover_SolarPanel_UIV.set(addItem(tLastID = 772, "Solar Panel (UIV)", "UIV Solar Panel (Needs cleaning with right click)", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 512L), new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 512L)}));
GregTech_API.registerCover(ItemList.Cover_SolarPanel.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL), new GT_Cover_SolarPanel(1));
GregTech_API.registerCover(ItemList.Cover_SolarPanel_8V.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V), new GT_Cover_SolarPanel(8));
@@ -810,6 +813,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
GregTech_API.registerCover(ItemList.Cover_SolarPanel_LuV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV), new GT_Cover_SolarPanel(32768));
GregTech_API.registerCover(ItemList.Cover_SolarPanel_ZPM.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM), new GT_Cover_SolarPanel(131072));
GregTech_API.registerCover(ItemList.Cover_SolarPanel_UV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV), new GT_Cover_SolarPanel(524288));
+ GregTech_API.registerCover(ItemList.Cover_SolarPanel_UHV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UHV), new GT_Cover_SolarPanel(2097152));
+ GregTech_API.registerCover(ItemList.Cover_SolarPanel_UEV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UEV), new GT_Cover_SolarPanel(8388608));
+ GregTech_API.registerCover(ItemList.Cover_SolarPanel_UIV.get(1L, new Object[0]), new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432));
ItemList.Tool_Sonictron.set(addItem(tLastID = 760, "Sonictron", "Bring your Music with you", new Object[]{Behaviour_Sonictron.INSTANCE, new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L)}));
ItemList.Tool_Cheat.set(addItem(tLastID = 761, "Debug Scanner", "Also an Infinite Energy Source", new Object[]{Behaviour_Scanner.INSTANCE, new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 64L)}));
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png
new file mode 100644
index 0000000000..e3dcb7b2c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UEV.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png
new file mode 100644
index 0000000000..e3dcb7b2c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UHV.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png
new file mode 100644
index 0000000000..e3dcb7b2c9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/SOLARPANEL_UIV.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png
index 2106b2533c..ce0df610fb 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png
index f3e0b5f67e..1ecbb6373e 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png
index 3aed0ef200..d4412d6858 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png
index 03d271872e..7f64ef3e5c 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png
index dd87199ae2..1a57bf6f1f 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png
index 5b9053e1f4..4ac360c41e 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png
index 23c87b8a2d..766b2b9be7 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png
index 511366e648..a264ff97bb 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png
index d8d2012c51..1a78bbdfc2 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png
index 1e538bce45..e28d6cc462 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png
new file mode 100644
index 0000000000..f5fbb61eda
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png
new file mode 100644
index 0000000000..6506e3e460
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png
Binary files differ
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png
new file mode 100644
index 0000000000..11bd87f69a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png
Binary files differ