fixed visibility of hidden paintings

Luke100000 · Oct 9, 2023 · 29d4af1 · 29d4af1
1 parent 086796d
commit 29d4af1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/changelog.md b/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

diff --git a/common/src/main/java/immersive_paintings/client/gui/ImmersivePaintingScreen.java b/common/src/main/java/immersive_paintings/client/gui/ImmersivePaintingScreen.java
@@ -581,7 +581,7 @@ private void rebuildPaintings() {
                     tooltip.add(new TranslatableText("immersive_paintings.by_author", painting.author).formatted(Formatting.ITALIC));
                     tooltip.add(new TranslatableText("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(new TranslatableText("immersive_paintings.hidden").formatted(Formatting.ITALIC).formatted(Formatting.GRAY));
                     }
 
@@ -688,7 +688,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)

diff --git a/common/src/main/java/immersive_paintings/resources/Painting.java b/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());