diff --git a/config/fancymenu/customization/loading_screen.txt b/config/fancymenu/customization/loading_screen.txt index 1fa061063..0d0e07c5e 100644 --- a/config/fancymenu/customization/loading_screen.txt +++ b/config/fancymenu/customization/loading_screen.txt @@ -55,7 +55,7 @@ customization { } customization { - path = kubejs/assets/mainmenu/logo-512x512.png + path = kubejs/assets/kubejs/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 496f4ce69..a7aa0d236 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/mainmenu/button98x20_hovered.png - backgroundnormal = kubejs/assets/mainmenu/button98x20.png + backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png } customization { @@ -65,7 +65,7 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundnormal = kubejs/assets/mainmenu/mdr_logo.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/mdr_logo.png } customization { @@ -81,8 +81,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/mainmenu/button98x20_hovered.png - backgroundnormal = kubejs/assets/mainmenu/button98x20.png + backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png } customization { @@ -98,8 +98,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/mainmenu/button98x20_hovered.png - backgroundnormal = kubejs/assets/mainmenu/button98x20.png + backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png } customization { @@ -128,8 +128,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/mainmenu/button_hovered.png - backgroundnormal = kubejs/assets/mainmenu/button.png + backgroundhovered = kubejs/assets/kubejs/textures/gui/button_hovered.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/button.png } customization { @@ -145,8 +145,8 @@ customization { loopbackgroundanimations = true restartbackgroundanimations = true action = setbuttontexture - backgroundhovered = kubejs/assets/mainmenu/button98x20_hovered.png - backgroundnormal = kubejs/assets/mainmenu/button98x20.png + backgroundhovered = kubejs/assets/kubejs/textures/gui/button98x20_hovered.png + backgroundnormal = kubejs/assets/kubejs/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/mainmenu/button98x20_hovered.png + backgroundhovered = kubejs/assets/kubejs/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/mainmenu/button98x20.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/button98x20.png height = 20 } customization { - path = kubejs/assets/mainmenu/logo-512x512.png + path = kubejs/assets/kubejs/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/mainmenu/curse_logo_hovered.png + backgroundhovered = kubejs/assets/kubejs/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/mainmenu/curse_logo.png + backgroundnormal = kubejs/assets/kubejs/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/mainmenu/ds_logo_hovered.png + backgroundhovered = kubejs/assets/kubejs/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/mainmenu/ds_logo.png + backgroundnormal = kubejs/assets/kubejs/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/mainmenu/git_logo_hovered.png + backgroundhovered = kubejs/assets/kubejs/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/mainmenu/git_logo.png + backgroundnormal = kubejs/assets/kubejs/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/mainmenu/mdr_logo_hovered.png + backgroundhovered = kubejs/assets/kubejs/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/mainmenu/mdr_logo.png + backgroundnormal = kubejs/assets/kubejs/textures/gui/mdr_logo.png height = 20 } diff --git a/config/ftbquests/quests/chapters/gtceu.snbt b/config/ftbquests/quests/chapters/gtceu.snbt index b3b5990b4..f6d23130b 100644 --- a/config/ftbquests/quests/chapters/gtceu.snbt +++ b/config/ftbquests/quests/chapters/gtceu.snbt @@ -178,6 +178,12 @@ ] icon: { Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } id: "gtceu:steel_axe" tag: { Damage: 0 @@ -278,6 +284,12 @@ tasks: [{ icon: { Count: 1b + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } id: "gtceu:steel_hammer" tag: { Damage: 0 diff --git a/config/ftbquests/quests/data.snbt b/config/ftbquests/quests/data.snbt index 8cc8e0ee5..7ab068a7c 100644 --- a/config/ftbquests/quests/data.snbt +++ b/config/ftbquests/quests/data.snbt @@ -9,7 +9,7 @@ drop_loot_crates: false emergency_items_cooldown: 300 grid_scale: 0.5d - icon: "kubejs:greg_icon" + icon: "kubejs:logo-512x512.png" lock_message: "e" loot_crate_no_drop: { boss: 0 @@ -18,6 +18,6 @@ } pause_game: false progression_mode: "linear" - title: "GregTech Community Pack" + title: "TerraFirmaGreg" version: 13 } diff --git a/kubejs/assets/mainmenu/button.png b/kubejs/assets/kubejs/textures/gui/button.png similarity index 100% rename from kubejs/assets/mainmenu/button.png rename to kubejs/assets/kubejs/textures/gui/button.png diff --git a/kubejs/assets/mainmenu/button98x20.png b/kubejs/assets/kubejs/textures/gui/button98x20.png similarity index 100% rename from kubejs/assets/mainmenu/button98x20.png rename to kubejs/assets/kubejs/textures/gui/button98x20.png diff --git a/kubejs/assets/mainmenu/button98x20_hovered.png b/kubejs/assets/kubejs/textures/gui/button98x20_hovered.png similarity index 100% rename from kubejs/assets/mainmenu/button98x20_hovered.png rename to kubejs/assets/kubejs/textures/gui/button98x20_hovered.png diff --git a/kubejs/assets/mainmenu/button_hovered.png b/kubejs/assets/kubejs/textures/gui/button_hovered.png similarity index 100% rename from kubejs/assets/mainmenu/button_hovered.png rename to kubejs/assets/kubejs/textures/gui/button_hovered.png diff --git a/kubejs/assets/mainmenu/curse_logo.png b/kubejs/assets/kubejs/textures/gui/curse_logo.png similarity index 100% rename from kubejs/assets/mainmenu/curse_logo.png rename to kubejs/assets/kubejs/textures/gui/curse_logo.png diff --git a/kubejs/assets/mainmenu/curse_logo_hovered.png b/kubejs/assets/kubejs/textures/gui/curse_logo_hovered.png similarity index 100% rename from kubejs/assets/mainmenu/curse_logo_hovered.png rename to kubejs/assets/kubejs/textures/gui/curse_logo_hovered.png diff --git a/kubejs/assets/mainmenu/ds_logo.png b/kubejs/assets/kubejs/textures/gui/ds_logo.png similarity index 100% rename from kubejs/assets/mainmenu/ds_logo.png rename to kubejs/assets/kubejs/textures/gui/ds_logo.png diff --git a/kubejs/assets/mainmenu/ds_logo_hovered.png b/kubejs/assets/kubejs/textures/gui/ds_logo_hovered.png similarity index 100% rename from kubejs/assets/mainmenu/ds_logo_hovered.png rename to kubejs/assets/kubejs/textures/gui/ds_logo_hovered.png diff --git a/kubejs/assets/mainmenu/git_logo.png b/kubejs/assets/kubejs/textures/gui/git_logo.png similarity index 100% rename from kubejs/assets/mainmenu/git_logo.png rename to kubejs/assets/kubejs/textures/gui/git_logo.png diff --git a/kubejs/assets/mainmenu/git_logo_hovered.png b/kubejs/assets/kubejs/textures/gui/git_logo_hovered.png similarity index 100% rename from kubejs/assets/mainmenu/git_logo_hovered.png rename to kubejs/assets/kubejs/textures/gui/git_logo_hovered.png diff --git a/kubejs/assets/mainmenu/logo-512x512.png b/kubejs/assets/kubejs/textures/gui/logo-512x512.png similarity index 100% rename from kubejs/assets/mainmenu/logo-512x512.png rename to kubejs/assets/kubejs/textures/gui/logo-512x512.png diff --git a/kubejs/assets/mainmenu/mdr_logo.png b/kubejs/assets/kubejs/textures/gui/mdr_logo.png similarity index 100% rename from kubejs/assets/mainmenu/mdr_logo.png rename to kubejs/assets/kubejs/textures/gui/mdr_logo.png diff --git a/kubejs/assets/mainmenu/mdr_logo_hovered.png b/kubejs/assets/kubejs/textures/gui/mdr_logo_hovered.png similarity index 100% rename from kubejs/assets/mainmenu/mdr_logo_hovered.png rename to kubejs/assets/kubejs/textures/gui/mdr_logo_hovered.png diff --git a/kubejs/config/client.properties b/kubejs/config/client.properties index 1660197d0..f98e853fe 100644 --- a/kubejs/config/client.properties +++ b/kubejs/config/client.properties @@ -1,15 +1,16 @@ #KubeJS Client Properties -#Fri Sep 15 19:52:14 NOVT 2023 +#Sun Nov 19 21:03:06 NOVT 2023 backgroundColor=2E3440 barBorderColor=ECEFF4 -exportAtlases=false -menuBackgroundBrightness=64 -disableRecipeBook=true -title= barColor=ECEFF4 -overrideColors=false +blurScaledPackIcon=true +disableRecipeBook=true +exportAtlases=false fmlLogColor=ECEFF4 -showTagNames=false fmlMemoryColor=ECEFF4 +menuBackgroundBrightness=64 menuBackgroundScale=32.0 menuInnerBackgroundBrightness=32 +overrideColors=false +showTagNames=false +title=