From 292f6a838098e9868e6fdd59e65e95fa216b6c8b Mon Sep 17 00:00:00 2001 From: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com> Date: Sun, 9 Apr 2023 10:44:44 +1000 Subject: [PATCH] Fix https://github.com/Nomi-CEu/nomi-ceu/issues/314 , cleanup logo textures --- .../config-overrides/expert/randompatches.cfg | 6 +-- .../config-overrides/normal/randompatches.cfg | 6 +-- overrides/config/CustomMainMenu/mainmenu.json | 44 +++++++++--------- overrides/config/randompatches.cfg | 6 +-- ...at#2192.png => 01_extra cool cat#2192.png} | Bin ...at#2192.png => 02_extra cool cat#2192.png} | Bin ...at#2192.png => 03_extra cool cat#2192.png} | Bin ...at#2192.png => 04_extra cool cat#2192.png} | Bin ...at#2192.png => 05_extra cool cat#2192.png} | Bin ...at#2192.png => 06_extra cool cat#2192.png} | Bin ...at#2192.png => 07_extra cool cat#2192.png} | Bin ...GGamer#7202.png => 08_gaboggamer#7202.png} | Bin ...9-Scaatis#5969.png => 09_scaatis#5969.png} | Bin ...#10-AKAASH#2394.png => 10_akaash#2394.png} | Bin ...___#2028.png => 11______________#2028.png} | Bin ...___#2028.png => 12______________#2028.png} | Bin ...mage#13-Pent#7534.png => 13_pent#7534.png} | Bin ...niazade#5149.png => 14_doniazade#5149.png} | Bin ...niazade#5149.png => 15_doniazade#5149.png} | Bin ...#16-dashin#9978.png => 16_dashin#9978.png} | Bin ...ng => 17_besoiobiycrazy designer#0516.png} | Bin ...ng => 18_besoiobiycrazy designer#0516.png} | Bin ...ng => 19_besoiobiycrazy designer#0516.png} | Bin ...GGamer#7202.png => 20_gaboggamer#7202.png} | Bin ...ngel#1961.png => 21_darkarkangel#1961.png} | Bin ...ngel#1961.png => 22_darkarkangel#1961.png} | Bin .../{ => modpack/textures}/logo/256x.png | Bin 27 files changed, 31 insertions(+), 31 deletions(-) rename overrides/resources/minecraft/textures/gui/title/background/{Image#1-Extra Cool Cat#2192.png => 01_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#2-Extra Cool Cat#2192.png => 02_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#3-Extra Cool Cat#2192.png => 03_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#4-Extra Cool Cat#2192.png => 04_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#5-Extra Cool Cat#2192.png => 05_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#6-Extra Cool Cat#2192.png => 06_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#7-Extra Cool Cat#2192.png => 07_extra cool cat#2192.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#8-GaboGGamer#7202.png => 08_gaboggamer#7202.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#9-Scaatis#5969.png => 09_scaatis#5969.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#10-AKAASH#2394.png => 10_akaash#2394.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#11-_____________#2028.png => 11______________#2028.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#12-_____________#2028.png => 12______________#2028.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#13-Pent#7534.png => 13_pent#7534.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#14-Doniazade#5149.png => 14_doniazade#5149.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#15-Doniazade#5149.png => 15_doniazade#5149.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#16-dashin#9978.png => 16_dashin#9978.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#17-Besoiobiy[Crazy Designer]#0516.png => 17_besoiobiycrazy designer#0516.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#18-Besoiobiy[Crazy Designer]#0516.png => 18_besoiobiycrazy designer#0516.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#19-Besoiobiy[Crazy Designer]#0516.png => 19_besoiobiycrazy designer#0516.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#20-GaboGGamer#7202.png => 20_gaboggamer#7202.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#21-DarkArkAngel#1961.png => 21_darkarkangel#1961.png} (100%) rename overrides/resources/minecraft/textures/gui/title/background/{Image#22-DarkArkAngel#1961.png => 22_darkarkangel#1961.png} (100%) rename overrides/resources/{ => modpack/textures}/logo/256x.png (100%) diff --git a/overrides/config-overrides/expert/randompatches.cfg b/overrides/config-overrides/expert/randompatches.cfg index e0acbe2..76fbfa7 100644 --- a/overrides/config-overrides/expert/randompatches.cfg +++ b/overrides/config-overrides/expert/randompatches.cfg @@ -96,17 +96,17 @@ client { # The path to the 16x16 Minecraft window icon. # Leave this and the 32x32 icon blank to use the default icon. # Default: - S:icon16=resources/logo/256x.png + S:icon16=resources/modpack/textures/logo/256x.png # The path to the 32x32 Minecraft window icon. # Leave this and the 16x16 icon blank to use the default icon. # Default: - S:icon32=resources/logo/256x.png + S:icon32=resources/modpack/textures/logo/256x.png # The path to the 256x256 window icon which is used on Mac OS X. # Leave this, the 16x16 icon and the 32x32 icon blank to use the default icon. # Default: - S:icon256=resources/logo/256x.png + S:icon256=resources/modpack/textures/logo/256x.png # The Minecraft window title. # Default: Minecraft 1.12.2 diff --git a/overrides/config-overrides/normal/randompatches.cfg b/overrides/config-overrides/normal/randompatches.cfg index 008eca1..64d9950 100644 --- a/overrides/config-overrides/normal/randompatches.cfg +++ b/overrides/config-overrides/normal/randompatches.cfg @@ -96,17 +96,17 @@ client { # The path to the 16x16 Minecraft window icon. # Leave this and the 32x32 icon blank to use the default icon. # Default: - S:icon16=resources/logo/256x.png + S:icon16=resources/modpack/textures/logo/256x.png # The path to the 32x32 Minecraft window icon. # Leave this and the 16x16 icon blank to use the default icon. # Default: - S:icon32=resources/logo/256x.png + S:icon32=resources/modpack/textures/logo/256x.png # The path to the 256x256 window icon which is used on Mac OS X. # Leave this, the 16x16 icon and the 32x32 icon blank to use the default icon. # Default: - S:icon256=resources/logo/256x.png + S:icon256=resources/modpack/textures/logo/256x.png # The Minecraft window title. # Default: Minecraft 1.12.2 diff --git a/overrides/config/CustomMainMenu/mainmenu.json b/overrides/config/CustomMainMenu/mainmenu.json index f6adad9..ed7d128 100644 --- a/overrides/config/CustomMainMenu/mainmenu.json +++ b/overrides/config/CustomMainMenu/mainmenu.json @@ -122,28 +122,28 @@ "displayDuration": 100, "fadeDuration": 40, "images": [ - "minecraft:textures/gui/title/background/Image#1-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#2-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#3-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#4-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#5-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#6-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#7-Extra Cool Cat#2192.png", - "minecraft:textures/gui/title/background/Image#8-GaboGGamer#7202.png", - "minecraft:textures/gui/title/background/Image#9-Scaatis#5969.png", - "minecraft:textures/gui/title/background/Image#10-AKAASH#2394.png", - "minecraft:textures/gui/title/background/Image#11-_____________#2028.png", - "minecraft:textures/gui/title/background/Image#12-_____________#2028.png", - "minecraft:textures/gui/title/background/Image#13-Pent#7534.png", - "minecraft:textures/gui/title/background/Image#14-Doniazade#5149.png", - "minecraft:textures/gui/title/background/Image#15-Doniazade#5149.png", - "minecraft:textures/gui/title/background/Image#16-dashin#9978.png", - "minecraft:textures/gui/title/background/Image#17-Besoiobiy[Crazy Designer]#0516.png", - "minecraft:textures/gui/title/background/Image#18-Besoiobiy[Crazy Designer]#0516.png", - "minecraft:textures/gui/title/background/Image#19-Besoiobiy[Crazy Designer]#0516.png", - "minecraft:textures/gui/title/background/Image#20-GaboGGamer#7202.png", - "minecraft:textures/gui/title/background/Image#21-DarkArkAngel#1961.png", - "minecraft:textures/gui/title/background/Image#22-DarkArkAngel#1961.png" + "minecraft:textures/gui/title/background/01_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/02_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/03_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/04_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/05_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/06_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/07_extra cool cat#2192.png", + "minecraft:textures/gui/title/background/08_gaboggamer#7202.png", + "minecraft:textures/gui/title/background/09_scaatis#5969.png", + "minecraft:textures/gui/title/background/10_akaash#2394.png", + "minecraft:textures/gui/title/background/11______________#2028.png", + "minecraft:textures/gui/title/background/12______________#2028.png", + "minecraft:textures/gui/title/background/13_pent#7534.png", + "minecraft:textures/gui/title/background/14_doniazade#5149.png", + "minecraft:textures/gui/title/background/15_doniazade#5149.png", + "minecraft:textures/gui/title/background/16_dashin#9978.png", + "minecraft:textures/gui/title/background/17_besoiobiycrazy designer#0516.png", + "minecraft:textures/gui/title/background/18_besoiobiycrazy designer#0516.png", + "minecraft:textures/gui/title/background/19_besoiobiycrazy designer#0516.png", + "minecraft:textures/gui/title/background/20_gaboggamer#7202.png", + "minecraft:textures/gui/title/background/21_darkarkangel#1961.png", + "minecraft:textures/gui/title/background/22_darkarkangel#1961.png" ] } } diff --git a/overrides/config/randompatches.cfg b/overrides/config/randompatches.cfg index 008eca1..64d9950 100644 --- a/overrides/config/randompatches.cfg +++ b/overrides/config/randompatches.cfg @@ -96,17 +96,17 @@ client { # The path to the 16x16 Minecraft window icon. # Leave this and the 32x32 icon blank to use the default icon. # Default: - S:icon16=resources/logo/256x.png + S:icon16=resources/modpack/textures/logo/256x.png # The path to the 32x32 Minecraft window icon. # Leave this and the 16x16 icon blank to use the default icon. # Default: - S:icon32=resources/logo/256x.png + S:icon32=resources/modpack/textures/logo/256x.png # The path to the 256x256 window icon which is used on Mac OS X. # Leave this, the 16x16 icon and the 32x32 icon blank to use the default icon. # Default: - S:icon256=resources/logo/256x.png + S:icon256=resources/modpack/textures/logo/256x.png # The Minecraft window title. # Default: Minecraft 1.12.2 diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#1-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/01_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#1-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/01_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#2-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/02_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#2-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/02_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#3-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/03_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#3-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/03_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#4-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/04_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#4-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/04_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#5-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/05_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#5-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/05_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#6-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/06_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#6-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/06_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#7-Extra Cool Cat#2192.png b/overrides/resources/minecraft/textures/gui/title/background/07_extra cool cat#2192.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#7-Extra Cool Cat#2192.png rename to overrides/resources/minecraft/textures/gui/title/background/07_extra cool cat#2192.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#8-GaboGGamer#7202.png b/overrides/resources/minecraft/textures/gui/title/background/08_gaboggamer#7202.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#8-GaboGGamer#7202.png rename to overrides/resources/minecraft/textures/gui/title/background/08_gaboggamer#7202.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#9-Scaatis#5969.png b/overrides/resources/minecraft/textures/gui/title/background/09_scaatis#5969.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#9-Scaatis#5969.png rename to overrides/resources/minecraft/textures/gui/title/background/09_scaatis#5969.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#10-AKAASH#2394.png b/overrides/resources/minecraft/textures/gui/title/background/10_akaash#2394.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#10-AKAASH#2394.png rename to overrides/resources/minecraft/textures/gui/title/background/10_akaash#2394.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#11-_____________#2028.png b/overrides/resources/minecraft/textures/gui/title/background/11______________#2028.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#11-_____________#2028.png rename to overrides/resources/minecraft/textures/gui/title/background/11______________#2028.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#12-_____________#2028.png b/overrides/resources/minecraft/textures/gui/title/background/12______________#2028.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#12-_____________#2028.png rename to overrides/resources/minecraft/textures/gui/title/background/12______________#2028.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#13-Pent#7534.png b/overrides/resources/minecraft/textures/gui/title/background/13_pent#7534.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#13-Pent#7534.png rename to overrides/resources/minecraft/textures/gui/title/background/13_pent#7534.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#14-Doniazade#5149.png b/overrides/resources/minecraft/textures/gui/title/background/14_doniazade#5149.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#14-Doniazade#5149.png rename to overrides/resources/minecraft/textures/gui/title/background/14_doniazade#5149.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#15-Doniazade#5149.png b/overrides/resources/minecraft/textures/gui/title/background/15_doniazade#5149.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#15-Doniazade#5149.png rename to overrides/resources/minecraft/textures/gui/title/background/15_doniazade#5149.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#16-dashin#9978.png b/overrides/resources/minecraft/textures/gui/title/background/16_dashin#9978.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#16-dashin#9978.png rename to overrides/resources/minecraft/textures/gui/title/background/16_dashin#9978.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#17-Besoiobiy[Crazy Designer]#0516.png b/overrides/resources/minecraft/textures/gui/title/background/17_besoiobiycrazy designer#0516.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#17-Besoiobiy[Crazy Designer]#0516.png rename to overrides/resources/minecraft/textures/gui/title/background/17_besoiobiycrazy designer#0516.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#18-Besoiobiy[Crazy Designer]#0516.png b/overrides/resources/minecraft/textures/gui/title/background/18_besoiobiycrazy designer#0516.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#18-Besoiobiy[Crazy Designer]#0516.png rename to overrides/resources/minecraft/textures/gui/title/background/18_besoiobiycrazy designer#0516.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#19-Besoiobiy[Crazy Designer]#0516.png b/overrides/resources/minecraft/textures/gui/title/background/19_besoiobiycrazy designer#0516.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#19-Besoiobiy[Crazy Designer]#0516.png rename to overrides/resources/minecraft/textures/gui/title/background/19_besoiobiycrazy designer#0516.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#20-GaboGGamer#7202.png b/overrides/resources/minecraft/textures/gui/title/background/20_gaboggamer#7202.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#20-GaboGGamer#7202.png rename to overrides/resources/minecraft/textures/gui/title/background/20_gaboggamer#7202.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#21-DarkArkAngel#1961.png b/overrides/resources/minecraft/textures/gui/title/background/21_darkarkangel#1961.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#21-DarkArkAngel#1961.png rename to overrides/resources/minecraft/textures/gui/title/background/21_darkarkangel#1961.png diff --git a/overrides/resources/minecraft/textures/gui/title/background/Image#22-DarkArkAngel#1961.png b/overrides/resources/minecraft/textures/gui/title/background/22_darkarkangel#1961.png similarity index 100% rename from overrides/resources/minecraft/textures/gui/title/background/Image#22-DarkArkAngel#1961.png rename to overrides/resources/minecraft/textures/gui/title/background/22_darkarkangel#1961.png diff --git a/overrides/resources/logo/256x.png b/overrides/resources/modpack/textures/logo/256x.png similarity index 100% rename from overrides/resources/logo/256x.png rename to overrides/resources/modpack/textures/logo/256x.png