dis comm

2024-09-15 16:36:03 +02:00
parent 8c994ba145
commit ac17346063
10 changed files with 137 additions and 121 deletions
--- a/web/pack/config/fancymenu/assets/packicon-16.png
+++ b/web/pack/config/fancymenu/assets/packicon-16.png
--- a/web/pack/config/fancymenu/assets/packicon-32.icns
+++ b/web/pack/config/fancymenu/assets/packicon-32.icns
--- a/web/pack/config/fancymenu/assets/packicon-32.png
+++ b/web/pack/config/fancymenu/assets/packicon-32.png
--- a/web/pack/config/fancymenu/assets/packicon-64.png
+++ b/web/pack/config/fancymenu/assets/packicon-64.png
--- a/web/pack/config/fancymenu/customization/title_screen_layout.txt
+++ b/web/pack/config/fancymenu/customization/title_screen_layout.txt
@@ -3,13 +3,13 @@ type = fancymenu_layout
 layout-meta {
  identifier = title_screen
  render_custom_elements_behind_vanilla = false
-  last_edited_time = 1726409184796
+  last_edited_time = 1726409629274
  is_enabled = true
  randommode = false
  randomgroup = 1
  randomonlyfirsttime = false
  layout_index = 0
-  [loading_requirement_container_meta:96d6102f-b64a-4df9-8171-80084f2e9cdf-1726409109259] = [groups:][instances:]
+  [loading_requirement_container_meta:d49e0bd7-a90a-4397-b970-3c6718cc0934-1726409608895] = [groups:][instances:]
 }

 menu_background {
@@ -58,11 +58,11 @@ element {
 }

 element {
-  audio_instance_0 = [source:location]https://patatapack.oier.ovh/sounds/The%20Drums%20of%20Liberation%20(from%20One%20Piece).ogg
+  audio_instance_0 = [source:web]https://patatapack.oier.ovh/sounds/The%20Drums%20of%20Liberation%20(from%20One%20Piece).ogg
  play_mode = normal
  looping = true
  volume = 1.0
-  sound_source = master
+  sound_source = record
  element_type = audio_v2
  instance_identifier = 9a90af32-4960-47ff-b287-ccda097508a5-1726409013524
  appearance_delay = no_delay
@@ -103,8 +103,8 @@ element {
 }

 vanilla_button {
-  button_element_executable_block_identifier = e9b33166-1fd2-4c73-beb4-d29ae45a6315-1726407236571
-  [executable_block:e9b33166-1fd2-4c73-beb4-d29ae45a6315-1726407236571][type:generic] = [executables:]
+  button_element_executable_block_identifier = b4a620d8-cbca-4503-a9a2-886f7d620653-1726407236570
+  [executable_block:b4a620d8-cbca-4503-a9a2-886f7d620653-1726407236570][type:generic] = [executables:]
  restartbackgroundanimations = true
  loopbackgroundanimations = true
  nine_slice_custom_background = false
@@ -112,22 +112,54 @@ vanilla_button {
  nine_slice_border_y = 5
  navigatable = true
  element_type = vanilla_button
-  instance_identifier = 376346
+  instance_identifier = mc_titlescreen_copyright_button
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
  fade_in = false
  fade_in_speed = 1.0
  anchor_point = vanilla
-  x = 196
+  x = 442
+  y = 350
+  width = 196
+  height = 10
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = 5c15e45e-e2e2-4a37-a883-992889fd5a4f-1726407236570
+  [loading_requirement_container_meta:5c15e45e-e2e2-4a37-a883-992889fd5a4f-1726407236570] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
+vanilla_button {
+  button_element_executable_block_identifier = bf59bfc1-fb69-424b-8ba3-b35e69560756-1726407236570
+  [executable_block:bf59bfc1-fb69-424b-8ba3-b35e69560756-1726407236570][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_realms_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in = false
+  fade_in_speed = 1.0
+  anchor_point = vanilla
+  x = 322
  y = 186
-  width = 20
+  width = 98
  height = 20
  stretch_x = false
  stretch_y = false
  stay_on_screen = true
-  element_loading_requirement_container_identifier = fb287a4a-0022-477d-a001-4e38cfbc6afe-1726407236571
-  [loading_requirement_container_meta:fb287a4a-0022-477d-a001-4e38cfbc6afe-1726407236571] = [groups:][instances:]
-  is_hidden = false
+  element_loading_requirement_container_identifier = 21234608-0b6d-4d79-a7d9-af3cbb5e89bd-1726407236570
+  [loading_requirement_container_meta:21234608-0b6d-4d79-a7d9-af3cbb5e89bd-1726407236570] = [groups:][instances:]
+  is_hidden = true
  automated_button_clicks = 0
  nine_slice_slider_handle = false
  nine_slice_slider_handle_border_x = 5
@@ -167,8 +199,8 @@ vanilla_button {
 }

 vanilla_button {
-  button_element_executable_block_identifier = a12b2221-78d8-4836-bb55-2b9d0e710b46-1726407236571
-  [executable_block:a12b2221-78d8-4836-bb55-2b9d0e710b46-1726407236571][type:generic] = [executables:]
+  button_element_executable_block_identifier = 54b0e311-8bce-4e4a-aec1-9250afbc51d7-1726407236570
+  [executable_block:54b0e311-8bce-4e4a-aec1-9250afbc51d7-1726407236570][type:generic] = [executables:]
  restartbackgroundanimations = true
  loopbackgroundanimations = true
  nine_slice_custom_background = false
@@ -176,22 +208,22 @@ vanilla_button {
  nine_slice_border_y = 5
  navigatable = true
  element_type = vanilla_button
-  instance_identifier = 376298
+  instance_identifier = mc_titlescreen_singleplayer_button
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
  fade_in = false
  fade_in_speed = 1.0
  anchor_point = vanilla
-  x = 196
+  x = 220
  y = 138
-  width = 20
+  width = 200
  height = 20
  stretch_x = false
  stretch_y = false
  stay_on_screen = true
-  element_loading_requirement_container_identifier = f62eeaa4-2a40-479e-a748-926422b8d6fc-1726407236571
-  [loading_requirement_container_meta:f62eeaa4-2a40-479e-a748-926422b8d6fc-1726407236571] = [groups:][instances:]
-  is_hidden = true
+  element_loading_requirement_container_identifier = b6516037-aa85-4134-9094-9a3feb1a1cd3-1726407236570
+  [loading_requirement_container_meta:b6516037-aa85-4134-9094-9a3feb1a1cd3-1726407236570] = [groups:][instances:]
+  is_hidden = false
  automated_button_clicks = 0
  nine_slice_slider_handle = false
  nine_slice_slider_handle_border_x = 5
@@ -199,8 +231,8 @@ vanilla_button {
 }

 vanilla_button {
-  button_element_executable_block_identifier = b4a620d8-cbca-4503-a9a2-886f7d620653-1726407236570
-  [executable_block:b4a620d8-cbca-4503-a9a2-886f7d620653-1726407236570][type:generic] = [executables:]
+  button_element_executable_block_identifier = d6db1026-3565-4867-be30-ae5440a01e5b-1726407236571
+  [executable_block:d6db1026-3565-4867-be30-ae5440a01e5b-1726407236571][type:generic] = [executables:]
  restartbackgroundanimations = true
  loopbackgroundanimations = true
  nine_slice_custom_background = false
@@ -208,21 +240,21 @@ vanilla_button {
  nine_slice_border_y = 5
  navigatable = true
  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_copyright_button
+  instance_identifier = 376322
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
  fade_in = false
  fade_in_speed = 1.0
  anchor_point = vanilla
-  x = 442
-  y = 350
-  width = 196
-  height = 10
+  x = 196
+  y = 162
+  width = 20
+  height = 20
  stretch_x = false
  stretch_y = false
  stay_on_screen = true
-  element_loading_requirement_container_identifier = 5c15e45e-e2e2-4a37-a883-992889fd5a4f-1726407236570
-  [loading_requirement_container_meta:5c15e45e-e2e2-4a37-a883-992889fd5a4f-1726407236570] = [groups:][instances:]
+  element_loading_requirement_container_identifier = c5f2fc8e-d079-4664-9708-d48f344f7aff-1726407236571
+  [loading_requirement_container_meta:c5f2fc8e-d079-4664-9708-d48f344f7aff-1726407236571] = [groups:][instances:]
  is_hidden = false
  automated_button_clicks = 0
  nine_slice_slider_handle = false
@@ -264,8 +296,8 @@ vanilla_button {
 }

 vanilla_button {
-  button_element_executable_block_identifier = bf59bfc1-fb69-424b-8ba3-b35e69560756-1726407236570
-  [executable_block:bf59bfc1-fb69-424b-8ba3-b35e69560756-1726407236570][type:generic] = [executables:]
+  button_element_executable_block_identifier = a12b2221-78d8-4836-bb55-2b9d0e710b46-1726407236571
+  [executable_block:a12b2221-78d8-4836-bb55-2b9d0e710b46-1726407236571][type:generic] = [executables:]
  restartbackgroundanimations = true
  loopbackgroundanimations = true
  nine_slice_custom_background = false
@@ -273,21 +305,21 @@ vanilla_button {
  nine_slice_border_y = 5
  navigatable = true
  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_realms_button
+  instance_identifier = 376298
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
  fade_in = false
  fade_in_speed = 1.0
  anchor_point = vanilla
-  x = 322
-  y = 186
-  width = 98
+  x = 196
+  y = 138
+  width = 20
  height = 20
  stretch_x = false
  stretch_y = false
  stay_on_screen = true
-  element_loading_requirement_container_identifier = 21234608-0b6d-4d79-a7d9-af3cbb5e89bd-1726407236570
-  [loading_requirement_container_meta:21234608-0b6d-4d79-a7d9-af3cbb5e89bd-1726407236570] = [groups:][instances:]
+  element_loading_requirement_container_identifier = f62eeaa4-2a40-479e-a748-926422b8d6fc-1726407236571
+  [loading_requirement_container_meta:f62eeaa4-2a40-479e-a748-926422b8d6fc-1726407236571] = [groups:][instances:]
  is_hidden = true
  automated_button_clicks = 0
  nine_slice_slider_handle = false
@@ -327,6 +359,39 @@ vanilla_button {
  nine_slice_slider_handle_border_y = 5
 }

+vanilla_button {
+  button_element_executable_block_identifier = e8c5ecea-f0e2-476e-aa0b-ce4a2e76d985-1726407236570
+  [executable_block:e8c5ecea-f0e2-476e-aa0b-ce4a2e76d985-1726407236570][type:generic] = [executables:]
+  restartbackgroundanimations = true
+  loopbackgroundanimations = true
+  nine_slice_custom_background = false
+  nine_slice_border_x = 5
+  nine_slice_border_y = 5
+  navigatable = true
+  element_type = vanilla_button
+  instance_identifier = mc_titlescreen_options_button
+  appearance_delay = no_delay
+  appearance_delay_seconds = 1.0
+  fade_in = false
+  fade_in_speed = 1.0
+  anchor_point = element
+  anchor_point_element = forge_titlescreen_mods_button
+  x = 101
+  y = 0
+  width = 98
+  height = 20
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = ccfa90dc-216f-40db-9c13-021cb159d1c3-1726407236570
+  [loading_requirement_container_meta:ccfa90dc-216f-40db-9c13-021cb159d1c3-1726407236570] = [groups:][instances:]
+  is_hidden = false
+  automated_button_clicks = 0
+  nine_slice_slider_handle = false
+  nine_slice_slider_handle_border_x = 5
+  nine_slice_slider_handle_border_y = 5
+}
+
 vanilla_button {
  button_element_executable_block_identifier = f4a410be-e2cf-4cce-a193-3e884f972bf6-1726407236570
  [executable_block:f4a410be-e2cf-4cce-a193-3e884f972bf6-1726407236570][type:generic] = [executables:]
@@ -361,8 +426,8 @@ vanilla_button {
 }

 vanilla_button {
-  button_element_executable_block_identifier = d6db1026-3565-4867-be30-ae5440a01e5b-1726407236571
-  [executable_block:d6db1026-3565-4867-be30-ae5440a01e5b-1726407236571][type:generic] = [executables:]
+  button_element_executable_block_identifier = e9b33166-1fd2-4c73-beb4-d29ae45a6315-1726407236571
+  [executable_block:e9b33166-1fd2-4c73-beb4-d29ae45a6315-1726407236571][type:generic] = [executables:]
  restartbackgroundanimations = true
  loopbackgroundanimations = true
  nine_slice_custom_background = false
@@ -370,53 +435,21 @@ vanilla_button {
  nine_slice_border_y = 5
  navigatable = true
  element_type = vanilla_button
-  instance_identifier = 376322
+  instance_identifier = 376346
  appearance_delay = no_delay
  appearance_delay_seconds = 1.0
  fade_in = false
  fade_in_speed = 1.0
  anchor_point = vanilla
  x = 196
-  y = 162
+  y = 186
  width = 20
  height = 20
  stretch_x = false
  stretch_y = false
  stay_on_screen = true
-  element_loading_requirement_container_identifier = c5f2fc8e-d079-4664-9708-d48f344f7aff-1726407236571
-  [loading_requirement_container_meta:c5f2fc8e-d079-4664-9708-d48f344f7aff-1726407236571] = [groups:][instances:]
-  is_hidden = false
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
-vanilla_button {
-  button_element_executable_block_identifier = 54b0e311-8bce-4e4a-aec1-9250afbc51d7-1726407236570
-  [executable_block:54b0e311-8bce-4e4a-aec1-9250afbc51d7-1726407236570][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_singleplayer_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = vanilla
-  x = 220
-  y = 138
-  width = 200
-  height = 20
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = true
-  element_loading_requirement_container_identifier = b6516037-aa85-4134-9094-9a3feb1a1cd3-1726407236570
-  [loading_requirement_container_meta:b6516037-aa85-4134-9094-9a3feb1a1cd3-1726407236570] = [groups:][instances:]
+  element_loading_requirement_container_identifier = fb287a4a-0022-477d-a001-4e38cfbc6afe-1726407236571
+  [loading_requirement_container_meta:fb287a4a-0022-477d-a001-4e38cfbc6afe-1726407236571] = [groups:][instances:]
  is_hidden = false
  automated_button_clicks = 0
  nine_slice_slider_handle = false
@@ -456,39 +489,6 @@ vanilla_button {
  nine_slice_slider_handle_border_y = 5
 }

-vanilla_button {
-  button_element_executable_block_identifier = e8c5ecea-f0e2-476e-aa0b-ce4a2e76d985-1726407236570
-  [executable_block:e8c5ecea-f0e2-476e-aa0b-ce4a2e76d985-1726407236570][type:generic] = [executables:]
-  restartbackgroundanimations = true
-  loopbackgroundanimations = true
-  nine_slice_custom_background = false
-  nine_slice_border_x = 5
-  nine_slice_border_y = 5
-  navigatable = true
-  element_type = vanilla_button
-  instance_identifier = mc_titlescreen_options_button
-  appearance_delay = no_delay
-  appearance_delay_seconds = 1.0
-  fade_in = false
-  fade_in_speed = 1.0
-  anchor_point = element
-  anchor_point_element = forge_titlescreen_mods_button
-  x = 101
-  y = 0
-  width = 98
-  height = 20
-  stretch_x = false
-  stretch_y = false
-  stay_on_screen = true
-  element_loading_requirement_container_identifier = ccfa90dc-216f-40db-9c13-021cb159d1c3-1726407236570
-  [loading_requirement_container_meta:ccfa90dc-216f-40db-9c13-021cb159d1c3-1726407236570] = [groups:][instances:]
-  is_hidden = false
-  automated_button_clicks = 0
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
-}
-
 deep_element {
  element_type = title_screen_logo
  instance_identifier = deep:title_screen_logo
--- a/web/pack/config/fancymenu/options.txt
+++ b/web/pack/config/fancymenu/options.txt
@@ -24,11 +24,11 @@ B:game_intro_fade_out = 'true';

 ##[window]

-B:show_custom_window_icon = 'false';
-S:custom_window_icon_macos = '';
+B:show_custom_window_icon = 'true';
+S:custom_window_icon_macos = '/config/fancymenu/assets/packicon-32.icns';
 S:custom_window_icon_32 = '/config/fancymenu/assets/packicon.png';
 S:custom_window_title = 'PatataLand';
-S:custom_window_icon_16 = '';
+S:custom_window_icon_16 = '/config/fancymenu/assets/packicon-16.png';


 ##[multiplayer_screen]
--- a/web/pack/index.toml
+++ b/web/pack/index.toml
@@ -36,6 +36,22 @@ hash = "ecf31357c32e2fee331b941424e2d7bcf07d56447825f89b948905e7162cb7a6"
 file = "config/fancymenu/assets/logo.png"
 hash = "8ef41ecb216c8ff70894b9eb1564b286aa2653764474193ca5f2fafe1b6d432d"

+[[files]]
+file = "config/fancymenu/assets/packicon-16.png"
+hash = "0f302205017673409cc645a13875d397bb16056c49ab8c812237b47633062a5f"
+
+[[files]]
+file = "config/fancymenu/assets/packicon-32.icns"
+hash = "e29cbeb856e82abfce01c69c4c6a568ab723a469bf49f87997190a6d966f2b5a"
+
+[[files]]
+file = "config/fancymenu/assets/packicon-32.png"
+hash = "0897a0180ef197d2002e8e7e37ddf12de1883f9b2a9b186918bac0d21572e21f"
+
+[[files]]
+file = "config/fancymenu/assets/packicon-64.png"
+hash = "a92b807bbe7dd410e2245902459e54a3c6880e6a21f8a7bd2db0c57c6afe7166"
+
 [[files]]
 file = "config/fancymenu/assets/packicon.png"
 hash = "0897a0180ef197d2002e8e7e37ddf12de1883f9b2a9b186918bac0d21572e21f"
@@ -50,7 +66,7 @@ hash = "9f0ada5a7f0193d2d717d1c1736f545f5235c2597213731493b97488617ebbf2"

 [[files]]
 file = "config/fancymenu/customization/title_screen_layout.txt"
-hash = "8d046e92d2437964d3a13056592e35ea5e6fb24c46c7b1734188d21d2790ac41"
+hash = "d968478c8d8b4ce8d59a23ad02a3c08500667b240fafcd11c2845963eddb1c7e"

 [[files]]
 file = "config/fancymenu/layout_editor/widgets/element_layer_control.lewidget"
@@ -62,7 +78,7 @@ hash = "9a25d3dc708e43eabafce5479a13c02dae15bc7f673afb2745b8b2ba48a97dc0"

 [[files]]
 file = "config/fancymenu/options.txt"
-hash = "5a15461e69263b597738b86e5acfd2f7d4525a984ca3615e56ffff8b1f2f3931"
+hash = "8e8b4c5ff975b6e94dd7faae43e310c2c564ba4ff75ae2371e95b5b95eb14b72"

 [[files]]
 file = "config/fancymenu/ui_themes/dark.json"
@@ -202,7 +218,7 @@ hash = "0897a0180ef197d2002e8e7e37ddf12de1883f9b2a9b186918bac0d21572e21f"

 [[files]]
 file = "kubejs/server_scripts/commands.js"
-hash = "7c8668a51ab13c5f7849cbc273089f82a9fcaa9edbc5acb8e7d3d2a1ba430cfe"
+hash = "7fbe276e2bf8949610aa34efe1540a1e969da9ae4ab15f6c885b698d1e91823b"

 [[files]]
 file = "kubejs/server_scripts/create.js"
@@ -218,7 +234,7 @@ hash = "da639e7a170a53d814daa3a14f55b0ac6d2fc153790cd2544cce94f3af46ec6d"

 [[files]]
 file = "kubejs/server_scripts/player.js"
-hash = "5681e0e6281965f55791afa2b7a211e9cb98c82680418a58d2d2c33c3f0d7932"
+hash = "842c66203e25d23855fb223a9ae8144c1973ecfd1e6b61a6ec59c19a4ddf06b0"

 [[files]]
 file = "kubejs/server_scripts/recipes.js"
--- a/web/pack/kubejs/server_scripts/commands.js
+++ b/web/pack/kubejs/server_scripts/commands.js
@@ -1,6 +1,6 @@
 ServerEvents.customCommand('patata', event => {
    event.player.give(Item.of('kubejs:golden_potato', 64))
  })
-  ServerEvents.customCommand('paint', event => {
-    event.player.give(Item.of('kubejs:golden_potato', 64))
-  })
+ // ServerEvents.customCommand('paint', event => {
+ //   event.player.give(Item.of('kubejs:golden_potato', 64))
+ // })
--- a/web/pack/kubejs/server_scripts/player.js
+++ b/web/pack/kubejs/server_scripts/player.js
@@ -1,4 +1,4 @@
-PlayerEvents.loggedIn((event) => {
+/*PlayerEvents.loggedIn((event) => {
  event.player.paint({
    last_message: {
      type: "text",
@@ -11,4 +11,4 @@ PlayerEvents.loggedIn((event) => {
      draw: "always",
    },
  });
-});
+});*/
--- a/web/pack/pack.toml
+++ b/web/pack/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "1fac0d029cae07dc7654bd005e63395ef8c1d56452c759e2e4f4ce604c8c1bc3"
+hash = "d84f4fc0a03eecf5c15147f4a9d582e134a5c0f6149200a972c5a8ec6ec9541a"

 [versions]
 forge = "47.3.7"