From ab7049354745da07801ed460df98918de7cd9d59 Mon Sep 17 00:00:00 2001 From: Luke100000 Date: Sat, 27 May 2023 13:35:20 +0200 Subject: [PATCH 1/5] Revert "beta time!" This reverts commit b415996d6434a681fc77c2d89092208fa8dbaedb. --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9f88725700..c3f90d46fd 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -47,7 +47,7 @@ jobs: name: "[Universal ${{steps.split.outputs._1}}] MCA Reborn - ${{steps.split.outputs._0}}" changelog-file: changelog.md - version-type: beta + version-type: release files: build/libs/*-@(universal).jar loaders: | fabric From ddc2245b96a05ecc73fec4576a79552181624ec2 Mon Sep 17 00:00:00 2001 From: Luke100000 Date: Sun, 28 May 2023 23:17:53 +0200 Subject: [PATCH 2/5] New Crowdin updates (#665) * New translations en_us.json (Portuguese, Brazilian) * New translations en_us.json (French) * New translations en_us.json (Turkish) * New translations en_us.json (Ukrainian) * New translations en_us.json (Spanish, Mexico) * New translations en_us.json (Romanian) * New translations en_us.json (Spanish) * New translations en_us.json (Afrikaans) * New translations en_us.json (Belarusian) * New translations en_us.json (Czech) * New translations en_us.json (German) * New translations en_us.json (Greek) * New translations en_us.json (Finnish) * New translations en_us.json (Hungarian) * New translations en_us.json (Italian) * New translations en_us.json (Japanese) * New translations en_us.json (Korean) * New translations en_us.json (Polish) * New translations en_us.json (Portuguese) * New translations en_us.json (Russian) * New translations en_us.json (Serbian (Cyrillic)) * New translations en_us.json (Swedish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Chinese Traditional) * New translations en_us.json (Indonesian) * New translations en_us.json (Persian) * New translations en_us.json (Spanish, Chile) * New translations en_us.json (Thai) * New translations en_us.json (Maltese) * New translations en_us.json (Pirate English) * New translations en_us.json (Chinese Traditional, Hong Kong) * New translations en_us.json (Arabic, Saudi Arabia) * New translations en_us.json (Andalusian) * New translations en_us.json (Portuguese, Brazilian) --- common/src/main/resources/assets/mca/lang/af_za.json | 6 ++++++ common/src/main/resources/assets/mca/lang/ar_sa.json | 6 ++++++ common/src/main/resources/assets/mca/lang/be_by.json | 6 ++++++ common/src/main/resources/assets/mca/lang/cs_cz.json | 6 ++++++ common/src/main/resources/assets/mca/lang/de_de.json | 6 ++++++ common/src/main/resources/assets/mca/lang/el_gr.json | 6 ++++++ common/src/main/resources/assets/mca/lang/en_pt.json | 6 ++++++ common/src/main/resources/assets/mca/lang/es_cl.json | 6 ++++++ common/src/main/resources/assets/mca/lang/es_es.json | 6 ++++++ common/src/main/resources/assets/mca/lang/es_mx.json | 6 ++++++ common/src/main/resources/assets/mca/lang/esan.json | 6 ++++++ common/src/main/resources/assets/mca/lang/fa_ir.json | 6 ++++++ common/src/main/resources/assets/mca/lang/fi_fi.json | 6 ++++++ common/src/main/resources/assets/mca/lang/fr_fr.json | 6 ++++++ common/src/main/resources/assets/mca/lang/hu_hu.json | 6 ++++++ common/src/main/resources/assets/mca/lang/id_id.json | 6 ++++++ common/src/main/resources/assets/mca/lang/it_it.json | 6 ++++++ common/src/main/resources/assets/mca/lang/ja_jp.json | 6 ++++++ common/src/main/resources/assets/mca/lang/ko_kr.json | 6 ++++++ common/src/main/resources/assets/mca/lang/mt_mt.json | 6 ++++++ common/src/main/resources/assets/mca/lang/pl_pl.json | 6 ++++++ common/src/main/resources/assets/mca/lang/pt_br.json | 8 +++++++- common/src/main/resources/assets/mca/lang/pt_pt.json | 6 ++++++ common/src/main/resources/assets/mca/lang/ro_ro.json | 6 ++++++ common/src/main/resources/assets/mca/lang/ru_ru.json | 6 ++++++ common/src/main/resources/assets/mca/lang/sr_sp.json | 6 ++++++ common/src/main/resources/assets/mca/lang/sv_se.json | 6 ++++++ common/src/main/resources/assets/mca/lang/th_th.json | 6 ++++++ common/src/main/resources/assets/mca/lang/tr_tr.json | 6 ++++++ common/src/main/resources/assets/mca/lang/uk_ua.json | 6 ++++++ common/src/main/resources/assets/mca/lang/zh_cn.json | 6 ++++++ common/src/main/resources/assets/mca/lang/zh_hk.json | 6 ++++++ common/src/main/resources/assets/mca/lang/zh_tw.json | 6 ++++++ 33 files changed, 199 insertions(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/mca/lang/af_za.json b/common/src/main/resources/assets/mca/lang/af_za.json index c3b1324d64..a8cb137231 100644 --- a/common/src/main/resources/assets/mca/lang/af_za.json +++ b/common/src/main/resources/assets/mca/lang/af_za.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/ar_sa.json b/common/src/main/resources/assets/mca/lang/ar_sa.json index 5b050a5a40..4e36022629 100644 --- a/common/src/main/resources/assets/mca/lang/ar_sa.json +++ b/common/src/main/resources/assets/mca/lang/ar_sa.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/be_by.json b/common/src/main/resources/assets/mca/lang/be_by.json index 5b47a93b34..c03c088d48 100644 --- a/common/src/main/resources/assets/mca/lang/be_by.json +++ b/common/src/main/resources/assets/mca/lang/be_by.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/cs_cz.json b/common/src/main/resources/assets/mca/lang/cs_cz.json index fa9fccefc7..a7720d3f8e 100644 --- a/common/src/main/resources/assets/mca/lang/cs_cz.json +++ b/common/src/main/resources/assets/mca/lang/cs_cz.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/de_de.json b/common/src/main/resources/assets/mca/lang/de_de.json index 52dcaa59f6..3c162773ca 100644 --- a/common/src/main/resources/assets/mca/lang/de_de.json +++ b/common/src/main/resources/assets/mca/lang/de_de.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Lege ein Bild hier ab, gib einen Dateipfad oder eine URL ein, um zu beginnen.", "gui.skin_library.locked": "Um Skins zu veröffentlichen, logge dich bitte zuerst ein.", "gui.skin_library.like_locked": "Bitte melde dich an, um gelikete oder eingereichte Inhalte zu sehen.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Hochladen im Gange, sei geduldig.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Server weit verwenden!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Bearbeiten", "gui.skin_library.delete": "Löschen", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Schwellenwert befüllen", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/el_gr.json b/common/src/main/resources/assets/mca/lang/el_gr.json index 1d4a689754..7e4999a2f4 100644 --- a/common/src/main/resources/assets/mca/lang/el_gr.json +++ b/common/src/main/resources/assets/mca/lang/el_gr.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/en_pt.json b/common/src/main/resources/assets/mca/lang/en_pt.json index 82b047177a..a960db55f3 100644 --- a/common/src/main/resources/assets/mca/lang/en_pt.json +++ b/common/src/main/resources/assets/mca/lang/en_pt.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/es_cl.json b/common/src/main/resources/assets/mca/lang/es_cl.json index 4d584cd660..8922b13562 100644 --- a/common/src/main/resources/assets/mca/lang/es_cl.json +++ b/common/src/main/resources/assets/mca/lang/es_cl.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/es_es.json b/common/src/main/resources/assets/mca/lang/es_es.json index 1fca1312f8..abb5a08d84 100644 --- a/common/src/main/resources/assets/mca/lang/es_es.json +++ b/common/src/main/resources/assets/mca/lang/es_es.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/es_mx.json b/common/src/main/resources/assets/mca/lang/es_mx.json index 3b42d62cdd..39d0d88bae 100644 --- a/common/src/main/resources/assets/mca/lang/es_mx.json +++ b/common/src/main/resources/assets/mca/lang/es_mx.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Arrastra una imagen aquí, introduce una ruta de archivo, URL o selecciona una captura de pantalla para comenzar.", "gui.skin_library.locked": "Para publicar skins, por favor inicie sesión primero.", "gui.skin_library.like_locked": "Inicia sesión para ver el contenido que te gusta o que has enviado.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Cargando, sea paciente.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "¡Utiliza todo el servidor!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Me Gusta", "gui.skin_library.edit": "Editar", "gui.skin_library.delete": "Eliminar", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Umbral de llenado", "gui.skin_library.fillToolThreshold.tooltip": "Pulsando F relleno se borran los píxeles similares y adyacentes hasta el umbral dado.", "gui.skin_library.tool_help": "Controles:\nRatón izquierdo para pintar\nRatón derecho para borrar\nRatón central para elegir color\nMantén pulsada la barra espaciadora o el ratón 3 para desplazarte\nRueda del ratón para hacer zoom\nF para borrar píxeles similares\nHaz clic para abrir la ayuda", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Frío", "gui.skin_library.temperature.1": "Frío", "gui.skin_library.temperature.2": "Moderado", diff --git a/common/src/main/resources/assets/mca/lang/esan.json b/common/src/main/resources/assets/mca/lang/esan.json index fffd2094f1..129fc11209 100644 --- a/common/src/main/resources/assets/mca/lang/esan.json +++ b/common/src/main/resources/assets/mca/lang/esan.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/fa_ir.json b/common/src/main/resources/assets/mca/lang/fa_ir.json index 842fe77828..4930f8997e 100644 --- a/common/src/main/resources/assets/mca/lang/fa_ir.json +++ b/common/src/main/resources/assets/mca/lang/fa_ir.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/fi_fi.json b/common/src/main/resources/assets/mca/lang/fi_fi.json index 92cc0bdbfa..481e346aca 100644 --- a/common/src/main/resources/assets/mca/lang/fi_fi.json +++ b/common/src/main/resources/assets/mca/lang/fi_fi.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/fr_fr.json b/common/src/main/resources/assets/mca/lang/fr_fr.json index ddcc1b8d8a..7e6d9058c0 100644 --- a/common/src/main/resources/assets/mca/lang/fr_fr.json +++ b/common/src/main/resources/assets/mca/lang/fr_fr.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Déposez une image ici, entrez un chemin de fichier ou une URL pour commencer.", "gui.skin_library.locked": "Pour publier des skins, veuillez d'abord vous connecter.", "gui.skin_library.like_locked": "Connectez-vous pour voir le contenu aimé ou publié.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Déjà en cours de téléchargement, soyez patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Utiliser le serveur dans son ensemble !", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Éditer", "gui.skin_library.delete": "Supprimer", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Seuil de remplissage", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Froid", "gui.skin_library.temperature.1": "Frais", "gui.skin_library.temperature.2": "Modéré", diff --git a/common/src/main/resources/assets/mca/lang/hu_hu.json b/common/src/main/resources/assets/mca/lang/hu_hu.json index ec76b53296..127f5a5982 100644 --- a/common/src/main/resources/assets/mca/lang/hu_hu.json +++ b/common/src/main/resources/assets/mca/lang/hu_hu.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/id_id.json b/common/src/main/resources/assets/mca/lang/id_id.json index fc2c76d1ce..51206fc5f5 100644 --- a/common/src/main/resources/assets/mca/lang/id_id.json +++ b/common/src/main/resources/assets/mca/lang/id_id.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/it_it.json b/common/src/main/resources/assets/mca/lang/it_it.json index c1630535fc..0d31e2b1e1 100644 --- a/common/src/main/resources/assets/mca/lang/it_it.json +++ b/common/src/main/resources/assets/mca/lang/it_it.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/ja_jp.json b/common/src/main/resources/assets/mca/lang/ja_jp.json index a1ccf9ca33..4261153716 100644 --- a/common/src/main/resources/assets/mca/lang/ja_jp.json +++ b/common/src/main/resources/assets/mca/lang/ja_jp.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/ko_kr.json b/common/src/main/resources/assets/mca/lang/ko_kr.json index d490c8e516..d30efa66d0 100644 --- a/common/src/main/resources/assets/mca/lang/ko_kr.json +++ b/common/src/main/resources/assets/mca/lang/ko_kr.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "이미 업로드 중이니 조금만 기다려주세요.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "좋아요", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "삭제", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "추움", "gui.skin_library.temperature.1": "쌀쌀함", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/mt_mt.json b/common/src/main/resources/assets/mca/lang/mt_mt.json index 013b0fdca9..3beb37abfe 100644 --- a/common/src/main/resources/assets/mca/lang/mt_mt.json +++ b/common/src/main/resources/assets/mca/lang/mt_mt.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/pl_pl.json b/common/src/main/resources/assets/mca/lang/pl_pl.json index c8c3015790..8f709f09a2 100644 --- a/common/src/main/resources/assets/mca/lang/pl_pl.json +++ b/common/src/main/resources/assets/mca/lang/pl_pl.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Upuść obraz tutaj, wprowadź ścieżkę do pliku lub adres URL, aby rozpocząć.", "gui.skin_library.locked": "Aby opublikować skórki, najpierw się zaloguj.", "gui.skin_library.like_locked": "Zaloguj się, aby zobaczyć polubione lub przesłane treści.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Już się przesyła, bądź cierpliwy.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Użyj całego serwera!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Polub", "gui.skin_library.edit": "Edytuj", "gui.skin_library.delete": "Usuń", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Próg wypełnienia", "gui.skin_library.fillToolThreshold.tooltip": "Naciśnięcie klawisza F powoduje usunięcie podobnych, sąsiadujących ze sobą pikseli do wysokości podanego progu.", "gui.skin_library.tool_help": "Sterowanie:\nLewa mysz, aby malować\nPrawa mysz, aby usunąć\nŚrodkowa mysz, aby wybrać kolor\nPrzytrzymaj spację lub mysz 3, aby obracać\nKółko myszy, aby powiększyć\nF, aby usunąć podobne piksele\nKliknij, aby otworzyć pomoc", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Zimno", "gui.skin_library.temperature.1": "Chłodno", "gui.skin_library.temperature.2": "Umiarkowanie", diff --git a/common/src/main/resources/assets/mca/lang/pt_br.json b/common/src/main/resources/assets/mca/lang/pt_br.json index f292c7e68b..4ec5cdad51 100644 --- a/common/src/main/resources/assets/mca/lang/pt_br.json +++ b/common/src/main/resources/assets/mca/lang/pt_br.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Arraste uma imagem até aqui, insira um caminho de arquivo ou um link de imagem para começar.", "gui.skin_library.locked": "Para publicar skins, por favor faça login primeiro.", "gui.skin_library.like_locked": "Por favor, faça login para ver conteúdo curtido ou enviado.", + "gui.skin_library.choose_name": "Nomeie seu acessório!", "gui.skin_library.already_uploading": "Está sendo enviado, tenha paciência.", + "gui.skin_library.upload_duplicate": "Esse conteúdo já existe.", + "gui.skin_library.upload_failed": "Envio falhou. Woops.", "gui.skin_library.subscribe": "Utilizar em todos os servidores!", + "gui.skin_library.sort_likes": "Ordenar Por Curtidas", + "gui.skin_library.sort_newest": "Ordenar Por Data", "gui.skin_library.like": "Curtir", "gui.skin_library.edit": "Editar", "gui.skin_library.delete": "Deletar", @@ -340,12 +345,13 @@ "gui.skin_library.meta.chance.tooltip": "Probabilidade de que este acessório seja usado pelos aldeões.", "gui.skin_library.meta.by": "Por %s", "gui.skin_library.meta.likes": "%s curtidas", - "gui.skin_library.prepare": "Que tipo de acessório você quer criar?", + "gui.skin_library.prepare": "Que tipo acessório você quer criar?\nClique em '?' ANTES de carregar sua skin!", "gui.skin_library.prepare.hair": "Criar penteado", "gui.skin_library.prepare.clothing": "Criar roupa", "gui.skin_library.fillToolThreshold": "Intensidade de preencher", "gui.skin_library.fillToolThreshold.tooltip": "Pressionar F preenche pixels similares e adjacentes, dependendo da intensidade definida", "gui.skin_library.tool_help": "Controles:\nClique esquerdo do mouse para pintar\nClique direito do mouse para deletar\nClique no botão do meio do mouse (scroll) para escolher a cor\nSegurar espaço ou botão do meio do mouse (scroll) para mover\nRodar botão do meio do mouse (scroll) para aplicar ou remover zoom\nF para limpar pixels semelhantes\nClique para abrir ajuda", + "gui.skin_library.help": "Clique para abrir a área de ajuda. As aparências do MCA precisam ser preparadas.", "gui.skin_library.temperature.0": "Frio", "gui.skin_library.temperature.1": "Fresco", "gui.skin_library.temperature.2": "Moderado", diff --git a/common/src/main/resources/assets/mca/lang/pt_pt.json b/common/src/main/resources/assets/mca/lang/pt_pt.json index 828c27e604..aeaa21ff79 100644 --- a/common/src/main/resources/assets/mca/lang/pt_pt.json +++ b/common/src/main/resources/assets/mca/lang/pt_pt.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/ro_ro.json b/common/src/main/resources/assets/mca/lang/ro_ro.json index 29f4e16764..472c111c2f 100644 --- a/common/src/main/resources/assets/mca/lang/ro_ro.json +++ b/common/src/main/resources/assets/mca/lang/ro_ro.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/ru_ru.json b/common/src/main/resources/assets/mca/lang/ru_ru.json index c5a3f3f987..dbfef3d6fd 100644 --- a/common/src/main/resources/assets/mca/lang/ru_ru.json +++ b/common/src/main/resources/assets/mca/lang/ru_ru.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Мне нравится", "gui.skin_library.edit": "Редактировать", "gui.skin_library.delete": "Удалить", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/sr_sp.json b/common/src/main/resources/assets/mca/lang/sr_sp.json index 39fc10d340..041ee782fd 100644 --- a/common/src/main/resources/assets/mca/lang/sr_sp.json +++ b/common/src/main/resources/assets/mca/lang/sr_sp.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/sv_se.json b/common/src/main/resources/assets/mca/lang/sv_se.json index 9ad43fe291..e96d5b832f 100644 --- a/common/src/main/resources/assets/mca/lang/sv_se.json +++ b/common/src/main/resources/assets/mca/lang/sv_se.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/th_th.json b/common/src/main/resources/assets/mca/lang/th_th.json index 42b8ea8502..8e9e63beea 100644 --- a/common/src/main/resources/assets/mca/lang/th_th.json +++ b/common/src/main/resources/assets/mca/lang/th_th.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/tr_tr.json b/common/src/main/resources/assets/mca/lang/tr_tr.json index de55ae906c..8484b01b8a 100644 --- a/common/src/main/resources/assets/mca/lang/tr_tr.json +++ b/common/src/main/resources/assets/mca/lang/tr_tr.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Buraya bir görüntü at, bir dosya konumu yada URL ile başlat.", "gui.skin_library.locked": "Kostüm paylaşmak için, lütfen oturum açın.", "gui.skin_library.like_locked": "Beğenilmiş yada gönderilmiş içerikleri görmek için lütfen oturum açın.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Zaten yükleniyor, sabırlı olun.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Sunucu çapında kullan", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Beğen", "gui.skin_library.edit": "Düzenle", "gui.skin_library.delete": "Sil", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Threshold'u Doldur", "gui.skin_library.fillToolThreshold.tooltip": "F Öğesine basmak, verilen eşiğe kadar benzer, bitişik pikselleri siler.", "gui.skin_library.tool_help": "Kontroller:\nSol fare tuşu ile boya\nSağ fare tuşu ile sil\nOrta fare ile rengi seç\nBoşluk yada Fare 3 ile pan\nFare tekerliği ile yakından bak\nF ile tanıdık pikselleri sil\nYardım için tıkla", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Soğuk", "gui.skin_library.temperature.1": "Rahat", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/uk_ua.json b/common/src/main/resources/assets/mca/lang/uk_ua.json index c96fa7e6ba..5184ea1ea2 100644 --- a/common/src/main/resources/assets/mca/lang/uk_ua.json +++ b/common/src/main/resources/assets/mca/lang/uk_ua.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/zh_cn.json b/common/src/main/resources/assets/mca/lang/zh_cn.json index 9576521090..2bab623634 100644 --- a/common/src/main/resources/assets/mca/lang/zh_cn.json +++ b/common/src/main/resources/assets/mca/lang/zh_cn.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/zh_hk.json b/common/src/main/resources/assets/mca/lang/zh_hk.json index 39fc10d340..041ee782fd 100644 --- a/common/src/main/resources/assets/mca/lang/zh_hk.json +++ b/common/src/main/resources/assets/mca/lang/zh_hk.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", diff --git a/common/src/main/resources/assets/mca/lang/zh_tw.json b/common/src/main/resources/assets/mca/lang/zh_tw.json index 8a2cad6904..23a60018ae 100644 --- a/common/src/main/resources/assets/mca/lang/zh_tw.json +++ b/common/src/main/resources/assets/mca/lang/zh_tw.json @@ -312,8 +312,13 @@ "gui.skin_library.drop": "Drop an image here, enter a file path or URL to start.", "gui.skin_library.locked": "To publish skins, please log in first.", "gui.skin_library.like_locked": "Please log in to see liked or submitted content.", + "gui.skin_library.choose_name": "Name your asset!", "gui.skin_library.already_uploading": "Already uploading, be patient.", + "gui.skin_library.upload_duplicate": "That content already exists.", + "gui.skin_library.upload_failed": "Upload failed. Woops.", "gui.skin_library.subscribe": "Use server wide!", + "gui.skin_library.sort_likes": "Sort by likes", + "gui.skin_library.sort_newest": "Sort by date", "gui.skin_library.like": "Like", "gui.skin_library.edit": "Edit", "gui.skin_library.delete": "Delete", @@ -346,6 +351,7 @@ "gui.skin_library.fillToolThreshold": "Fill threshold", "gui.skin_library.fillToolThreshold.tooltip": "Pressing F fill delete similar, adjacent pixels up to the given threshold.", "gui.skin_library.tool_help": "Controls:\nLeft mouse to paint\nRight mouse to delete\nMiddle mouse to pick color\nHold space or mouse 3 to pan\nMousewheel to zoom\nF to clear similar pixels\nClick to open help", + "gui.skin_library.help": "Click to open help. MCA Skins need a bit of preprocessing in order to look good.", "gui.skin_library.temperature.0": "Cold", "gui.skin_library.temperature.1": "Chilly", "gui.skin_library.temperature.2": "Moderate", From 060a358d0f55825566ad12c53dd005d2979c285a Mon Sep 17 00:00:00 2001 From: Luke100000 Date: Sun, 28 May 2023 23:09:55 +0200 Subject: [PATCH 3/5] Fixed a critical performance issue when childrens are stuck in a wall --- changelog.md | 46 +++++++++++++------ .../net/mca/entity/VillagerEntityMCA.java | 16 ++----- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/changelog.md b/changelog.md index 7176c3ff2c..e692b3ae74 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +# 7.5.1 + +* Fixed a critical performance issue when childrens are stuck in a wall + # 7.5.0 * Added experimental Skin library, editor and uploader @@ -154,17 +158,21 @@ * Added tooltip to editor to avoid confusion when choosing vanilla model * Fixed players also having randomly colored hair * Several Changes to the Naming systems in MCA - * Player Naming has been fixed and works properly, much like how /nickname systems work (If you have an existing custom name, MCA will use that instead) - * It is no longer possible to have a whitespace/empty name, and multiple safeguards have been placed to prevent exploits. + * Player Naming has been fixed and works properly, much like how /nickname systems work (If you have an existing + custom name, MCA will use that instead) + * It is no longer possible to have a whitespace/empty name, and multiple safeguards have been placed to prevent + exploits. * The `Nameless Traveler` code has been removed in favor of the above fix. * Added a Homosexuality Trait as a possible chance to spawn with * This trait cannot be inherited from past/to future generations - * Having this trait will enforce gender restrictions in Relationship Items and Villagers entering relations with those of the same gender + * Having this trait will enforce gender restrictions in Relationship Items and Villagers entering relations with + those of the same gender * Due to this trait being available, some relationship items being gifted may result in `incompatible` responses. * In the event of this trait being applied alongside the bisexual trait, the homosexual trait will take priority. * Added `professionConversionsMap` as a config value, made for mod compatibility * Designed to be able to use clothing from another profession, if your mod does not supply any to us - * Example: You can make a Butcher wear Armorer's clothing, or villagers wear a certain professions clothing by default. + * Example: You can make a Butcher wear Armorer's clothing, or villagers wear a certain professions clothing by + default. * Only Adult clothing is used in this, baby and child clothing remains unchanged. * Added `playerRendererBlacklist` to disable certain render elements of the player model if certain mods are present * Supported Values: `arms`, `left_arm`, `right_arm`, `all`, `block_player`, `block_villager` @@ -178,7 +186,8 @@ * The `canBeAttractedTo` checks for a Player/Villager relationship now properly respect traits * IE the same logic that is used for villagers now also applies to players * Added `shaderLocationsMap` to allow specifying custom shaders dependent on traits - * If the camera entity has the specified trait, it'll apply the shader, and remove it when the current camera entity does not. + * If the camera entity has the specified trait, it'll apply the shader, and remove it when the current camera entity + does not. * Requires `enablePlayerShaders` to be true to utilize this feature * Added functionality for `Lactose Intolerance` * Applies a Poison effect after usage, similar to if a spider eye were consumed @@ -213,8 +222,10 @@ # 7.3.17 * Fixed an issue with the Bone Meal Check in `HarvestingTask` not taking into account modded items -* Fixed an issue relating to a mismatched slot checked when a villager is left-handed and `HarvestingTask#bonemealCrop` was ran -* Rewritten `HarvestingTask#plantSeed` to allow modded plants to be properly planted, if specified in the `villager_plantable` tag and a valid `BlockItem` +* Fixed an issue relating to a mismatched slot checked when a villager is left-handed and `HarvestingTask#bonemealCrop` + was ran +* Rewritten `HarvestingTask#plantSeed` to allow modded plants to be properly planted, if specified in + the `villager_plantable` tag and a valid `BlockItem` * This also fixes pumpkin and melon seeds not properly planting, despite being in the tag * Added a `minBuildingSize` as a counterpart to the previously implemented `maxBuildingSize` config option * I'm not sure why someone wanted this, but...ok. @@ -269,20 +280,26 @@ * Sneaking + Interacting with a villager with the editor item will now open their inventory! * Added Left-Handed Trait as a possible chance to spawn with * This trait can be inherited from past/to future generations - * Having this trait will change their dominant hand in most tasks to be their left hand (Known to the player as the off-hand slot) - * Some examples of this include Work Tasks, EquipmentSet's, and Melee Attacks (For Equipment, if a preset already uses both hands, it'll remain unchanged.) - * Given Minecraft was never intended to support this type of gameplay, further tuning may be required in a future update. + * Having this trait will change their dominant hand in most tasks to be their left hand (Known to the player as the + off-hand slot) + * Some examples of this include Work Tasks, EquipmentSet's, and Melee Attacks (For Equipment, if a preset already + uses both hands, it'll remain unchanged.) + * Given Minecraft was never intended to support this type of gameplay, further tuning may be required in a future + update. # 7.3.11/7.3.12 * Misc. Patches for 1.18.2 and 1.19 Dependencies (1.18.2 officially identifies as LTS now!) * Added `innArrivalNotification` config setting, for notifying players in the village that a new traveller has arrived! -* Added a Night Owl schedule, in which Cultist's and Outlaws have a chance to use, based on the `nightOwlChance` config setting (Default: 50% Chance) +* Added a Night Owl schedule, in which Cultist's and Outlaws have a chance to use, based on the `nightOwlChance` config + setting (Default: 50% Chance) * Enable `allowAnyNightOwl` to be able to apply this same chance to other professions - * Guard's will also now use `nightOwlChance` instead of using a random boolean to determine their schedule (Meaning if you want more guards at night, increase `nightOwlChance`) + * Guard's will also now use `nightOwlChance` instead of using a random boolean to determine their schedule (Meaning + if you want more guards at night, increase `nightOwlChance`) * Added a Bisexuality Trait as a possible chance to spawn with * This trait cannot be inherited from past/to future generations - * Having this trait will bypass gender restrictions in Relationship Items and Villagers entering relations with those of the same gender + * Having this trait will bypass gender restrictions in Relationship Items and Villagers entering relations with + those of the same gender * Due to this trait being available, some relationship items being gifted may result in `incompatible` responses. # 7.3.10 @@ -510,7 +527,8 @@ * Fixed letter author and creative mode usage * Strengthened Grim Reaper * Added mod support for atmospheric, autumity, berry good, buzzier bees, environmental, neopolitan, and upgrade aquatic -* Villager now recognize and estimate the value of every (modded) armor, tool, sword, bow and food as a gift (accuracy not guaranteed) +* Villager now recognize and estimate the value of every (modded) armor, tool, sword, bow and food as a gift (accuracy + not guaranteed) # 7.0.7 diff --git a/common/src/main/java/net/mca/entity/VillagerEntityMCA.java b/common/src/main/java/net/mca/entity/VillagerEntityMCA.java index c37ab19830..09d9fa9b52 100644 --- a/common/src/main/java/net/mca/entity/VillagerEntityMCA.java +++ b/common/src/main/java/net/mca/entity/VillagerEntityMCA.java @@ -130,9 +130,10 @@ public class VillagerEntityMCA extends VillagerEntity implements VillagerLike CDataManager.Builder createTrackedData(Class type) { return VillagerLike.createTrackedData(type).addAll(INFECTION_PROGRESS, GROWTH_AMOUNT) .add(Residency::createTrackedData) @@ -757,7 +758,7 @@ public void tick() { // update visual age int age = getTrackedValue(GROWTH_AMOUNT); - if (age != prevGrowthAmount || recalcDimensionsBlocked) { + if (age / recalculateDimensionsEveryNTicks != prevGrowthAmount / recalculateDimensionsEveryNTicks) { prevGrowthAmount = age; calculateDimensions(); } @@ -824,8 +825,6 @@ public void calculateDimensions() { AgeState current = getAgeState(); AgeState next = current.getNext(); - VillagerDimensions.Mutable old = new VillagerDimensions.Mutable(dimensions); - // either interpolate or set if final age is reached if (next != current) { dimensions.interpolate(current, next, AgeState.getDelta(getTrackedValue(GROWTH_AMOUNT))); @@ -839,15 +838,6 @@ public void calculateDimensions() { boolean oldOnGround = this.onGround; super.calculateDimensions(); this.onGround = oldOnGround; - - // prevents from growing into the wall - if (!this.firstUpdate && !world.isSpaceEmpty(this)) { - dimensions.set(old); - super.calculateDimensions(); - recalcDimensionsBlocked = true; - } else { - recalcDimensionsBlocked = false; - } } @Override From 18267cb70717d16bb48f91a78ff369057a201c2b Mon Sep 17 00:00:00 2001 From: Luke100000 Date: Sun, 28 May 2023 23:16:53 +0200 Subject: [PATCH 4/5] Disabled smarter door AI by default --- changelog.md | 1 + common/src/main/java/net/mca/Config.java | 1 + .../mca/entity/ai/brain/VillagerTasksMCA.java | 17 +++++++++-------- .../ai/brain/tasks/SmarterOpenDoorsTask.java | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/changelog.md b/changelog.md index e692b3ae74..fe102c3097 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,7 @@ # 7.5.1 * Fixed a critical performance issue when childrens are stuck in a wall +* Disabled smarter door AI (which can open gates) by default due to reports of villagers not closing the door # 7.5.0 diff --git a/common/src/main/java/net/mca/Config.java b/common/src/main/java/net/mca/Config.java index 907b163666..5932f1069f 100644 --- a/common/src/main/java/net/mca/Config.java +++ b/common/src/main/java/net/mca/Config.java @@ -92,6 +92,7 @@ public static Config getInstance() { public int burnedClothingTickLength = 3600; public float coloredHairChance = 0.02f; public int heartsRequiredToAutoSpawnGravestone = 10; + public boolean useSmarterDoorAI = false; //tracker public boolean trackVillagerPosition = true; diff --git a/common/src/main/java/net/mca/entity/ai/brain/VillagerTasksMCA.java b/common/src/main/java/net/mca/entity/ai/brain/VillagerTasksMCA.java index dfaeb20cba..bd058be225 100644 --- a/common/src/main/java/net/mca/entity/ai/brain/VillagerTasksMCA.java +++ b/common/src/main/java/net/mca/entity/ai/brain/VillagerTasksMCA.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; +import net.mca.Config; import net.mca.ProfessionsMCA; import net.mca.entity.EntitiesMCA; import net.mca.entity.EquipmentSet; @@ -195,18 +196,18 @@ public static Brain initializeTasks(VillagerEntityMCA village public static ImmutableList>> getImportantCorePackage(float speedModifier) { return ImmutableList.of( Pair.of(0, new StayAboveWaterTask(0.8F)), - Pair.of(0, new SmarterOpenDoorsTask()), + Config.getServerConfig().useSmarterDoorAI ? Pair.of(0, new SmarterOpenDoorsTask()) : Pair.of(0, new OpenDoorsTask()), Pair.of(0, new LookAroundTask(45, 90)), Pair.of(0, new WakeUpTask()), Pair.of(0, new DeliverMessageTask()), Pair.of(1, new WanderOrTeleportToTargetTask()), Pair.of(3, new InteractTask(speedModifier)), - Pair.of(10, new ExtendedFindPointOfInterestTask(registryEntry -> registryEntry.matchesKey(PointOfInterestTypes.HOME), MemoryModuleType.HOME, false, Optional.of((byte)14), (villager) -> { + Pair.of(10, new ExtendedFindPointOfInterestTask(registryEntry -> registryEntry.matchesKey(PointOfInterestTypes.HOME), MemoryModuleType.HOME, false, Optional.of((byte) 14), (villager) -> { // update villagers home/bed position villager.getResidency().seekHome(); }, (entity, pos) -> { // verify that this bed is not blocked - VillageManager manager = VillageManager.get((ServerWorld)entity.world); + VillageManager manager = VillageManager.get((ServerWorld) entity.world); if (entity.requiresHome()) { return manager.findNearestVillage(entity).filter(v -> !v.isPositionValidBed(pos)).isEmpty(); } else { @@ -223,21 +224,21 @@ public static Brain initializeTasks(VillagerEntityMCA village Pair.of(0, new HideWhenBellRingsTask()), Pair.of(0, new StartRaidTask()), Pair.of(5, new WalkToNearestVisibleWantedItemTask<>(speedModifier, false, 4)), - Pair.of(10, new ExtendedFindPointOfInterestTask(registryEntry -> registryEntry.matchesKey(PointOfInterestTypes.HOME), MemoryModuleType.HOME, false, Optional.of((byte)14), (villager) -> { + Pair.of(10, new ExtendedFindPointOfInterestTask(registryEntry -> registryEntry.matchesKey(PointOfInterestTypes.HOME), MemoryModuleType.HOME, false, Optional.of((byte) 14), (villager) -> { // update villagers home/bed position villager.getResidency().seekHome(); }, (entity, pos) -> { // verify that this bed is not blocked - VillageManager manager = VillageManager.get((ServerWorld)entity.world); + VillageManager manager = VillageManager.get((ServerWorld) entity.world); return manager.findNearestVillage(entity).filter(v -> { return v.getBuildingAt(pos).filter(b -> b.getBuildingType().noBeds()).isPresent(); }).isEmpty(); })), - Pair.of(10, new ExtendedFindPointOfInterestTask(registryEntry -> registryEntry.matchesKey(PointOfInterestTypes.MEETING), MemoryModuleType.MEETING_POINT, true, Optional.of((byte)14), (villager) -> { + Pair.of(10, new ExtendedFindPointOfInterestTask(registryEntry -> registryEntry.matchesKey(PointOfInterestTypes.MEETING), MemoryModuleType.MEETING_POINT, true, Optional.of((byte) 14), (villager) -> { //report a town bell, the only building always added villager.getBrain().getOptionalMemory(MemoryModuleType.MEETING_POINT).ifPresent(p -> { if (villager.world.getRegistryKey() == p.getDimension()) { - VillageManager manager = VillageManager.get((ServerWorld)villager.world); + VillageManager manager = VillageManager.get((ServerWorld) villager.world); if (!manager.cache.contains(p.getPos())) { manager.cache.add(p.getPos()); manager.processBuilding(p.getPos()); @@ -351,7 +352,7 @@ public static boolean isInDanger(VillagerEntityMCA villager) { } private static Activity getActivity(VillagerEntityMCA villager) { - return villager.getBrain().getSchedule().getActivityForTime((int)(villager.world.getTimeOfDay() % 24000L)); + return villager.getBrain().getSchedule().getActivityForTime((int) (villager.world.getTimeOfDay() % 24000L)); } public static ImmutableList>> getGrievingPackage() { diff --git a/common/src/main/java/net/mca/entity/ai/brain/tasks/SmarterOpenDoorsTask.java b/common/src/main/java/net/mca/entity/ai/brain/tasks/SmarterOpenDoorsTask.java index 82f7fa7b83..051ce5bb9d 100644 --- a/common/src/main/java/net/mca/entity/ai/brain/tasks/SmarterOpenDoorsTask.java +++ b/common/src/main/java/net/mca/entity/ai/brain/tasks/SmarterOpenDoorsTask.java @@ -118,7 +118,7 @@ public static void closeDoors(ServerWorld world, LivingEntity entity, @Nullable // Not far enough away if (lastNode != null && lastNode.getBlockPos().equals(blockPos) || currentNode != null && currentNode.getBlockPos().equals(blockPos)) continue; - // Our of range + // Out of range if (SmarterOpenDoorsTask.cannotReachDoor(world, entity, globalPos)) { iterator.remove(); continue; From 0d21ac80248a9dc1b6bf045ffa8bf01d20198337 Mon Sep 17 00:00:00 2001 From: Luke100000 Date: Sun, 28 May 2023 23:35:30 +0200 Subject: [PATCH 5/5] added destiny customization flags #645 --- changelog.md | 1 + common/src/main/java/net/mca/Config.java | 2 + .../net/mca/client/gui/DestinyScreen.java | 61 ++++++++++++------- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/changelog.md b/changelog.md index fe102c3097..6920402bd7 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ * Fixed a critical performance issue when childrens are stuck in a wall * Disabled smarter door AI (which can open gates) by default due to reports of villagers not closing the door +* Added a few config flags for customizing the destiny screen # 7.5.0 diff --git a/common/src/main/java/net/mca/Config.java b/common/src/main/java/net/mca/Config.java index 5932f1069f..2ff1bd6e0b 100644 --- a/common/src/main/java/net/mca/Config.java +++ b/common/src/main/java/net/mca/Config.java @@ -49,6 +49,8 @@ public static Config getInstance() { public boolean showNotificationsAsChat = false; public int heartsToBeConsideredAsFriend = 40; public boolean enableVillagerMailingPlayers = true; + public boolean allowBodyCustomizationInDestiny = true; + public boolean allowTraitCustomizationInDestiny = true; public float zombieBiteInfectionChance = 0.05f; public float infectionChanceDecreasePerLevel = 0.25f; diff --git a/common/src/main/java/net/mca/client/gui/DestinyScreen.java b/common/src/main/java/net/mca/client/gui/DestinyScreen.java index 1cc6fdde59..ef473d1c50 100644 --- a/common/src/main/java/net/mca/client/gui/DestinyScreen.java +++ b/common/src/main/java/net/mca/client/gui/DestinyScreen.java @@ -47,19 +47,28 @@ public void close() { @Override protected String[] getPages() { - return new String[] {"general", "body", "head", "traits"}; + LinkedList pages = new LinkedList<>(); + pages.add("general"); + if (Config.getInstance().allowBodyCustomizationInDestiny) { + pages.add("body"); + pages.add("head"); + } + if (Config.getInstance().allowTraitCustomizationInDestiny) { + pages.add("traits"); + } + return pages.toArray(new String[]{}); } @Override public void renderBackground(MatrixStack matrices) { assert MinecraftClient.getInstance().world != null; - renderBackgroundTexture((int)MinecraftClient.getInstance().world.getTime()); + renderBackgroundTexture((int) MinecraftClient.getInstance().world.getTime()); } private void drawScaledText(MatrixStack transform, Text text, int x, int y, float scale) { transform.push(); transform.scale(scale, scale, scale); - drawCenteredText(transform, textRenderer, text, (int)(x / scale), (int)(y / scale), 0xffffffff); + drawCenteredText(transform, textRenderer, text, (int) (x / scale), (int) (y / scale), 0xffffffff); transform.pop(); } @@ -79,10 +88,11 @@ public void render(MatrixStack transform, int mouseX, int mouseY, float delta) { DrawableHelper.drawTexture(transform, width * 2 - 512, -40, 0, 0, 1024, 512, 1024, 512); transform.pop(); } - case "destiny" -> drawScaledText(transform, Text.translatable("gui.destiny.journey"), width / 2, height / 2 - 48, 1.5f); + case "destiny" -> + drawScaledText(transform, Text.translatable("gui.destiny.journey"), width / 2, height / 2 - 48, 1.5f); case "story" -> { List text = FlowingText.wrap(story.getFirst(), 256); - int y = (int)(height / 2 - 20 - 7.5f * text.size()); + int y = (int) (height / 2 - 20 - 7.5f * text.size()); for (Text t : text) { drawScaledText(transform, t, width / 2, y, 1.25f); y += 15; @@ -126,17 +136,23 @@ protected void setPage(String page) { drawModel(width / 2 - DATA_WIDTH / 2, height / 2 + 24 + 22); acceptWidget = addDrawableChild(new ButtonWidget(width / 2 - 32, height / 2 + 60 + 22, 64, 20, Text.translatable("gui.button.accept"), sender -> { - setPage("body"); + if (Config.getInstance().allowBodyCustomizationInDestiny) { + setPage("body"); + } else if (Config.getInstance().allowTraitCustomizationInDestiny) { + setPage("traits"); + } else { + setPage("destiny"); + } })); } case "destiny" -> { int x = 0; int y = 0; for (String location : Config.getServerConfig().destinySpawnLocations) { - int rows = (int)Math.ceil(Config.getServerConfig().destinySpawnLocations.size() / 3.0f); + int rows = (int) Math.ceil(Config.getServerConfig().destinySpawnLocations.size() / 3.0f); float offsetX = (y + 1) == rows ? (2 - (Config.getServerConfig().destinySpawnLocations.size() - 1) % 3) / 2.0f : 0; float offsetY = Math.max(0, 3 - rows) / 2.0f; - addDrawableChild(new ButtonWidget((int)(width / 2 - 96 * 1.5f + (x + offsetX) * 96), (int)(height / 2 + (y + offsetY) * 20 - 16), 96, 20, Text.translatable("gui.destiny." + new Identifier(location).getPath()), sender -> { + addDrawableChild(new ButtonWidget((int) (width / 2 - 96 * 1.5f + (x + offsetX) * 96), (int) (height / 2 + (y + offsetY) * 20 - 16), 96, 20, Text.translatable("gui.destiny." + new Identifier(location).getPath()), sender -> { selectStory(location); })); x++; @@ -146,20 +162,21 @@ protected void setPage(String page) { } } } - case "story" -> addDrawableChild(new ButtonWidget(width / 2 - 48, height / 2 + 32, 96, 20, Text.translatable("gui.destiny.next"), sender -> { - //we teleport early here to avoid initial flickering - if (!teleported) { - NetworkHandler.sendToServer(new DestinyMessage(location)); - MCAClient.getDestinyManager().allowClosing(); - teleported = true; - } - if (story.size() > 1) { - story.remove(0); - } else { - NetworkHandler.sendToServer(new DestinyMessage(true)); - super.close(); - } - })); + case "story" -> + addDrawableChild(new ButtonWidget(width / 2 - 48, height / 2 + 32, 96, 20, Text.translatable("gui.destiny.next"), sender -> { + //we teleport early here to avoid initial flickering + if (!teleported) { + NetworkHandler.sendToServer(new DestinyMessage(location)); + MCAClient.getDestinyManager().allowClosing(); + teleported = true; + } + if (story.size() > 1) { + story.remove(0); + } else { + NetworkHandler.sendToServer(new DestinyMessage(true)); + super.close(); + } + })); default -> super.setPage(page); } }