Fix scissoring of list widget

Author: lowercasebtw

src/main/java/btw/lowercase/optiboxes/screen/SkyLayerListScreen.java

@@ -1,5 +1,7 @@
 package btw.lowercase.optiboxes.screen;
 
+import btw.lowercase.optiboxes.screen.widget.Gidget;
+import btw.lowercase.optiboxes.screen.widget.ScrollableList;
 import btw.lowercase.optiboxes.screen.widget.SimpleButton;
 import btw.lowercase.optiboxes.screen.widget.Text;
 import btw.lowercase.optiboxes.skybox.OptiFineSkyLayer;
@@ -8,6 +10,9 @@
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class SkyLayerListScreen extends DebugScreen {
     private final OptiFineSkybox skybox;
 
@@ -20,21 +25,24 @@ public SkyLayerListScreen(Screen parent, OptiFineSkybox skybox) {
     protected void init() {
         super.init();
 
-        this.gidgets.add(new Text.Builder(this.title, this.width / 2, 12).centered().build(this.font));
-        this.gidgets.add(new Text.Builder(this.skybox.getLayers().size() + " layers", this.width / 2, 12 + this.font.lineHeight).centered().build(this.font));
+        this.gidgets.add(new Text.Builder(this.title.getString() + " (" + this.skybox.getLayers().size() + " layer(s)" + ")", this.width / 2, 12).centered().build(this.font));
 
+        List<Gidget> scrollableListGidgets = new ArrayList<>();
         int index = 0;
         for (OptiFineSkyLayer skyLayer : this.skybox.getLayers()) {
             int cidx = index;
-            this.gidgets.add(new SimpleButton(
+            scrollableListGidgets.add(new SimpleButton(
                     Component.literal(index + " - " + skyLayer.source()),
                     (this.width / 2) - (SimpleButton.DEFAULT_WIDTH / 2),
-                    36 + ((SimpleButton.DEFAULT_HEIGHT + SimpleButton.DEFAULT_PADDING) * index),
+                    ((SimpleButton.DEFAULT_HEIGHT + SimpleButton.DEFAULT_PADDING) * index),
                     (button) -> this.minecraft.setScreen(new SkyLayerInfoScreen(this, skyLayer, cidx))
             ));
             index++;
         }
 
+        int pad = 20 + font.lineHeight;
+        this.gidgets.add(new ScrollableList(scrollableListGidgets, 0, pad, this.width, this.height - pad - SimpleButton.DEFAULT_HEIGHT - 8));
+
         this.gidgets.add(new SimpleButton(
                 CommonComponents.GUI_BACK,
                 (this.width / 2) - (SimpleButton.DEFAULT_WIDTH / 2),

src/main/java/btw/lowercase/optiboxes/screen/SkyboxListScreen.java

@@ -34,12 +34,14 @@ protected void init() {
             scrollableListGidgets.add(new SimpleButton(
                     Component.literal(skybox.getWorldResourceKey().identifier().toString()),
                     (this.width / 2) - (SimpleButton.DEFAULT_WIDTH / 2),
-                    30 + ((SimpleButton.DEFAULT_HEIGHT + SimpleButton.DEFAULT_PADDING) * index),
+                    ((SimpleButton.DEFAULT_HEIGHT + SimpleButton.DEFAULT_PADDING) * index),
                     (button) -> this.minecraft.setScreen(new SkyLayerListScreen(this, skybox))
             ));
             index++;
         }
-        this.gidgets.add(new ScrollableList(scrollableListGidgets, 0, 16, this.width, this.height - 32));
+
+        int pad = 20 + font.lineHeight;
+        this.gidgets.add(new ScrollableList(scrollableListGidgets, 0, pad, this.width, this.height - pad - SimpleButton.DEFAULT_HEIGHT - 8));
 
         this.gidgets.add(new SimpleButton(
                 CommonComponents.GUI_DONE,

src/main/java/btw/lowercase/optiboxes/screen/widget/ScrollableList.java

@@ -1,49 +1,55 @@
 package btw.lowercase.optiboxes.screen.widget;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.util.ARGB;
 
 import java.util.List;
 
 public class ScrollableList extends Gidget {
     private final List<Gidget> gidgets;
+    private double scrollY;
 
     public ScrollableList(List<Gidget> gidgets, int x, int y, int width, int height) {
         super(x, y, width, height);
         this.gidgets = gidgets;
+        this.scrollY = 0.0F;
         for (Gidget gidget : this.gidgets) {
-            gidget.reposition(this.x() + gidget.x(), this.y() + gidget.y());
+            gidget.reposition(this.x() + gidget.x(), this.y() + gidget.y() + 4);
         }
     }
 
     @Override
     public void render(GuiGraphics guiGraphics, int mouseX, int mouseY) {
         this.renderBackground(guiGraphics);
-        RenderSystem.enableScissorForRenderTypeDraws(this.x(), this.y(), this.width(), this.height());
+        guiGraphics.enableScissor(this.x(), this.y(), this.x() + this.width(), this.y() + this.height());
         for (Gidget gidget : this.gidgets) {
             gidget.render(guiGraphics, mouseX, mouseY);
         }
-        RenderSystem.disableScissorForRenderTypeDraws();
+        guiGraphics.disableScissor();
     }
 
     @Override
     public void renderBackground(GuiGraphics guiGraphics) {
-
+        guiGraphics.fill(this.x(), this.y(), this.x() + this.width(), this.y() + this.height(), ARGB.color(0.3F, 0));
+        guiGraphics.hLine(this.x(), this.x() + this.width(), this.y(), ARGB.color(0.7F, 0));
+        guiGraphics.hLine(this.x(), this.x() + this.width(), this.y() + this.height(), ARGB.color(0.7F, 0));
     }
 
     @Override
     public void onMouseMove(double mouseX, double mouseY) {
         super.onMouseMove(mouseX, mouseY);
         for (Gidget gidget : this.gidgets) {
-            gidget.onMouseMove(mouseX, mouseY);
+            if (this.isInside(mouseX, mouseY)) {
+                gidget.onMouseMove(mouseX, mouseY);
+            }
         }
     }
 
     @Override
     public void onMouseClicked(double mouseX, double mouseY) {
         super.onMouseClicked(mouseX, mouseY);
         for (Gidget gidget : this.gidgets) {
-            if (gidget.isInside(mouseX, mouseY)) {
+            if (this.isInside(mouseX, mouseY) && gidget.isInside(mouseX, mouseY)) {
                 gidget.onMouseClicked(mouseX, mouseY);
             }
         }