From 0b2bab654901788280f8279fe31803402d647f1b Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Mon, 7 Oct 2019 17:25:09 -0500
Subject: [PATCH] Clean up performance Mixins

---
 .../baritone/launch/mixins/MixinBitArray.java | 24 -------------------
 .../mixins/MixinBlockStateContainer.java      | 16 -------------
 .../baritone/utils/accessor/IBitArray.java    |  2 --
 .../utils/accessor/IBlockStateContainer.java  |  8 -------
 4 files changed, 50 deletions(-)

diff --git a/src/launch/java/baritone/launch/mixins/MixinBitArray.java b/src/launch/java/baritone/launch/mixins/MixinBitArray.java
index 9383c9aa..bece3e3b 100644
--- a/src/launch/java/baritone/launch/mixins/MixinBitArray.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBitArray.java
@@ -43,30 +43,6 @@ public abstract class MixinBitArray implements IBitArray {
     @Final
     private int arraySize;
 
-    /**
-     * why did mojang divide by 64 instead of shifting right by 6 (2^6=64)?
-     * why did mojang modulo by 64 instead of ANDing with 63?
-     * also removed validation check
-     *
-     * @author LoganDark
-     */
-    @Override
-    @Unique
-    public int getAtFast(int index) {
-        final int b = bitsPerEntry;
-        final long mev = maxEntryValue;
-        final int i = index * b;
-        final int j = i >> 6;
-        final int l = i & 63;
-        final int k = ((index + 1) * b - 1) >> 6;
-
-        if (j == k) {
-            return (int) (this.longArray[j] >>> l & mev);
-        } else {
-            return (int) ((this.longArray[j] >>> l | longArray[k] << (64 - l)) & mev);
-        }
-    }
-
     @Override
     @Unique
     public int[] toArray() {
diff --git a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java b/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
index 8c08b03f..f1cc28b9 100644
--- a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
@@ -25,8 +25,6 @@ import net.minecraft.world.chunk.BlockStateContainer;
 import net.minecraft.world.chunk.IBlockStatePalette;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(BlockStateContainer.class)
 public abstract class MixinBlockStateContainer implements IBlockStateContainer {
@@ -37,20 +35,6 @@ public abstract class MixinBlockStateContainer implements IBlockStateContainer {
     @Shadow
     protected IBlockStatePalette palette;
 
-    @Override
-    @Accessor
-    public abstract BitArray getStorage();
-
-    @Override
-    @Accessor
-    public abstract IBlockStatePalette getPalette();
-
-    @Override
-    @Unique
-    public IBlockState getFast(int index) {
-        return palette.getBlockState(((IBitArray) storage).getAtFast(index));
-    }
-
     @Override
     public IBlockState getAtPalette(int index) {
         return palette.getBlockState(index);
diff --git a/src/main/java/baritone/utils/accessor/IBitArray.java b/src/main/java/baritone/utils/accessor/IBitArray.java
index 81501036..baea5c1d 100644
--- a/src/main/java/baritone/utils/accessor/IBitArray.java
+++ b/src/main/java/baritone/utils/accessor/IBitArray.java
@@ -2,7 +2,5 @@ package baritone.utils.accessor;
 
 public interface IBitArray {
 
-    int getAtFast(int index);
-
     int[] toArray();
 }
diff --git a/src/main/java/baritone/utils/accessor/IBlockStateContainer.java b/src/main/java/baritone/utils/accessor/IBlockStateContainer.java
index 7c47a9b8..39572fc5 100644
--- a/src/main/java/baritone/utils/accessor/IBlockStateContainer.java
+++ b/src/main/java/baritone/utils/accessor/IBlockStateContainer.java
@@ -1,17 +1,9 @@
 package baritone.utils.accessor;
 
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BitArray;
-import net.minecraft.world.chunk.IBlockStatePalette;
 
 public interface IBlockStateContainer {
 
-    IBlockStatePalette getPalette();
-
-    BitArray getStorage();
-
-    IBlockState getFast(int index);
-
     IBlockState getAtPalette(int index);
 
     int[] storageArray();