diff --git a/buildNumber.properties b/buildNumber.properties index e7726038..00886f4e 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Sat Oct 19 14:21:36 EDT 2024 -buildNumber=360 +#Sun Oct 20 12:03:26 EDT 2024 +buildNumber=361 diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index e9bf3ea2..8e7ebefc 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -34,8 +34,6 @@ - Decoy (creates a decoy) - Torch - Throwable potions - Fix ui scaling on abnormal monitors - - Essentially just the global flags not being set in rendering engine on init Crouching Model clothing, hair for the human particles, light on sword collision diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index c23cbff3..bc9053b8 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -872,6 +872,9 @@ Potential fix for ground audio bug (10/20/2024) Fix SP debug launcher actually entering world +Fix virtual scrollable clipping logic +Fix ui scaling on abnormal monitors + - This is literally just a function of the settings file not being updated for different resolutions diff --git a/src/main/java/electrosphere/renderer/ui/elements/VirtualScrollable.java b/src/main/java/electrosphere/renderer/ui/elements/VirtualScrollable.java index 55a0376c..e7b2dc9d 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/VirtualScrollable.java +++ b/src/main/java/electrosphere/renderer/ui/elements/VirtualScrollable.java @@ -66,8 +66,8 @@ public class VirtualScrollable extends StandardContainerElement implements Drawa */ private boolean childIsInBounds(DrawableElement element){ boolean rVal = true; - if(element.getAbsoluteX() + scroll < 0 ||element.getAbsoluteY() + scroll > this.getHeight()){ - return false; + if(element.getAbsoluteY() + scroll < this.getAbsoluteY() || element.getAbsoluteY() + scroll > this.getHeight() + this.getAbsoluteY()){ + return false; } return rVal; }