Skip to content

Commit f63e49e

Browse files
committed
update inv skill list to adapt to other widgets
1 parent 98a62df commit f63e49e

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ projectid_ftbl = 404465
3333
#projectid_ftbf = 309674 #no longer required by FTBQ
3434
projectid_arch = 419699
3535

36-
version_ftbq = 5543248
37-
version_ftbt = 5448371
38-
version_ftbl = 5583834
36+
version_ftbq = 7429016
37+
version_ftbt = 7369021
38+
version_ftbl = 7420412
3939
#version_ftbf = 4728209
40-
version_arch = 5553800
40+
version_arch = 5786327
4141

4242
#CraftTweaker
4343
ct_version = 21.0.5

src/main/java/harmonised/pmmo/client/events/ScreenHandler.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import harmonised.pmmo.config.Config;
99
import harmonised.pmmo.util.Reference;
1010
import net.minecraft.client.gui.components.AbstractWidget;
11+
import net.minecraft.client.gui.components.events.GuiEventListener;
1112
import net.minecraft.client.gui.screens.Screen;
1213
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
1314
import net.neoforged.api.distmarker.Dist;
@@ -23,7 +24,11 @@ public static void onScreenInit(ScreenEvent.Init.Post event) {
2324
Screen screen = event.getScreen();
2425

2526
if (screen instanceof InventoryScreen) {
26-
CollapsingPanel panel = new CollapsingPanel(0, 0, 130, screen.height, false);
27+
int y = event.getListenersList().stream()
28+
.filter(listener -> listener.getRectangle().left() < 130)
29+
.map(gel -> gel.getRectangle().bottom())
30+
.max(Integer::compareTo).orElse(0);
31+
CollapsingPanel panel = new CollapsingPanel(0, y, 130, screen.height, false);
2732
DetailScroll scroll = new DetailScroll(0, 0, 103, screen.height) {
2833
@Override protected boolean scrollbarVisible() {return false;}
2934
};

0 commit comments

Comments
 (0)