fix AutoSkipBarrier (Dutch07)

udu3324 · Jun 12, 2023 · 31f0800 · 31f0800
1 parent affc849
commit 31f0800
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 29 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.parallel=true
 	loader_version=0.14.17
 
 # Mod Properties
-	mod_version = 1.2.3
+	mod_version = 1.2.4
 	maven_group = com.udu3324
 	archives_base_name = poinpow
 

diff --git a/src/main/java/com/udu3324/poinpow/utils/AutoSkipBarrier.java b/src/main/java/com/udu3324/poinpow/utils/AutoSkipBarrier.java
@@ -6,6 +6,7 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+// ty for contributing https://github.com/DutchO7 !!
 public class AutoSkipBarrier {
     public static String name = "auto_skip_barrier";
     public static String description = "Auto-skips the ads when joining free sub-servers/minehut.";
@@ -19,49 +20,36 @@ public static void rename() {
 
         new Thread(() -> {
             try {
+                int tries = 0;
                 for (int i = 0; i < 3000; i += 10) {
                     Thread.sleep(i);
 
                     MinecraftClient client = MinecraftClient.getInstance();
+
                     // return if player hasn't loaded in it
                     if (client.player == null) return;
 
-                    // ignore creative mode
-                    if (client.player.getAbilities().creativeMode) break;
-
-                    ItemStack items = client.player.getInventory().getStack(0);
-                    if (items.getName().getString().equals("Right Click To Skip")) {
-                        Poinpow.log.info("Auto-skipping world transition");
-
-                        //select the slot
-                        client.player.getInventory().selectedSlot = 0;
-
-                        if (client.interactionManager == null) return;
+                    if (client.interactionManager == null) return;
 
-                        //right click
-                        client.interactionManager.interactItem(client.player, client.player.getActiveHand());
-                        for (int e = 0; e < 1500; e += 10) {
-                            Thread.sleep(i);
-
-                            //break if item is gone
-                            items = client.player.getInventory().getStack(0);
-                            if (!items.getName().getString().equals("Right Click To Skip")) break;
-
-                            //if (client.player == null) break;
-
-                            if (client.player.getInventory().selectedSlot == 0)
-                                client.player.getInventory().selectedSlot = 1;
-                            else
-                                client.player.getInventory().selectedSlot = 0;
+                    ItemStack items;
+                    for (int itemIterator = 0; itemIterator < 9; itemIterator++) {
+                        items = client.player.getInventory().getStack(itemIterator);
+                        if (items.getName().getString().equals("Right click to continue")) {
+                            // set item slot to wherever a item with this name is
+                            client.player.getInventory().selectedSlot = itemIterator;
 
+                            //send right click
                             client.interactionManager.interactItem(client.player, client.player.getActiveHand());
+                        } else {
+                            tries++;
                         }
-                        break;
                     }
+
+                    if (tries > 90) break;
                 }
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }).start();
     }
-}
+}