Merge branch '1.19.4' into 1.20.1

changelog.md

@@ -1,3 +1,7 @@
+# 0.6.7
+
+* fixed visibility of hidden paintings
+
 # 0.6.6
 
 * Max and Low res limits are now synced to the client

common/src/main/java/immersive_paintings/client/gui/ImmersivePaintingScreen.java

@@ -576,7 +576,7 @@ private void rebuildPaintings() {
                     tooltip.add(Text.translatable("immersive_paintings.by_author", painting.author).formatted(Formatting.ITALIC));
                     tooltip.add(Text.translatable("immersive_paintings.resolution", painting.width, painting.height, painting.resolution).formatted(Formatting.ITALIC));
 
-                    if (page == Page.YOURS || painting.hidden) {
+                    if (page == Page.YOURS && painting.hidden) {
                         tooltip.add(Text.translatable("immersive_paintings.hidden").formatted(Formatting.ITALIC).formatted(Formatting.GRAY));
                     }
 
@@ -683,7 +683,7 @@ private void updateSearch() {
         filteredPaintings.addAll(ClientPaintingManager.getPaintings().entrySet().stream()
                 .filter(v -> v.getValue().graffiti == entity.isGraffiti())
                 .filter(v -> page != Page.YOURS || Objects.equals(v.getValue().author, playerName) && !v.getValue().datapack)
-                .filter(v -> page != Page.PLAYERS || !Objects.equals(v.getValue().author, playerName) && !v.getValue().datapack && !v.getValue().hidden)
+                .filter(v -> page != Page.PLAYERS || !v.getValue().datapack && !v.getValue().hidden)
                 .filter(v -> page != Page.DATAPACKS || v.getValue().datapack)
                 .filter(v -> v.getKey().toString().contains(filteredString))
                 .filter(v -> filteredResolution == 0 || v.getValue().resolution == filteredResolution)

common/src/main/java/immersive_paintings/resources/Painting.java

@@ -28,7 +28,7 @@ public final class Painting {
     public final Texture eighth;
     public final Texture thumbnail;
 
-    public final static Painting DEFAULT = new Painting(new ByteImage(16, 16), 16);
+    public static final Painting DEFAULT = new Painting(new ByteImage(16, 16), 16);
 
     public Painting(@Nullable ByteImage image, int width, int height, int resolution, boolean hidden, boolean graffiti) {
         this(image, width, height, resolution, "", "", false, hidden, graffiti, UUID.randomUUID().toString());

common/src/main/resources/assets/immersive_paintings/lang/cs_cz.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Nahrávání, zbývá %s sekund",
   "immersive_paintings.drop": "Vložte sem obrázek, zadejte cestu k souboru nebo adresu URL nebo vyberte snímek obrazovky a začněte.",
   "immersive_paintings.graffiti_warning": "Obrázek obsahuje průhlednost, použijte místo něj graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Žádné povolení!",
   "immersive_paintings.error.too_large": "Obrázek je příliš velký!",
   "immersive_paintings.error.limit_reached": "Dosáhli jste maximálního počtu nahraných obrazů!",
   "immersive_paintings.filter.all": "Všechny",

common/src/main/resources/assets/immersive_paintings/lang/da_dk.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Uploading, %s sekunder tilbage",
   "immersive_paintings.drop": "Smid et billede her, indtast en filsti eller URL, eller vælg et skærmbillede for at starte.",
   "immersive_paintings.graffiti_warning": "Billedet indeholder gennemsigtighed, brug en graffiti i stedet!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Ingen tilladelse!",
   "immersive_paintings.error.too_large": "Billedet er for stort!",
   "immersive_paintings.error.limit_reached": "Du har nået dit maksimale antal uploadede malerier!",
   "immersive_paintings.filter.all": "Alle",

common/src/main/resources/assets/immersive_paintings/lang/de_de.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Lade hoch, %s Sekunden verbleibend",
   "immersive_paintings.drop": "Droppe ein Bild hier, gebe einen Dateinamen ein oder wähle einen Screenshot aus.",
   "immersive_paintings.graffiti_warning": "Das Bild enthält Transparenz, verwende stattdessen ein Graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Keine Erlaubnis!",
   "immersive_paintings.error.too_large": "Das Bild ist zu groß!",
   "immersive_paintings.error.limit_reached": "Du hast die maximale Anzahl an Gemälden erreicht!",
   "immersive_paintings.filter.all": "Alle",

common/src/main/resources/assets/immersive_paintings/lang/el_gr.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Ανέβασμα, %s δευτερόλεπτα αριστερά",
   "immersive_paintings.drop": "Αφήστε μια εικόνα εδώ, εισαγάγετε μια διαδρομή αρχείου ή μια διεύθυνση URL ή επιλέξτε ένα στιγμιότυπο οθόνης για να ξεκινήσετε.",
   "immersive_paintings.graffiti_warning": "Η εικόνα περιέχει διαφάνεια, χρησιμοποιήστε ένα γκράφιτι!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Χωρίς άδεια!",
   "immersive_paintings.error.too_large": "Η εικόνα είναι πολύ μεγάλη!",
   "immersive_paintings.error.limit_reached": "Φτάσατε στο μέγιστο αριθμό ανεβασμένων πινάκων!",
   "immersive_paintings.filter.all": "Όλα",

common/src/main/resources/assets/immersive_paintings/lang/es_ar.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Cargando, quedan %s segundos",
   "immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/es_cl.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Cargando, quedan %s segundos",
   "immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/es_ec.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Cargando, quedan %s segundos",
   "immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/es_es.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Subiendo, %s segundos restantes",
   "immersive_paintings.drop": "Arrastra una imagen aquí, introduce una ruta de archivo, URL o selecciona una captura de pantalla para comenzar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de pinturas subidas!",
   "immersive_paintings.filter.all": "Todo",

common/src/main/resources/assets/immersive_paintings/lang/es_mx.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Cargando, quedan %s segundos",
   "immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/es_uy.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Cargando, quedan %s segundos",
   "immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/es_ve.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Cargando, quedan %s segundos",
   "immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
   "immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "¡Sin permiso!",
   "immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
   "immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/fi_fi.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Lataus, %s sekuntia jäljellä",
   "immersive_paintings.drop": "Pudota kuva tähän, syötä tiedostopolku tai URL-osoite tai valitse kuvakaappaus aloittaaksesi.",
   "immersive_paintings.graffiti_warning": "Kuva sisältää läpinäkyvyyttä, käytä sen sijaan graffiteja!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Ei lupaa!",
   "immersive_paintings.error.too_large": "Kuva on liian suuri!",
   "immersive_paintings.error.limit_reached": "Olet saavuttanut ladattujen maalausten enimmäismäärän!",
   "immersive_paintings.filter.all": "Kaikki",

common/src/main/resources/assets/immersive_paintings/lang/fr_fr.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Téléchargement, %s secondes restantes",
   "immersive_paintings.drop": "Dépose une image ici, entre un chemin de fichier ou une URL ou sélectionne une capture d'écran pour commencer.",
   "immersive_paintings.graffiti_warning": "L'image contient de la transparence, utilise plutôt un graffiti !",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Pas de permission !",
   "immersive_paintings.error.too_large": "L'image est trop grande !",
   "immersive_paintings.error.limit_reached": "Tu as atteint ta quantité maximale de peintures téléchargées !",
   "immersive_paintings.filter.all": "Tous les",

common/src/main/resources/assets/immersive_paintings/lang/hu_hu.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Feltöltés, %s másodperc maradt",
   "immersive_paintings.drop": "Húzz ide egy képet, adj meg egy elérési útvonalat vagy URL-címet, vagy válassz ki egy képernyőképet a kezdéshez.",
   "immersive_paintings.graffiti_warning": "A kép átlátszóságot tartalmaz, használj helyette graffitit!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Nincs engedély!",
   "immersive_paintings.error.too_large": "A kép túl nagy!",
   "immersive_paintings.error.limit_reached": "Elérted a feltöltött festmények maximális számát!",
   "immersive_paintings.filter.all": "Összes",

common/src/main/resources/assets/immersive_paintings/lang/it_it.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Caricamento, %s secondi rimasti",
   "immersive_paintings.drop": "Lascia qui un'immagine, inserisci un percorso di file o un URL o seleziona uno screenshot per iniziare.",
   "immersive_paintings.graffiti_warning": "L'immagine contiene una trasparenza, usa invece un graffito!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Nessun permesso!",
   "immersive_paintings.error.too_large": "L'immagine è troppo grande!",
   "immersive_paintings.error.limit_reached": "Hai raggiunto il numero massimo di dipinti caricati!",
   "immersive_paintings.filter.all": "Tutti",

common/src/main/resources/assets/immersive_paintings/lang/ja_jp.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "アップロード中、 %s 残り秒",
   "immersive_paintings.drop": "ここに画像をドロップするか、ファイルパスまたはURLを入力するか、スクリーンショットを選択して開始します。",
   "immersive_paintings.graffiti_warning": "画像には透明度が含まれています。代わりに落書きを使ってください。",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "許可はない！",
   "immersive_paintings.error.too_large": "画像が大きすぎます",
   "immersive_paintings.error.limit_reached": "アップロードできる絵画の枚数が上限に達しました。",
   "immersive_paintings.filter.all": "すべて",

common/src/main/resources/assets/immersive_paintings/lang/ko_kr.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "업로드 중, %s초 남음",
   "immersive_paintings.drop": "여기에 이미지를 끌어다 놓고 파일 경로 또는 URL을 입력하거나 스크린샷을 선택하여 시작하세요.",
   "immersive_paintings.graffiti_warning": "이미지에 투명도가 있는 경우, 대신 그래피티를 사용하세요!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "허가가 없습니다!",
   "immersive_paintings.error.too_large": "이미지가 너무 큽니다!",
   "immersive_paintings.error.limit_reached": "업로드 할 수 있는 그림의 최대 개수에 도달했습니다!",
   "immersive_paintings.filter.all": "전체",

common/src/main/resources/assets/immersive_paintings/lang/lt_lt.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Įkėlimas, liko %s sekundžių",
   "immersive_paintings.drop": "Įmeskite čia paveikslėlį, įveskite failo kelią arba URL adresą arba pasirinkite ekrano nuotrauką ir pradėkite.",
   "immersive_paintings.graffiti_warning": "Paveikslėlyje yra skaidrumo, vietoj jo naudokite graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Jokio leidimo!",
   "immersive_paintings.error.too_large": "Vaizdas yra per didelis!",
   "immersive_paintings.error.limit_reached": "Pasiekėte maksimalų įkeltų paveikslų skaičių!",
   "immersive_paintings.filter.all": "Visi",

common/src/main/resources/assets/immersive_paintings/lang/pl_pl.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Przesyłanie, %s sekund.",
   "immersive_paintings.drop": "Upuść tutaj obraz, wprowadź ścieżkę dostępu do pliku lub adres URL albo wybierz zrzut ekranu, aby rozpocząć.",
   "immersive_paintings.graffiti_warning": "Obrazek zawiera przezroczystość, użyj zamiast niego graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Nie masz pozwolenia!",
   "immersive_paintings.error.too_large": "Obraz jest zbyt duży!",
   "immersive_paintings.error.limit_reached": "Osiągnąłeś maksymalną liczbę przesłanych obrazów!",
   "immersive_paintings.filter.all": "Wszystkie",

common/src/main/resources/assets/immersive_paintings/lang/pt_br.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Enviando, %s segundos restantes",
   "immersive_paintings.drop": "Arraste uma imagem até aqui, insira um caminho de pasta, URL, ou selecione uma captura de tela para começar.",
   "immersive_paintings.graffiti_warning": "A imagem contém transparência, use antes um graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Sem autorização!",
   "immersive_paintings.error.too_large": "A imagem é grande demais!",
   "immersive_paintings.error.limit_reached": "Você atingiu a quantidade máxima de pinturas adicionadas!",
   "immersive_paintings.filter.all": "Tudo",

common/src/main/resources/assets/immersive_paintings/lang/pt_pt.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Uploading, %s segundos restantes",
   "immersive_paintings.drop": "Largue uma imagem aqui, introduza um caminho de ficheiro ou URL ou seleccione uma imagem para começar.",
   "immersive_paintings.graffiti_warning": "A imagem contém transparência, use antes um graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Sem autorização!",
   "immersive_paintings.error.too_large": "A imagem é demasiado grande!",
   "immersive_paintings.error.limit_reached": "Atingiu a sua quantidade máxima de pinturas carregadas!",
   "immersive_paintings.filter.all": "Todos",

common/src/main/resources/assets/immersive_paintings/lang/ru_ru.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Загрузка, осталось %s секунд",
   "immersive_paintings.drop": "Перетащите изображение сюда, введите путь к файлу или URL, или выберите скриншот, чтобы начать.",
   "immersive_paintings.graffiti_warning": "Изображение содержит прозрачность, используй вместо него граффити!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Никакого разрешения!",
   "immersive_paintings.error.too_large": "Изображение слишком большое!",
   "immersive_paintings.error.limit_reached": "Вы достигли максимального количества загруженных картин!",
   "immersive_paintings.filter.all": "Все",

common/src/main/resources/assets/immersive_paintings/lang/sk_sk.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Nahrávanie, %s sekúnd",
   "immersive_paintings.drop": "Vložte sem obrázok, zadajte cestu k súboru alebo adresu URL alebo vyberte snímku obrazovky a začnite.",
   "immersive_paintings.graffiti_warning": "Obrázok obsahuje priehľadnosť, namiesto nej použite graffiti!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Žiadne povolenie!",
   "immersive_paintings.error.too_large": "Obrázok je príliš veľký!",
   "immersive_paintings.error.limit_reached": "Dosiahli ste maximálny počet nahraných obrazov!",
   "immersive_paintings.filter.all": "Všetky",

common/src/main/resources/assets/immersive_paintings/lang/sl_si.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Nalaganje, %s ostalo še nekaj sekund",
   "immersive_paintings.drop": "Sem spustite sliko, vnesite pot do datoteke ali URL ali izberite posnetek zaslona in začnite.",
   "immersive_paintings.graffiti_warning": "Slika vsebuje prosojnost, namesto nje uporabite grafit!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Brez dovoljenja!",
   "immersive_paintings.error.too_large": "Slika je prevelika!",
   "immersive_paintings.error.limit_reached": "Dosegli ste največje število naloženih slik!",
   "immersive_paintings.filter.all": "Vse",

common/src/main/resources/assets/immersive_paintings/lang/sv_se.json

@@ -11,7 +11,7 @@
   "immersive_paintings.upload": "Laddar upp, %s sekund(er) kvar",
   "immersive_paintings.drop": "Släpp en bild här, ange en filväg eller URL eller välj en skärmdump för att börja.",
   "immersive_paintings.graffiti_warning": "Bilden innehåller transparens, använd graffiti istället!",
-  "immersive_paintings.error.no_permission": "No permission!",
+  "immersive_paintings.error.no_permission": "Inget tillstånd!",
   "immersive_paintings.error.too_large": "Bilden är för stor!",
   "immersive_paintings.error.limit_reached": "Du har nått det maximala antalet uppladdade målningar!",
   "immersive_paintings.filter.all": "Alla",