From 1b14aa1673814339cbdcc39d77530eff0c11ad6e Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 17:04:04 +0200 Subject: fix solar panels --- .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 6 ------ .../gregtech/common/items/GT_MetaGenerated_Item_02.java | 10 ++++++++++ .../gregtech/textures/items/gt.metaitem.01/770.png | Bin 3118 -> 0 bytes .../gregtech/textures/items/gt.metaitem.01/771.png | Bin 3137 -> 0 bytes .../gregtech/textures/items/gt.metaitem.01/772.png | Bin 3123 -> 0 bytes .../gregtech/textures/items/gt.metaitem.02/770.png | Bin 0 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.02/771.png | Bin 0 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.02/772.png | Bin 0 -> 3123 bytes 8 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png 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 8a00dc60b6..db26ca6e71 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,9 +799,6 @@ 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)); @@ -813,9 +810,6 @@ 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/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 698b48e5e2..736af7f3a2 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -4,9 +4,11 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.items.GT_MetaGenerated_Item_X32; import gregtech.api.objects.GT_CopiedBlockTexture; +import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; +import gregtech.common.covers.GT_Cover_SolarPanel; import gregtech.common.items.behaviors.Behaviour_Arrow; import net.minecraft.dispenser.IBlockSource; import net.minecraft.enchantment.Enchantment; @@ -390,6 +392,14 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { } } ItemList.Display_ITS_FREE.set(addItem(tLastID = 766, "ITS FREE", "(or at least almost free)", new Object[]{SubTag.INVISIBLE, new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); + + 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_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)); } public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { 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 deleted file mode 100644 index fe039142e0..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/770.png and /dev/null 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 deleted file mode 100644 index 2fad5c9386..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/771.png and /dev/null 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 deleted file mode 100644 index 08ff840ea5..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/772.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png new file mode 100644 index 0000000000..fe039142e0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png new file mode 100644 index 0000000000..2fad5c9386 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png new file mode 100644 index 0000000000..08ff840ea5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png differ -- cgit