From 746faf6df6ea9d615dd2bcd421cef446d1b9f922 Mon Sep 17 00:00:00 2001
From: Wagyourtail <wagyourtail@wagyourtail.xyz>
Date: Wed, 28 Dec 2022 01:05:17 -0700
Subject: [PATCH] faster section reorder

---
 .../baritone/cache/FasterWorldScanner.java    | 48 ++++++++++++-------
 .../java/baritone/process/MineProcess.java    |  2 +-
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/main/java/baritone/cache/FasterWorldScanner.java b/src/main/java/baritone/cache/FasterWorldScanner.java
index e133f0e49..9adbf76b0 100644
--- a/src/main/java/baritone/cache/FasterWorldScanner.java
+++ b/src/main/java/baritone/cache/FasterWorldScanner.java
@@ -149,9 +149,11 @@ public enum FasterWorldScanner implements IWorldScanner {
         long chunkX = (long) pos.x << 4;
         long chunkZ = (long) pos.z << 4;
 
+        int playerSectionY = ctx.playerFeet().y >> 4;
+
         List<BlockPos> blocks = new ArrayList<>();
 
-        collectChunkSections(lookup, chunkProvider.getLoadedChunk(pos.x, pos.z), (section, isInFilter) -> {
+        collectChunkSections(lookup, chunkProvider.getLoadedChunk(pos.x, pos.z), playerSectionY, (section, isInFilter) -> {
             int yOffset = section.getYLocation();
             BitArray array = (BitArray) ((IBlockStateContainer) section.getData()).getStorage();
             collectBlockLocations(array, isInFilter, place -> blocks.add(new BlockPos(
@@ -165,26 +167,40 @@ public enum FasterWorldScanner implements IWorldScanner {
 
 
 
-    private void collectChunkSections(BlockOptionalMetaLookup lookup, Chunk chunk, BiConsumer<ExtendedBlockStorage, boolean[]> consumer) {
-        for (ExtendedBlockStorage section : chunk.getBlockStorageArray()) {
-            if (section == null || section.isEmpty()) {
-                continue;
+    private void collectChunkSections(BlockOptionalMetaLookup lookup, Chunk chunk, int playerSection, BiConsumer<ExtendedBlockStorage, boolean[]> consumer) {
+        // iterate over sections relative to player
+        ExtendedBlockStorage[] sections = chunk.getBlockStorageArray();
+        int l = sections.length;
+        int i = playerSection - 1;
+        int j = playerSection;
+        for (; i >= 0 || j < l; ++j, --i) {
+            if (j < l) {
+                visitSection(lookup, sections[j], consumer);
             }
-
-            BlockStateContainer sectionContainer = section.getData();
-            //this won't work if the PaletteStorage is of the type EmptyPaletteStorage
-            if (((IBlockStateContainer) sectionContainer).getStorage() == null) {
-                continue;
+            if (i >= 0) {
+                visitSection(lookup, sections[i], consumer);
             }
-
-            boolean[] isInFilter = getIncludedFilterIndices(lookup, ((IBlockStateContainer) sectionContainer).getPalette());
-            if (isInFilter.length == 0) {
-                continue;
-            }
-            consumer.accept(section, isInFilter);
         }
     }
 
+    private void visitSection(BlockOptionalMetaLookup lookup, ExtendedBlockStorage section, BiConsumer<ExtendedBlockStorage, boolean[]> consumer) {
+        if (section == null || section.isEmpty()) {
+            return;
+        }
+
+        BlockStateContainer sectionContainer = section.getData();
+        //this won't work if the PaletteStorage is of the type EmptyPaletteStorage
+        if (((IBlockStateContainer) sectionContainer).getStorage() == null) {
+            return;
+        }
+
+        boolean[] isInFilter = getIncludedFilterIndices(lookup, ((IBlockStateContainer) sectionContainer).getPalette());
+        if (isInFilter.length == 0) {
+            return;
+        }
+        consumer.accept(section, isInFilter);
+    }
+
     private boolean[] getIncludedFilterIndices(BlockOptionalMetaLookup lookup, IBlockStatePalette palette) {
         boolean commonBlockFound = false;
         ObjectIntIdentityMap<IBlockState> paletteMap = getPalette(palette);
diff --git a/src/main/java/baritone/process/MineProcess.java b/src/main/java/baritone/process/MineProcess.java
index 807dbc303..137313de9 100644
--- a/src/main/java/baritone/process/MineProcess.java
+++ b/src/main/java/baritone/process/MineProcess.java
@@ -54,7 +54,7 @@ import static baritone.api.pathing.movement.ActionCosts.COST_INF;
  */
 public final class MineProcess extends BaritoneProcessHelper implements IMineProcess {
 
-    private static final int ORE_LOCATIONS_COUNT = 64;
+    private static final int ORE_LOCATIONS_COUNT = 32;
 
     private BlockOptionalMetaLookup filter;
     private List<BlockPos> knownOreLocations;