Fix ender chest looting and add gapple looting

Author: mankool0

src/main/java/baritone/behavior/highway/state/LootEnderChestPlaceLocPrep.java

@@ -40,6 +40,9 @@ public void handle(HighwayContext context) {
             return;
         }
 
+        context.setRepeatCheck(false);
+        context.resetTimer();
+
         Vec3 curPos = new Vec3(context.playerContext().playerFeet().getX() + (7 * -context.highwayDirection().getX()), context.playerContext().playerFeet().getY(), context.playerContext().playerFeet().getZ() + (7 * -context.highwayDirection().getZ())); // Go back a bit just in case
         Vec3 direction = new Vec3(context.highwayDirection().getX(), context.highwayDirection().getY(), context.highwayDirection().getZ());
 

src/main/java/baritone/behavior/highway/state/LootingLootEnderChestEnderChests.java

@@ -43,24 +43,15 @@ public void handle(HighwayContext context) {
             int enderShulksLooted = context.lootShulkerChestSlot(ShulkerType.EnderChest);
             if (enderShulksLooted > 0) {
                 Helper.HELPER.logDirect("Looted " + enderShulksLooted + " ender chest shulker");
-                context.setRepeatCheck(false);
             } else {
                 Helper.HELPER.logDirect("No more ender chest shulkers. Rolling with what we have.");
                 context.transitionTo(HighwayState.LootingLootEnderChestGapples);
                 context.setEnderChestHasEnderShulks(false);
-                context.playerContext().player().closeContainer();
             }
 
-            //if (getItemCountInventory(Item.getId(Items.AIR)) == 0) {
-            //    Helper.HELPER.logDirect("No space for ender chest shulkers. Rolling with what we have.");
-            //    currentState = State.LootingLootEnderChestGapples;
-            //    ctx.player().closeContainer();
-            //}
-
             context.resetTimer();
         } else {
             context.transitionTo(HighwayState.LootingLootEnderChestGapples);
-            context.playerContext().player().closeContainer();
         }
     }
 }

src/main/java/baritone/behavior/highway/state/LootingLootEnderChestGapples.java

@@ -17,9 +17,13 @@
 
 package baritone.behavior.highway.state;
 
+import baritone.api.utils.Helper;
 import baritone.behavior.highway.HighwayContext;
 import baritone.behavior.highway.State;
 import baritone.behavior.highway.enums.HighwayState;
+import net.minecraft.client.gui.screens.inventory.ContainerScreen;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items;
 
 public class LootingLootEnderChestGapples extends State {
     public LootingLootEnderChestGapples(HighwayState state) {
@@ -28,7 +32,29 @@ public LootingLootEnderChestGapples(HighwayState state) {
 
     @Override
     public void handle(HighwayContext context) {
-        // TODO: Finish this
-        context.transitionTo(HighwayState.Nothing);
+        if (context.timer() < 40) {
+            return;
+        }
+
+        if (!(context.playerContext().minecraft().screen instanceof ContainerScreen)) {
+            context.transitionTo(HighwayState.OpeningLootEnderChest);
+            return;
+        }
+
+        if (context.getItemCountInventory(Item.getId(Items.ENCHANTED_GOLDEN_APPLE)) < context.settings().highwayGapplesToHave.value) {
+            int gapplesLooted = context.lootGappleChestSlot();
+            if (gapplesLooted > 0) {
+                Helper.HELPER.logDirect("Looted " + gapplesLooted + " gapples");
+            } else {
+                Helper.HELPER.logDirect("No more gapples. Rolling with what we have.");
+                context.transitionTo(HighwayState.Nothing);
+                context.playerContext().player().closeContainer();
+            }
+
+            context.resetTimer();
+        } else {
+            context.transitionTo(HighwayState.Nothing);
+            context.playerContext().player().closeContainer();
+        }
     }
 }

src/main/java/baritone/behavior/highway/state/LootingLootEnderChestPicks.java

@@ -43,18 +43,12 @@ public void handle(HighwayContext context) {
             int picksShulksLooted = context.lootShulkerChestSlot(context.picksToUse());
             if (picksShulksLooted > 0) {
                 Helper.HELPER.logDirect("Looted " + picksShulksLooted + " pickaxe shulker");
-                context.setRepeatCheck(false);
             } else {
                 Helper.HELPER.logDirect("No more pickaxe shulkers. Rolling with what we have.");
                 context.transitionTo(HighwayState.LootingLootEnderChestEnderChests);
                 context.setEnderChestHasPickShulks(false);
             }
 
-            //if (getItemCountInventory(Item.getId(Items.AIR)) == 0) {
-            //    Helper.HELPER.logDirect("No space for pickaxe shulkers. Rolling with what we have.");
-            //    currentState = State.LootingLootEnderChestEnderChests;
-            //}
-
             context.resetTimer();
         } else {
             context.transitionTo(HighwayState.LootingLootEnderChestEnderChests);