From 31719893125069a490c55f24ddf531ee0b22eeb0 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 1 Jan 2024 12:22:29 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customization/loading_screen.txt | 2 +- config/fancymenu/customization/main_menu.txt | 44 +++++++++--------- config/xaerominimap_entities.json | 2 +- .../{tfg => terrafirmagreg}/lang/en_us.json | 0 .../{tfg => terrafirmagreg}/lang/ru_ru.json | 0 .../textures/gui/button.png | Bin .../textures/gui/button98x20.png | Bin .../textures/gui/button98x20_hovered.png | Bin .../textures/gui/button_hovered.png | Bin .../textures/gui/curse_logo.png | Bin .../textures/gui/curse_logo_hovered.png | Bin .../textures/gui/ds_logo.png | Bin .../textures/gui/ds_logo_hovered.png | Bin .../textures/gui/git_logo.png | Bin .../textures/gui/git_logo_hovered.png | Bin .../textures/gui/logo-512x512.png | Bin .../textures/gui/mdr_logo.png | Bin .../textures/gui/mdr_logo_hovered.png | Bin .../unfinished_basic_electronic_circuit.png | Bin .../textures/item/unfinished_vacuum_tube.png | Bin .../textures/quests/primitive_charcoal_1.png | Bin .../textures/quests/primitive_charcoal_2.png | Bin .../textures/quests/primitive_charcoal_3.png | Bin 23 files changed, 24 insertions(+), 24 deletions(-) rename kubejs/assets/{tfg => terrafirmagreg}/lang/en_us.json (100%) rename kubejs/assets/{tfg => terrafirmagreg}/lang/ru_ru.json (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/button.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/button98x20.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/button98x20_hovered.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/button_hovered.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/curse_logo.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/curse_logo_hovered.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/ds_logo.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/ds_logo_hovered.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/git_logo.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/git_logo_hovered.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/logo-512x512.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/mdr_logo.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/gui/mdr_logo_hovered.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/item/unfinished_basic_electronic_circuit.png (100%) rename kubejs/assets/{kubejs => terrafirmagreg}/textures/item/unfinished_vacuum_tube.png (100%) rename kubejs/assets/{tfg => terrafirmagreg}/textures/quests/primitive_charcoal_1.png (100%) rename kubejs/assets/{tfg => terrafirmagreg}/textures/quests/primitive_charcoal_2.png (100%) rename kubejs/assets/{tfg => terrafirmagreg}/textures/quests/primitive_charcoal_3.png (100%) diff --git a/config/fancymenu/customization/loading_screen.txt b/config/fancymenu/customization/loading_screen.txt index 0d0e07c5e..03f1c1fac 100644 --- a/config/fancymenu/customization/loading_screen.txt +++ b/config/fancymenu/customization/loading_screen.txt @@ -55,7 +55,7 @@ customization { } customization { - path = kubejs/assets/kubejs/textures/gui/logo-512x512.png + path = kubejs/assets/terrafirmagreg/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 a7aa0d236..235e05a27 100644 --- a/config/fancymenu/customization/main_menu.txt +++ b/config/fancymenu/customization/main_menu.txt @@ -38,8 +38,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/button98x20.png } customization { @@ -65,7 +65,7 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundnormal = kubejs/assets/kubejs/textures/gui/mdr_logo.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/mdr_logo.png } customization { @@ -81,8 +81,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/button98x20.png } customization { @@ -98,8 +98,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/button98x20.png } customization { @@ -128,8 +128,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/kubejs/textures/gui/button_hovered.png - backgroundnormal = kubejs/assets/kubejs/textures/gui/button.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/button_hovered.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/button.png } customization { @@ -145,8 +145,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png - backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/button98x20.png } customization { @@ -234,7 +234,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/button98x20_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/kubejs/textures/gui/button98x20.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/button98x20.png height = 20 } customization { - path = kubejs/assets/kubejs/textures/gui/logo-512x512.png + path = kubejs/assets/terrafirmagreg/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/terrafirmagreg%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/kubejs/textures/gui/curse_logo_hovered.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/curse_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/kubejs/textures/gui/curse_logo.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/curse_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/kubejs/textures/gui/ds_logo_hovered.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/ds_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/kubejs/textures/gui/ds_logo.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/ds_logo.png height = 20 } @@ -293,7 +293,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = openlink;https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/kubejs/textures/gui/git_logo_hovered.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/git_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/kubejs/textures/gui/git_logo.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/git_logo.png height = 20 } @@ -309,7 +309,7 @@ customization { orientation = mid-centered restartbackgroundanimations = true buttonaction = openlink;https://modrinth.com/modpack/terrafirmagreg%btnaction_splitter_fm% - backgroundhovered = kubejs/assets/kubejs/textures/gui/mdr_logo_hovered.png + backgroundhovered = kubejs/assets/terrafirmagreg/textures/gui/mdr_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/kubejs/textures/gui/mdr_logo.png + backgroundnormal = kubejs/assets/terrafirmagreg/textures/gui/mdr_logo.png height = 20 } diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index 485d87e8f..c2360d359 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,8 +10,8 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayed": true, "displayHeight": 0.0, + "displayed": true, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/terrafirmagreg/lang/en_us.json similarity index 100% rename from kubejs/assets/tfg/lang/en_us.json rename to kubejs/assets/terrafirmagreg/lang/en_us.json diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/terrafirmagreg/lang/ru_ru.json similarity index 100% rename from kubejs/assets/tfg/lang/ru_ru.json rename to kubejs/assets/terrafirmagreg/lang/ru_ru.json diff --git a/kubejs/assets/kubejs/textures/gui/button.png b/kubejs/assets/terrafirmagreg/textures/gui/button.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/button.png rename to kubejs/assets/terrafirmagreg/textures/gui/button.png diff --git a/kubejs/assets/kubejs/textures/gui/button98x20.png b/kubejs/assets/terrafirmagreg/textures/gui/button98x20.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/button98x20.png rename to kubejs/assets/terrafirmagreg/textures/gui/button98x20.png diff --git a/kubejs/assets/kubejs/textures/gui/button98x20_hovered.png b/kubejs/assets/terrafirmagreg/textures/gui/button98x20_hovered.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/button98x20_hovered.png rename to kubejs/assets/terrafirmagreg/textures/gui/button98x20_hovered.png diff --git a/kubejs/assets/kubejs/textures/gui/button_hovered.png b/kubejs/assets/terrafirmagreg/textures/gui/button_hovered.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/button_hovered.png rename to kubejs/assets/terrafirmagreg/textures/gui/button_hovered.png diff --git a/kubejs/assets/kubejs/textures/gui/curse_logo.png b/kubejs/assets/terrafirmagreg/textures/gui/curse_logo.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/curse_logo.png rename to kubejs/assets/terrafirmagreg/textures/gui/curse_logo.png diff --git a/kubejs/assets/kubejs/textures/gui/curse_logo_hovered.png b/kubejs/assets/terrafirmagreg/textures/gui/curse_logo_hovered.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/curse_logo_hovered.png rename to kubejs/assets/terrafirmagreg/textures/gui/curse_logo_hovered.png diff --git a/kubejs/assets/kubejs/textures/gui/ds_logo.png b/kubejs/assets/terrafirmagreg/textures/gui/ds_logo.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/ds_logo.png rename to kubejs/assets/terrafirmagreg/textures/gui/ds_logo.png diff --git a/kubejs/assets/kubejs/textures/gui/ds_logo_hovered.png b/kubejs/assets/terrafirmagreg/textures/gui/ds_logo_hovered.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/ds_logo_hovered.png rename to kubejs/assets/terrafirmagreg/textures/gui/ds_logo_hovered.png diff --git a/kubejs/assets/kubejs/textures/gui/git_logo.png b/kubejs/assets/terrafirmagreg/textures/gui/git_logo.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/git_logo.png rename to kubejs/assets/terrafirmagreg/textures/gui/git_logo.png diff --git a/kubejs/assets/kubejs/textures/gui/git_logo_hovered.png b/kubejs/assets/terrafirmagreg/textures/gui/git_logo_hovered.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/git_logo_hovered.png rename to kubejs/assets/terrafirmagreg/textures/gui/git_logo_hovered.png diff --git a/kubejs/assets/kubejs/textures/gui/logo-512x512.png b/kubejs/assets/terrafirmagreg/textures/gui/logo-512x512.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/logo-512x512.png rename to kubejs/assets/terrafirmagreg/textures/gui/logo-512x512.png diff --git a/kubejs/assets/kubejs/textures/gui/mdr_logo.png b/kubejs/assets/terrafirmagreg/textures/gui/mdr_logo.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/mdr_logo.png rename to kubejs/assets/terrafirmagreg/textures/gui/mdr_logo.png diff --git a/kubejs/assets/kubejs/textures/gui/mdr_logo_hovered.png b/kubejs/assets/terrafirmagreg/textures/gui/mdr_logo_hovered.png similarity index 100% rename from kubejs/assets/kubejs/textures/gui/mdr_logo_hovered.png rename to kubejs/assets/terrafirmagreg/textures/gui/mdr_logo_hovered.png diff --git a/kubejs/assets/kubejs/textures/item/unfinished_basic_electronic_circuit.png b/kubejs/assets/terrafirmagreg/textures/item/unfinished_basic_electronic_circuit.png similarity index 100% rename from kubejs/assets/kubejs/textures/item/unfinished_basic_electronic_circuit.png rename to kubejs/assets/terrafirmagreg/textures/item/unfinished_basic_electronic_circuit.png diff --git a/kubejs/assets/kubejs/textures/item/unfinished_vacuum_tube.png b/kubejs/assets/terrafirmagreg/textures/item/unfinished_vacuum_tube.png similarity index 100% rename from kubejs/assets/kubejs/textures/item/unfinished_vacuum_tube.png rename to kubejs/assets/terrafirmagreg/textures/item/unfinished_vacuum_tube.png diff --git a/kubejs/assets/tfg/textures/quests/primitive_charcoal_1.png b/kubejs/assets/terrafirmagreg/textures/quests/primitive_charcoal_1.png similarity index 100% rename from kubejs/assets/tfg/textures/quests/primitive_charcoal_1.png rename to kubejs/assets/terrafirmagreg/textures/quests/primitive_charcoal_1.png diff --git a/kubejs/assets/tfg/textures/quests/primitive_charcoal_2.png b/kubejs/assets/terrafirmagreg/textures/quests/primitive_charcoal_2.png similarity index 100% rename from kubejs/assets/tfg/textures/quests/primitive_charcoal_2.png rename to kubejs/assets/terrafirmagreg/textures/quests/primitive_charcoal_2.png diff --git a/kubejs/assets/tfg/textures/quests/primitive_charcoal_3.png b/kubejs/assets/terrafirmagreg/textures/quests/primitive_charcoal_3.png similarity index 100% rename from kubejs/assets/tfg/textures/quests/primitive_charcoal_3.png rename to kubejs/assets/terrafirmagreg/textures/quests/primitive_charcoal_3.png