From ada00dc070c2db01e6d96f6269f32cad83bd0e06 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 2 Sep 2018 21:46:11 +0200 Subject: change solar pannels to meta generated items 03 add ass line localizer for items --- .../common/items/GT_MetaGenerated_Item_02.java | 10 +--------- .../common/items/GT_MetaGenerated_Item_03.java | 17 +++++++++++++---- src/main/resources/assets/gregtech/lang/en_US.lang | 6 ++++++ .../gregtech/textures/items/gt.metaitem.02/770.png | Bin 3118 -> 0 bytes .../gregtech/textures/items/gt.metaitem.02/771.png | Bin 3137 -> 0 bytes .../gregtech/textures/items/gt.metaitem.02/772.png | Bin 3123 -> 0 bytes .../gregtech/textures/items/gt.metaitem.03/130.png | Bin 0 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.03/131.png | Bin 0 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.03/132.png | Bin 0 -> 3123 bytes 9 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png delete mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png (limited to 'src') 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 736af7f3a2..c9ceea3536 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 @@ -392,15 +392,7 @@ 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) { super.onLeftClickEntity(aStack, aPlayer, aEntity); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 84c73ecd38..38fc49b0d7 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -1,10 +1,10 @@ package gregtech.common.items; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; +import gregtech.api.GregTech_API; +import gregtech.api.enums.*; import gregtech.api.items.GT_MetaGenerated_Item_X32; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.common.covers.GT_Cover_SolarPanel; public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { @@ -195,6 +195,15 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Biomainframe.set(addItem(tLastID = 120, "Bio Mainframe", "A Bio Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION})); ItemList.Tube_Wires.set(addItem(tLastID = 110, "Tube Wires", "For the Vacuum Tubes", o)); + + ItemList.Cover_SolarPanel_UHV.set(addItem(tLastID = 130, "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 = 131, "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 = 132, "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 doesShowInCreative(OrePrefixes aPrefix, Materials aMaterial, boolean aDoShowAllItems) { diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index de3a19fdec..0e0a8313e4 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -734,9 +734,15 @@ achievement.gt.blockmachines.fusioncomputer.tier.08=Fusion Computer Mark III achievement.gt.blockmachines.fusioncomputer.tier.08.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.03.32072=Neuro Processing Unit +achievement.gt.metaitem.03.32077.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32077=Bio Processing Unit achievement.gt.metaitem.03.32072.desc=Pickup this item to see the recipe in NEI achievement.gt.metaitem.03.32095=Wetware Mainframe achievement.gt.metaitem.03.32095.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32099=Bioware Supercomputer +achievement.gt.metaitem.03.32099.desc=Pickup this item to see the recipe in NEI +achievement.gt.metaitem.03.32120=Bio Mainframe +achievement.gt.metaitem.03.32120.desc=Pickup this item to see the recipe in NEI achievement.item.NanoCircuit=Nano Circuit achievement.item.NanoCircuit.desc=Pickup this item to see the recipe in NEI 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 deleted file mode 100644 index fe039142e0..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/770.png and /dev/null 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 deleted file mode 100644 index 2fad5c9386..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/771.png and /dev/null 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 deleted file mode 100644 index 08ff840ea5..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/772.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png new file mode 100644 index 0000000000..fe039142e0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png new file mode 100644 index 0000000000..2fad5c9386 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png new file mode 100644 index 0000000000..08ff840ea5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png differ -- cgit