diff --git a/config/fancymenu/customization/loading_screen.txt b/config/fancymenu/customization/loading_screen.txt index c1ac6300a..605842f5d 100644 --- a/config/fancymenu/customization/loading_screen.txt +++ b/config/fancymenu/customization/loading_screen.txt @@ -9,7 +9,7 @@ customization-meta { } customization { - name = tfgslideshow + name = main_menu action = setbackgroundslideshow } @@ -55,7 +55,7 @@ customization { } customization { - path = kubejs/assets/tfg/textures/gui/logo-512x512.png + path = kubejs/assets/tfg/textures/gui/logo_512x512.png orientation = mid-centered x = -50 width = 100 diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt index 1e2641ba9..6289cad08 100644 --- a/config/fancymenu/customization/main_menu.txt +++ b/config/fancymenu/customization/main_menu.txt @@ -9,7 +9,7 @@ customization-meta { } customization { - name = tfgslideshow + name = main_menu action = setbackgroundslideshow } @@ -38,8 +38,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png } customization { @@ -65,7 +65,7 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundnormal = kubejs/assets/tfg/textures/gui/mdr_logo.png + backgroundnormal = kubejs/assets/tfg/textures/gui/modrinth_logo.png } customization { @@ -81,8 +81,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png } customization { @@ -98,8 +98,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png } customization { @@ -145,8 +145,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png } customization { @@ -234,7 +234,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png + backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png label = Offical Server loopbackgroundanimations = true x = 47 @@ -242,12 +242,12 @@ customization { action = addbutton actionid = 6514e312-8243-47af-a516-89743d8ca1af1699692677651 y = -28 - backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png height = 20 } customization { - path = kubejs/assets/tfg/textures/gui/logo-512x512.png + path = kubejs/assets/tfg/textures/gui/logo_512x512.png orientation = mid-centered x = -177 width = 117 @@ -261,7 +261,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = openlink;https://www.curseforge.com/minecraft/modpacks/tfg%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/tfg/textures/gui/curse_logo_hovered.png + backgroundhovered = kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png label = loopbackgroundanimations = true x = 47 @@ -269,7 +269,7 @@ customization { action = addbutton actionid = 9f789963-f2dc-46f7-a57b-9c4de545a6ff1699691707372 y = 18 - backgroundnormal = kubejs/assets/tfg/textures/gui/curse_logo.png + backgroundnormal = kubejs/assets/tfg/textures/gui/curseforge_logo.png height = 20 } @@ -277,7 +277,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = openlink;https://discord.gg/AEaCzCTUwQ%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/tfg/textures/gui/ds_logo_hovered.png + backgroundhovered = kubejs/assets/tfg/textures/gui/discord_logo_hovered.png label = loopbackgroundanimations = true x = 125 @@ -285,7 +285,7 @@ customization { action = addbutton actionid = 57a283ec-1941-4101-b14b-f2188e8660671699691708296 y = 18 - backgroundnormal = kubejs/assets/tfg/textures/gui/ds_logo.png + backgroundnormal = kubejs/assets/tfg/textures/gui/discord_logo.png height = 20 } @@ -293,7 +293,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = openlink;https://github.com/tfg-Team/TFG-Modpack-1.20.x%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/tfg/textures/gui/git_logo_hovered.png + backgroundhovered = kubejs/assets/tfg/textures/gui/github_logo_hovered.png label = loopbackgroundanimations = true x = 100 @@ -301,7 +301,7 @@ customization { action = addbutton actionid = 91b4ae84-eed0-47a3-8fe9-6957c02d2c621699691709167 y = 18 - backgroundnormal = kubejs/assets/tfg/textures/gui/git_logo.png + backgroundnormal = kubejs/assets/tfg/textures/gui/github_logo.png height = 20 } @@ -309,7 +309,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = openlink;https://modrinth.com/modpack/tfg%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/tfg/textures/gui/mdr_logo_hovered.png + backgroundhovered = kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png label = loopbackgroundanimations = true x = 72 @@ -317,7 +317,7 @@ customization { action = addbutton actionid = 6514e312-8243-47af-a516-89743d8ca1af1699692677651 y = 18 - backgroundnormal = kubejs/assets/tfg/textures/gui/mdr_logo.png + backgroundnormal = kubejs/assets/tfg/textures/gui/modrinth_logo.png height = 20 } diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_1.png b/config/fancymenu/slideshows/main_menu/images/image_1.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_1.png rename to config/fancymenu/slideshows/main_menu/images/image_1.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_10.png b/config/fancymenu/slideshows/main_menu/images/image_10.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_10.png rename to config/fancymenu/slideshows/main_menu/images/image_10.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_2.png b/config/fancymenu/slideshows/main_menu/images/image_2.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_2.png rename to config/fancymenu/slideshows/main_menu/images/image_2.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_3.png b/config/fancymenu/slideshows/main_menu/images/image_3.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_3.png rename to config/fancymenu/slideshows/main_menu/images/image_3.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_4.png b/config/fancymenu/slideshows/main_menu/images/image_4.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_4.png rename to config/fancymenu/slideshows/main_menu/images/image_4.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_5.png b/config/fancymenu/slideshows/main_menu/images/image_5.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_5.png rename to config/fancymenu/slideshows/main_menu/images/image_5.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_6.png b/config/fancymenu/slideshows/main_menu/images/image_6.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_6.png rename to config/fancymenu/slideshows/main_menu/images/image_6.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_7.png b/config/fancymenu/slideshows/main_menu/images/image_7.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_7.png rename to config/fancymenu/slideshows/main_menu/images/image_7.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_8.png b/config/fancymenu/slideshows/main_menu/images/image_8.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_8.png rename to config/fancymenu/slideshows/main_menu/images/image_8.png diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_9.png b/config/fancymenu/slideshows/main_menu/images/image_9.png similarity index 100% rename from config/fancymenu/slideshows/tfgslideshow/images/image_9.png rename to config/fancymenu/slideshows/main_menu/images/image_9.png diff --git a/config/fancymenu/slideshows/tfgslideshow/properties.txt b/config/fancymenu/slideshows/main_menu/properties.txt similarity index 84% rename from config/fancymenu/slideshows/tfgslideshow/properties.txt rename to config/fancymenu/slideshows/main_menu/properties.txt index 451ce3857..62efca3b5 100644 --- a/config/fancymenu/slideshows/tfgslideshow/properties.txt +++ b/config/fancymenu/slideshows/main_menu/properties.txt @@ -1,7 +1,7 @@ type = slideshow slideshow-meta { - name = tfgslideshow + name = main_menu width = 1920 height = 1080 x = 0 diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt index 885a05c3c..5b04ef6c5 100644 --- a/config/ftbquests/quests/chapters/primitive_age.snbt +++ b/config/ftbquests/quests/chapters/primitive_age.snbt @@ -14,7 +14,7 @@ Count: 1b id: "ftbquests:custom_icon" tag: { - Icon: "tfg:textures/gui/logo-512x512.png" + Icon: "tfg:textures/gui/logo_512x512.png" } } id: "76EF4D00586A8B74" diff --git a/config/ftbquests/quests/data.snbt b/config/ftbquests/quests/data.snbt index 69a600f99..76df671b0 100644 --- a/config/ftbquests/quests/data.snbt +++ b/config/ftbquests/quests/data.snbt @@ -13,7 +13,7 @@ Count: 1b id: "ftbquests:custom_icon" tag: { - Icon: "tfg:textures/gui/logo-512x512.png" + Icon: "tfg:textures/gui/logo_512x512.png" } } lock_message: "e" diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index c2360d359..d7187d221 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -18,8 +18,8 @@ "displayNameWhenIconFails": true, "entityNumber": 1000.0, "alwaysDisplayNametags": false, - "dotSize": 2.0, "startFadingAt": 0.0, + "dotSize": 2.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, "names": 0.0, diff --git a/kubejs/assets/tfg/textures/gui/button98x20.png b/kubejs/assets/tfg/textures/gui/button_98x20.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/button98x20.png rename to kubejs/assets/tfg/textures/gui/button_98x20.png diff --git a/kubejs/assets/tfg/textures/gui/button98x20_hovered.png b/kubejs/assets/tfg/textures/gui/button_98x20_hovered.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/button98x20_hovered.png rename to kubejs/assets/tfg/textures/gui/button_98x20_hovered.png diff --git a/kubejs/assets/tfg/textures/gui/curse_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/curse_logo.png rename to kubejs/assets/tfg/textures/gui/curseforge_logo.png diff --git a/kubejs/assets/tfg/textures/gui/curse_logo_hovered.png b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/curse_logo_hovered.png rename to kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png diff --git a/kubejs/assets/tfg/textures/gui/ds_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/ds_logo.png rename to kubejs/assets/tfg/textures/gui/discord_logo.png diff --git a/kubejs/assets/tfg/textures/gui/ds_logo_hovered.png b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/ds_logo_hovered.png rename to kubejs/assets/tfg/textures/gui/discord_logo_hovered.png diff --git a/kubejs/assets/tfg/textures/gui/git_logo.png b/kubejs/assets/tfg/textures/gui/github_logo.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/git_logo.png rename to kubejs/assets/tfg/textures/gui/github_logo.png diff --git a/kubejs/assets/tfg/textures/gui/git_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/git_logo_hovered.png rename to kubejs/assets/tfg/textures/gui/github_logo_hovered.png diff --git a/kubejs/assets/tfg/textures/gui/logo-512x512.png b/kubejs/assets/tfg/textures/gui/logo_512x512.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/logo-512x512.png rename to kubejs/assets/tfg/textures/gui/logo_512x512.png diff --git a/kubejs/assets/tfg/textures/gui/mdr_logo.png b/kubejs/assets/tfg/textures/gui/modrinth_logo.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/mdr_logo.png rename to kubejs/assets/tfg/textures/gui/modrinth_logo.png diff --git a/kubejs/assets/tfg/textures/gui/mdr_logo_hovered.png b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png similarity index 100% rename from kubejs/assets/tfg/textures/gui/mdr_logo_hovered.png rename to kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png