From 5307957d3023244b9a72b30ba1b9179ff9379832 Mon Sep 17 00:00:00 2001 From: Pilad Date: Sun, 28 Apr 2024 02:19:40 +0500 Subject: [PATCH] Fix icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пофиксил текстурки иконок каверов когда они установлены непосредственно на блоке. --- src/main/java/gregtech/api/enums/Textures.java | 2 +- .../common/items/GT_MetaGenerated_Item_01.java | 12 ++++++------ .../blocks/iconsets/OVERLAY_NEEDSMAINTAINANCE.png | Bin 0 -> 357 bytes .../blocks/iconsets/OVERLAY_PLAYERDETECTOR.png | Bin 0 -> 290 bytes .../blocks/iconsets/OVERLAY_RECEIVEREXTERNAL.png | Bin 0 -> 363 bytes .../blocks/iconsets/OVERLAY_RECEIVERINTERNAL.png | Bin 0 -> 363 bytes .../iconsets/OVERLAY_TRANSMITTEREXTERNAL.png | Bin 0 -> 357 bytes .../iconsets/OVERLAY_TRANSMITTERINTERNAL.png | Bin 0 -> 357 bytes 8 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_NEEDSMAINTAINANCE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PLAYERDETECTOR.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_RECEIVEREXTERNAL.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_RECEIVERINTERNAL.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TRANSMITTEREXTERNAL.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TRANSMITTERINTERNAL.png diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 76640962e..675c6a041 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -67,7 +67,7 @@ public enum BlockIcons implements IIconContainer, Runnable { STEAM_TURBINE_BOTTOM_ACTIVE, STEAM_TURBINE_TOP_ACTIVE, BLOCK_BRONZEPREIN, BLOCK_STEELPREIN, BLOCK_TITANIUMPREIN, BLOCK_NAQUADAHPREIN, BLOCK_NEUTRONIUMPREIN, BLOCK_IRREIN, BLOCK_PLASCRETE, BLOCK_TSREIN, OVERLAY_LOCKER, OVERLAY_LOCKER_000, OVERLAY_LOCKER_001, OVERLAY_LOCKER_002, OVERLAY_LOCKER_003, OVERLAY_LOCKER_004, OVERLAY_LOCKER_005, OVERLAY_LOCKER_006, OVERLAY_LOCKER_007, OVERLAY_LOCKER_008, OVERLAY_LOCKER_009, OVERLAY_LOCKER_010, OVERLAY_LOCKER_011, OVERLAY_LOCKER_012, OVERLAY_LOCKER_013, OVERLAY_LENS, OVERLAY_PIPE, OVERLAY_PIPE_IN, OVERLAY_PIPE_OUT, OVERLAY_MUFFLER, OVERLAY_CONTROLLER, OVERLAY_ACTIVITYDETECTOR, - OVERLAY_ENERGYDETECTOR, OVERLAY_FLUIDDETECTOR, OVERLAY_ITEMDETECTOR, OVERLAY_FUSION1, OVERLAY_FUSION2, OVERLAY_FUSION3, OVERLAY_FUSION4, OVERLAY_SCREEN, OVERLAY_QTANK, OVERLAY_QCHEST, OVERLAY_SHUTTER, + OVERLAY_ENERGYDETECTOR, OVERLAY_FLUIDDETECTOR, OVERLAY_ITEMDETECTOR, OVERLAY_PLAYERDETECTOR, OVERLAY_TRANSMITTEREXTERNAL, OVERLAY_TRANSMITTERINTERNAL, OVERLAY_RECEIVEREXTERNAL, OVERLAY_RECEIVERINTERNAL, OVERLAY_NEEDSMAINTAINANCE, OVERLAY_FUSION1, OVERLAY_FUSION2, OVERLAY_FUSION3, OVERLAY_FUSION4, OVERLAY_SCREEN, OVERLAY_QTANK, OVERLAY_QCHEST, OVERLAY_SHUTTER, OVERLAY_CLOSET, OVERLAY_DUCTTAPE, OVERLAY_MAINTENANCE, OVERLAY_DATA_ACCESS, OVERLAY_CONVEYOR, OVERLAY_PUMP, OVERLAY_ARM, OVERLAY_DRAIN, OVERLAY_CRAFTING, OVERLAY_ENERGY_IN, OVERLAY_ENERGY_OUT, OVERLAY_ENERGY_IN_MULTI, OVERLAY_ENERGY_OUT_MULTI, OVERLAY_FRONT_LARGE_BOILER, OVERLAY_FRONT_LARGE_BOILER_ACTIVE, OVERLAY_FRONT_VACUUM_FREEZER, OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE, OVERLAY_FRONT_MULTI_SMELTER, OVERLAY_FRONT_MULTI_SMELTER_ACTIVE, OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE, OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE, OVERLAY_FRONT_IMPLOSION_COMPRESSOR, 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 ef4aca3ea..41ecb0636 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 @@ -700,7 +700,7 @@ public GT_MetaGenerated_Item_01() { GregTech_API.registerCover(ItemList.Cover_FluidDetector.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_FLUIDDETECTOR)), new GT_Cover_LiquidMeter()); GregTech_API.registerCover(ItemList.Cover_ItemDetector.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ITEMDETECTOR)), new GT_Cover_ItemMeter()); GregTech_API.registerCover(ItemList.Cover_EnergyDetector.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ENERGYDETECTOR)), new GT_Cover_EUMeter()); - GregTech_API.registerCover(ItemList.Cover_PlayerDetector.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)), new GT_Cover_PlayerDetector()); + GregTech_API.registerCover(ItemList.Cover_PlayerDetector.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_PLAYERDETECTOR)), new GT_Cover_PlayerDetector()); ItemList.Cover_Screen.set(addItem(tLastID = 740, "Computer Monitor", "Displays Data (as Cover)")); ItemList.Cover_Crafting.set(addItem(tLastID = 744, "Crafting Table Cover", "Better than a wooden Workbench (as Cover)")); @@ -759,10 +759,10 @@ public GT_MetaGenerated_Item_01() { ItemList.Cover_RedstoneReceiverExternal.set(addItem(tLastID = 746, "Redstone Receiver (Out)", "Transfers Redstonesignals wireless (as Cover)")); ItemList.Cover_RedstoneReceiverInternal.set(addItem(tLastID = 747, "Redstone Receiver (In)", "Transfers Redstonesignals wireless (as Cover)")); - GregTech_API.registerCover(ItemList.Cover_RedstoneTransmitterExternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)), new GT_Cover_RedstoneTransmitterExternal()); - GregTech_API.registerCover(ItemList.Cover_RedstoneTransmitterInternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)), new GT_Cover_RedstoneTransmitterInternal()); - GregTech_API.registerCover(ItemList.Cover_RedstoneReceiverExternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_FLUIDDETECTOR)), new GT_Cover_RedstoneReceiverExternal()); - GregTech_API.registerCover(ItemList.Cover_RedstoneReceiverInternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_FLUIDDETECTOR)), new GT_Cover_RedstoneReceiverInternal()); + GregTech_API.registerCover(ItemList.Cover_RedstoneTransmitterExternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_TRANSMITTEREXTERNAL)), new GT_Cover_RedstoneTransmitterExternal()); + GregTech_API.registerCover(ItemList.Cover_RedstoneTransmitterInternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_TRANSMITTERINTERNAL)), new GT_Cover_RedstoneTransmitterInternal()); + GregTech_API.registerCover(ItemList.Cover_RedstoneReceiverExternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_RECEIVEREXTERNAL)), new GT_Cover_RedstoneReceiverExternal()); + GregTech_API.registerCover(ItemList.Cover_RedstoneReceiverInternal.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_RECEIVERINTERNAL)), new GT_Cover_RedstoneReceiverInternal()); GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), ItemList.Cover_RedstoneTransmitterExternal.get(1L), 3200, 128); GT_Values.RA.addAssemblerRecipe(ItemList.Sensor_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L), ItemList.Cover_RedstoneReceiverExternal.get(1L), 3200, 128); @@ -772,7 +772,7 @@ public GT_MetaGenerated_Item_01() { GT_ModHandler.addShapelessCraftingRecipe(ItemList.Cover_RedstoneReceiverExternal.get(1L), new Object[]{ItemList.Cover_RedstoneReceiverInternal.get(1L)}); ItemList.Cover_NeedsMaintainance.set(addItem(tLastID = 748, "Needs Maintenance Cover", "Attach to Multiblock Controller. Emits Redstone Signal if needs Maintenance")); - GregTech_API.registerCover(ItemList.Cover_NeedsMaintainance.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_ACTIVITYDETECTOR)), new GT_Cover_NeedMaintainance()); + GregTech_API.registerCover(ItemList.Cover_NeedsMaintainance.get(1L), new GT_MultiTexture(Textures.BlockIcons.MACHINE_CASINGS[2][0], TextureFactory.of(Textures.BlockIcons.OVERLAY_NEEDSMAINTAINANCE)), new GT_Cover_NeedMaintainance()); GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_MV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Cover_NeedsMaintainance.get(1L), 600, 24); ItemList.Energy_Module.set(addItem(tLastID = 736, "Energy Module", "Reusable battery", OrePrefixes.battery.get(Materials.Ultimate))); diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_NEEDSMAINTAINANCE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_NEEDSMAINTAINANCE.png new file mode 100644 index 0000000000000000000000000000000000000000..c986ab738c20c6335004745e55646866ad79d4b9 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqRxWN?#j484XF#D(o-U3d7N@UHGR!{YAkjAeh;hn` z1p>JXtGx<8=5xx5gveNxi)&Em8S5`N-7ZGG}|#nfzQ)Aa!O5Wu~yyX z<9C18eZO;;`+w}Qbsua0M_)JTSNhf5$hhE}`6QK#QX6_6-;eWbGT?Dt{CZcb>DTEu zt1B8idFS%PC0ngE>w7Gs;rmkMyzcY!lLH<+$#rhND}ZPJbDzgQ0bRnA$pVTIAW2%R%y{W;-5;PJdx@v7EBie*Q9cuPtewi$Jl3l$ed=YcT%A`MrggFj)iZU%Z&3!JlYtImP<&~vD&n5_B3l~Y-~)N#=(4e zy8MsB4C@)^?=v*0`RUoocz6x@xLPFx7xqrM{P}-`qJx%Fq cU7L&mdKI;Vst0Q}Qt5&!@I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_RECEIVEREXTERNAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_RECEIVEREXTERNAL.png new file mode 100644 index 0000000000000000000000000000000000000000..14feeb894752fd2404aee36eb53924a8271408aa GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqRxWON4z9n8Ie9{2OU8+w6Wxr-;Yt@B=h@gre=uDF1m&d@YxAScUUFJE)NU&Y|tp4xTZ495#y7NtfmwEiox zGi+DeJ@zSFC3`j3{^4Dg*%p%(v^46S&>q1r_KK5LQ!_+nmtLHzR-Val-rr!pqY~pu zlW7a*Dg^9n`feVfSASl-u<1c`OP6nqkJ^#9?jFk$Hz$5gN|u?~@#4Wlzk^l0i}fqE zGQPO8Dub_VahCZz=Y&lEBl<3}E0`M>zLv|m@xN2PetRH??j^YlU>GoXy85}Sb4q9e E0EbAAfB*mh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TRANSMITTEREXTERNAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TRANSMITTEREXTERNAL.png new file mode 100644 index 0000000000000000000000000000000000000000..c986ab738c20c6335004745e55646866ad79d4b9 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqRxWN?#j484XF#D(o-U3d7N@UHGR!{YAkjAeh;hn` z1p>JXtGx<8=5xx5gveNxi)&Em8S5`N-7ZGG}|#nfzQ)Aa!O5Wu~yyX z<9C18eZO;;`+w}Qbsua0M_)JTSNhf5$hhE}`6QK#QX6_6-;eWbGT?Dt{CZcb>DTEu zt1B8idFS%PC0ngE>w7Gs;rmkMyzcY!lLH<+$#rhND}ZPJbDzgQ0bRnA$pVTIAW2%R z3j}f(R(lnG%;%I936ZfX$yx5Oop0_g)%}ZSD^1~>l~f?WX|`jE0-vXKq>ps^0kG^iwuk@?Ak#WH{^GPZfr8e|Dz8~k=WWeLP`1P(<)34KS zR#!B3^3LUnOSW2T*7sOM!}q1id%cEG$z^ONq9$1t=lzwYPKwuT?iX5feqr9BtLjfg z1GR)MoK8$};+k-H=Ftmb?gD3gZZKWfO!@F{+N2xPf3Y0=tDLiH!wRE$5jtzQ_vP)X zV%fc(t7<#z#wo%dxpp;LNf`7mYHpe9_m{z2(eupe=}B%t-!pi+`njxgN@xNAT1bwz literal 0 HcmV?d00001