diff options
| author | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-12-21 18:36:37 +0200 |
|---|---|---|
| committer | Juuxel <6596629+Juuxel@users.noreply.github.com> | 2020-12-21 18:36:37 +0200 |
| commit | 1a5d29ec80508226df942746e6629d1f276c57be (patch) | |
| tree | b1b0e541e8c297cb132d2eae2b472cab78d2c120 | |
| parent | ea894bba3b8056740af61635139023ccf0756ded (diff) | |
| download | LibGui-3.3.2.tar.gz LibGui-3.3.2.tar.bz2 LibGui-3.3.2.zip | |
(Hackily) Fix bug with REI overlapping with LibGui screens3.3.2
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/gradle.properties b/gradle.properties index 0779317..98d9cff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.10.8 # Mod Properties - mod_version = 3.3.1 + mod_version = 3.3.2 maven_group = io.github.cottonmc archives_base_name = LibGui diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java index 6ae53d0..370bb68 100644 --- a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java +++ b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java @@ -97,8 +97,12 @@ public class CottonInventoryScreen<T extends SyncedGuiDescription> extends Handl clearPeers(); basePanel.validate(description); - backgroundWidth = basePanel.getWidth(); - backgroundHeight = basePanel.getHeight(); + // This is needed for REI; otherwise it'll overlap. + // 8 = the padding of BackgroundPainter.VANILLA + int padding = 2 * 8; // TODO: This is awful and bad and should be removed ASAP + + backgroundWidth = basePanel.getWidth() + padding; + backgroundHeight = basePanel.getHeight() + padding; //DEBUG if (backgroundWidth<16) backgroundWidth=300; @@ -106,8 +110,8 @@ public class CottonInventoryScreen<T extends SyncedGuiDescription> extends Handl } if (!description.isFullscreen()) { - x = (width / 2) - (backgroundWidth / 2); - y = (height / 2) - (backgroundHeight / 2); + x = (screenWidth / 2) - (backgroundWidth / 2); + y = (screenHeight / 2) - (backgroundHeight / 2); titleX = 0; titleY = 0; } else { |