Updated AutoDisenchant, Waypoint Manager, Bug fix Waypoints, Gradle v5

Author: cev-api

.github/workflows/auto_snapshot_update.yml

@@ -51,7 +51,7 @@ jobs:
       run: chmod +x gradlew
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v5
       with:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"

.github/workflows/dependency_graph.yml

@@ -34,7 +34,7 @@ jobs:
       run: chmod +x gradlew
 
     - name: Generate and submit dependency graph
-      uses: gradle/actions/dependency-submission@v4
+      uses: gradle/actions/dependency-submission@v5
       with:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"

.github/workflows/gradle.yml

@@ -47,7 +47,7 @@ jobs:
       run: chmod +x gradlew
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v5
       with:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"

.github/workflows/publish.yml

@@ -57,7 +57,7 @@ jobs:
       run: chmod +x gradlew
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v5
       with:
         build-scan-publish: true
         build-scan-terms-of-use-url: "https://gradle.com/help/legal-terms-of-use"

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

@@ -8,6 +8,8 @@
 package net.wurstclient.clickgui.screens;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
@@ -47,6 +49,21 @@ private static final class RowWidgets
 
 	private final ArrayList<RowWidgets> rows = new ArrayList<>();
 
+	// Persisted scroll per-world+dimension so returning keeps the same
+	// position even if a new screen instance was created.
+	private static final Map<String, Integer> savedScrolls = new HashMap<>();
+	
+	private void saveScrollState()
+	{
+		try
+		{
+			String key = resolveWorldId() + ":"
+				+ (filterDim == null ? "ALL" : filterDim.name());
+			savedScrolls.put(key, scroll);
+		}catch(Exception ignored)
+		{}
+	}
+	
 	public WaypointsScreen(Screen prev, WaypointsManager manager)
 	{
 		super(Text.literal("Waypoints"));
@@ -61,7 +78,9 @@ protected void init()
 		int x = this.width / 2 - 150;
 
 		rows.clear();
-		scroll = 0;
+		// preserve scroll so returning to this screen or refreshing doesn't
+		// jump the list back to the top
+		// scroll = 0;
 
 		// Initialize default filter to current world if not set
 		if(filterDim == null)
@@ -149,6 +168,17 @@ protected void init()
 		viewportTop = listStartY;
 		viewportBottom = this.height - 36; // a bit above back button
 
+		// Try to restore a previously saved scroll position for this world+dim
+		try
+		{
+			String key = resolveWorldId() + ":"
+				+ (filterDim == null ? "ALL" : filterDim.name());
+			Integer s = savedScrolls.get(key);
+			if(s != null)
+				scroll = s;
+		}catch(Exception ignored)
+		{}
+		
 		for(int i = 0; i < cachedList.size(); i++)
 		{
 			Waypoint w = cachedList.get(i);
@@ -193,6 +223,14 @@ protected void init()
 			rows.add(rw);
 		}
 
+		// Clamp scroll so it stays within valid bounds after rebuilding the
+		// list
+		int contentHeight = rows.size() * ROW_HEIGHT;
+		int maxScroll =
+			Math.max(0, contentHeight - (viewportBottom - viewportTop));
+		scroll = Math.max(0, Math.min(scroll, maxScroll));
+		// Persist the (possibly adjusted) scroll position
+		saveScrollState();
 		// Scroll buttons (▲ / ▼) positioned just to the right of the 300px list
 		// area
 		int arrowX = x + 305; // a little to the right of the list
@@ -225,6 +263,7 @@ private void scrollBy(int dy)
 		int maxScroll =
 			Math.max(0, contentHeight - (viewportBottom - viewportTop));
 		scroll = Math.max(0, Math.min(scroll + dy, maxScroll));
+		saveScrollState();
 	}
 
 	@Override
@@ -420,6 +459,7 @@ void saveNow()
 	private void scrollToTop()
 	{
 		scroll = 0;
+		saveScrollState();
 	}
 
 	private void scrollToBottom()
@@ -428,5 +468,6 @@ private void scrollToBottom()
 		int maxScroll =
 			Math.max(0, contentHeight - (viewportBottom - viewportTop));
 		scroll = maxScroll;
+		saveScrollState();
 	}
 }

src/main/java/net/wurstclient/hacks/AutoDisenchantHack.java

@@ -168,8 +168,11 @@ private void disenchantSlot(GrindstoneScreen screen, int slotIndex)
 
 	private boolean canDisenchant(ItemStack stack)
 	{
-		if(!stack.hasEnchantments())
-			return false;
+		// if(!stack.hasEnchantments())
+		// return false;
+		
+		// Use EnchantmentHelper instead of ItemStack::hasEnchantments
+		// because the latter returns false for enchanted books.
 
 		var enchantments =
 			EnchantmentHelper.getEnchantments(stack).getEnchantmentEntries();

src/main/java/net/wurstclient/hacks/WaypointsHack.java

@@ -311,7 +311,10 @@ public void onReceivedMessage(ChatInputEvent event)
 			|| lower.contains("earned the advancement")
 			|| lower.contains("has made the advancement")
 			|| lower.contains("has made the achievement")
-			|| (lower.contains("advancement") && lower.contains("completed")))
+			|| (lower.contains("advancement") && lower.contains("completed"))
+			|| (lower.contains("completed")
+				&& (lower.contains("challenge") || lower.contains("advancement")
+					|| lower.contains("achievement"))))
 			return;
 
 		long now = System.currentTimeMillis();
@@ -910,8 +913,10 @@ private int getBossBarBottom(DrawContext context)
 		{
 			if(y >= maxY)
 				return maxY;
-			y += 10; // default 19px height, but use 10px as it looks better (at
-						// least for me)
+			y += 10; // default is 19px height, but using 10px as it looks nicer, however, 
+					// when there's two boss bars it will overlap
+
+						
 		}
 		return Math.min(y, maxY);
 	}