From b13aeb99bc05bbc4daa14742b2e9bc4b379d2725 Mon Sep 17 00:00:00 2001
From: rfresh2 <89827146+rfresh2@users.noreply.github.com>
Date: Fri, 6 Oct 2023 19:57:17 -0700
Subject: [PATCH] shadow correctly

---
 .../mixin/client/MixinMapWriter.java          | 44 +------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/main/java/xaeroplus/mixin/client/MixinMapWriter.java b/src/main/java/xaeroplus/mixin/client/MixinMapWriter.java
index 2734df45..ad7f3287 100644
--- a/src/main/java/xaeroplus/mixin/client/MixinMapWriter.java
+++ b/src/main/java/xaeroplus/mixin/client/MixinMapWriter.java
@@ -13,14 +13,12 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.state.State;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.random.Random;
 import net.minecraft.world.LightType;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.WorldChunk;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -33,7 +31,6 @@
 import xaero.map.biome.BiomeColorCalculator;
 import xaero.map.biome.BiomeGetter;
 import xaero.map.biome.BlockTintProvider;
-import xaero.map.cache.BlockStateShortShapeCache;
 import xaero.map.core.XaeroWorldMapCore;
 import xaero.map.misc.CachedFunction;
 import xaero.map.misc.Misc;
@@ -42,7 +39,6 @@
 import xaeroplus.util.ChunkUtils;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Objects.nonNull;
@@ -62,18 +58,13 @@ public abstract class MixinMapWriter {
             .maximumSize(10000)
             .expireAfterWrite(5L, TimeUnit.SECONDS)
             .<Long, Long>build();
-    public long writeFreeSinceLastWrite = -1L;
-    @Shadow
-    private int X;
     @Shadow
-    private int Z;
+    public long writeFreeSinceLastWrite = -1L;
     @Shadow
     private int playerChunkX;
     @Shadow
     private int playerChunkZ;
     @Shadow
-    private int loadDistance;
-    @Shadow
     private int startTileChunkX;
     @Shadow
     private int startTileChunkZ;
@@ -82,22 +73,8 @@ public abstract class MixinMapWriter {
     @Shadow
     private int endTileChunkZ;
     @Shadow
-    private int insideX;
-    @Shadow
-    private int insideZ;
-    @Shadow
-    private long updateCounter;
-    @Shadow
-    private int caveStart;
-    @Shadow
     private int writingLayer = Integer.MAX_VALUE;
     @Shadow
-    private int writtenCaveStart = Integer.MAX_VALUE;
-    @Shadow
-    private boolean clearCachedColours;
-    @Shadow
-    private MapBlock loadingObject;
-    @Shadow
     private OverlayBuilder overlayBuilder;
     @Final
     @Shadow
@@ -106,8 +83,6 @@ public abstract class MixinMapWriter {
     @Shadow
     private BlockPos.Mutable mutableGlobalPos;
     @Shadow
-    private Random usedRandom = Random.create(0L);
-    @Shadow
     private long lastWrite = -1L;
     @Shadow
     private long lastWriteTry = -1L;
@@ -122,14 +97,7 @@ public abstract class MixinMapWriter {
     @Shadow
     private MapProcessor mapProcessor;
     @Shadow
-    private ArrayList<BlockState> buggedStates;
-    @Shadow
-    private BlockStateShortShapeCache blockStateShortShapeCache;
-    @Shadow
     private int topH;
-    @Final
-    @Shadow
-    private CachedFunction<State<?, ?>, Boolean> transparentCache;
     @Shadow
     private int firstTransparentStateY;
     @Final
@@ -141,16 +109,6 @@ public abstract class MixinMapWriter {
     private BiomeGetter biomeGetter;
     @Shadow
     private ArrayList<MapRegion> regionBuffer = new ArrayList<>();
-    @Shadow
-    private HashMap<String, Integer> textureColours;
-    @Shadow
-    private HashMap<BlockState, Integer> blockColours;
-    @Shadow
-    private long lastLayerSwitch;
-    @Shadow
-    private BlockState lastBlockStateForTextureColor = null;
-    @Shadow
-    private int lastBlockStateForTextureColorResult = -1;
 
     @Shadow
     public abstract boolean writeMap(