Fixed waypoint manager bug, added top/bottom buttons

Author: cev-api

src/main/java/net/wurstclient/clickgui/screens/WaypointEditScreen.java

@@ -56,6 +56,8 @@ public final class WaypointEditScreen extends Screen
 
 	private int dimIndex;
 	private ButtonWidget dimButton;
+	// Draft storage for dimension selection when navigating to child screens
+	private Integer draftDimIndex;
 
 	private static final String[] ICON_KEYS =
 		new String[]{"square", "circle", "triangle", "star", "diamond", "skull",
@@ -150,6 +152,13 @@ protected void init()
 					dimIndex = i;
 					break;
 				}
+			// If we have a draft index (from opening a child screen), restore
+			// it
+			if(draftDimIndex != null)
+			{
+				dimIndex = draftDimIndex;
+				draftDimIndex = null;
+			}
 			dimButton = ButtonWidget
 				.builder(Text.literal("Dimension: " + dims[dimIndex].name()),
 					b -> {
@@ -249,6 +258,9 @@ protected void init()
 					draftX = xField.getText();
 					draftY = yField.getText();
 					draftZ = zField.getText();
+					// Preserve selected dimension index so it isn't lost when
+					// the child color screen re-initializes this screen.
+					draftDimIndex = dimIndex;
 					client.setScreen(new EditColorScreen(this, colorSetting));
 				}).dimensions(x, y, cw - 24, 20).build();
 			addDrawableChild(colorButton);
@@ -309,6 +321,8 @@ public void resize(net.minecraft.client.MinecraftClient client, int width,
 			draftX = xField.getText();
 			draftY = yField.getText();
 			draftZ = zField.getText();
+			// Preserve dimension selection across resize/child screens
+			draftDimIndex = dimIndex;
 		}
 		init(client, width, height);
 	}

src/main/java/net/wurstclient/clickgui/screens/WaypointsScreen.java

@@ -196,12 +196,23 @@ protected void init()
 		// Scroll buttons (▲ / ▼) positioned just to the right of the 300px list
 		// area
 		int arrowX = x + 305; // a little to the right of the list
+		// "Top" button above the up-arrow that jumps directly to the top
+		addDrawableChild(ButtonWidget.builder(Text.literal("▲▲"), b -> {
+			scrollToTop();
+		}).dimensions(arrowX + 20, Math.max(0, viewportTop - 24), 20, 20)
+			.build());
+		// Up arrow (move up by a few rows)
 		addDrawableChild(ButtonWidget.builder(Text.literal("▲"), b -> {
 			scrollBy(-ROW_HEIGHT * 3);
-		}).dimensions(arrowX, viewportTop, 20, 20).build());
+		}).dimensions(arrowX + 20, viewportTop, 20, 20).build());
+		// Down arrow (move down by a few rows)
 		addDrawableChild(ButtonWidget.builder(Text.literal("▼"), b -> {
 			scrollBy(ROW_HEIGHT * 3);
-		}).dimensions(arrowX, viewportBottom - 20, 20, 20).build());
+		}).dimensions(arrowX + 20, viewportBottom - 20, 20, 20).build());
+		// "Bottom" button below the down-arrow that jumps directly to bottom
+		addDrawableChild(ButtonWidget.builder(Text.literal("▼▼"), b -> {
+			scrollToBottom();
+		}).dimensions(arrowX + 20, viewportBottom, 20, 20).build());
 
 		addDrawableChild(ButtonWidget
 			.builder(Text.literal("Back"), b -> client.setScreen(prev))
@@ -405,4 +416,17 @@ void saveNow()
 	{
 		manager.save(resolveWorldId());
 	}
+	
+	private void scrollToTop()
+	{
+		scroll = 0;
+	}
+	
+	private void scrollToBottom()
+	{
+		int contentHeight = rows.size() * ROW_HEIGHT;
+		int maxScroll =
+			Math.max(0, contentHeight - (viewportBottom - viewportTop));
+		scroll = maxScroll;
+	}
 }