From c5764d813ab88c54e921d96ffa6bbd3a3f4104c1 Mon Sep 17 00:00:00 2001 From: Pixaurora Date: Fri, 24 Jan 2025 17:01:42 -0500 Subject: [PATCH] Only render the background translucently if the player is in world --- .../kitten_cube/impl/ui/widget/TiledBackground.java | 3 ++- .../net/pixaurora/kitten_heart/impl/service/UICompat.java | 5 ++++- .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 5 +++++ .../kitten_square/impl/service/UICompatImpl.java | 8 +++++++- 11 files changed, 53 insertions(+), 3 deletions(-) diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/ui/widget/TiledBackground.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/ui/widget/TiledBackground.java index 21402d49..183fe7b2 100644 --- a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/ui/widget/TiledBackground.java +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_cube/impl/ui/widget/TiledBackground.java @@ -11,6 +11,7 @@ import net.pixaurora.kitten_cube.impl.ui.screen.align.Alignment; import net.pixaurora.kitten_cube.impl.ui.texture.GuiTexture; import net.pixaurora.kitten_cube.impl.ui.widget.event.WindowUpdateEvent; +import net.pixaurora.kitten_heart.impl.KitTunes; public class TiledBackground implements IncorporealWidget { private final GuiTexture texture; @@ -23,7 +24,7 @@ public TiledBackground(GuiTexture texture) { @Override public void draw(GuiDisplay gui, Point mousePos) { for (Point pos : posToDrawAt) { - gui.drawGui(this.texture, pos, 0.5); + gui.drawGui(this.texture, pos, KitTunes.UI_LAYER.isInWorld() ? 0.5 : 1); } } diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java index 4123cdea..330c4f9d 100644 --- a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java +++ b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/service/UICompat.java @@ -36,7 +36,10 @@ public interface UICompat extends SoundPlayer, TextProcessor { public FileAccess accessResource(ResourcePath path) throws IOException; - public default TextField newTextField(TextFieldBackground background, Component defaultText, int maxLength) { + public boolean isInWorld(); + + public default TextField newTextField(TextFieldBackground background, Component defaultText, + int maxLength) { throw new RuntimeException("No implementation for `newTextField` defined!"); } diff --git a/projects/kitten-square/b1.7.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/b1.7.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index fe768c16..e4f53543 100644 --- a/projects/kitten-square/b1.7.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/b1.7.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -155,4 +155,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { throw new RuntimeException("Can't access regular files yet!"); } } + + @Override + public boolean isInWorld() { + return Minecraft.INSTANCE.world != null; + } } diff --git a/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index cb209656..75b2da60 100644 --- a/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.17.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -120,4 +120,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.getInputStream()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index c1d4b713..9fcc3810 100644 --- a/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.19.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -118,4 +118,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index c1d4b713..9fcc3810 100644 --- a/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.19.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -118,4 +118,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index c1d4b713..9fcc3810 100644 --- a/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.19.4/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -118,4 +118,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index a967138c..1c0e2bf8 100644 --- a/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.20.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -122,4 +122,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index afa8aa35..c464e563 100644 --- a/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.20.3/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -122,4 +122,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index a82349a0..22bad4a8 100644 --- a/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.21.0/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -122,4 +122,9 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + + @Override + public boolean isInWorld() { + return this.client.level != null; + } } diff --git a/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java b/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java index ce7d84a9..2605889f 100644 --- a/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java +++ b/projects/kitten-square/r1.21.2/src/main/java/net/pixaurora/kitten_square/impl/service/UICompatImpl.java @@ -130,6 +130,11 @@ public FileAccess accessResource(ResourcePath path) throws IOException { return FileAccess.create(resource.open()); } + @Override + public boolean isInWorld() { + return this.client.level != null; + } + @Override public TextField newTextField(TextFieldBackground background, Component defaultText, int maxLength) { return new TextFieldImpl(this.client.font, background, defaultText, maxLength); @@ -138,7 +143,8 @@ public TextField newTextField(TextFieldBackground background, Compon @Override public void addTextField(Screen screen, TextField field) { if (!(field instanceof TextFieldImpl)) { - throw new RuntimeException("Internal text field is of an unconvertable type `" + field.getClass().getName() + "`!"); + throw new RuntimeException( + "Internal text field is of an unconvertable type `" + field.getClass().getName() + "`!"); } internalToMinecraftType(screen, false).addRenderableWidget((TextFieldImpl) field);