Merge remote-tracking branch 'origin/main'

ViaVersion · Dec 27, 2023 · be5a95b · be5a95b
2 parents dc61e98 + f8cc296
commit be5a95b
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 161 deletions.
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IBlobCache.java b/src/main/java/de/florianmichael/viafabricplus/injection/access/IBlobCache.java
diff --git a/.../java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java b/.../java/de/florianmichael/viafabricplus/injection/mixin/base/integration/MixinDebugHud.java
@@ -19,26 +19,20 @@
 
 package de.florianmichael.viafabricplus.injection.mixin.base.integration;
 
-import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import de.florianmichael.viafabricplus.fixes.tracker.JoinGameDataTracker;
 import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin;
-import de.florianmichael.viafabricplus.injection.access.IBlobCache;
 import de.florianmichael.viafabricplus.injection.access.IChunkTracker;
 import de.florianmichael.viafabricplus.injection.access.IRakSessionCodec;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
-import de.florianmichael.viafabricplus.protocolhack.impl.provider.viabedrock.ViaFabricPlusBlobCacheProvider;
 import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
 import de.florianmichael.viafabricplus.util.ChatUtil;
-import de.florianmichael.viafabricplus.util.StringUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.hud.DebugHud;
 import net.minecraft.util.Formatting;
 import net.raphimc.viabedrock.protocol.data.enums.bedrock.ServerMovementModes;
-import net.raphimc.viabedrock.protocol.providers.BlobCacheProvider;
-import net.raphimc.viabedrock.protocol.storage.BlobCache;
 import net.raphimc.viabedrock.protocol.storage.ChunkTracker;
 import net.raphimc.viabedrock.protocol.storage.GameSessionStorage;
 import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.storage.ExtensionProtocolMetadataStorage;
@@ -122,16 +116,6 @@ public void addViaFabricPlusInformation(CallbackInfoReturnable<List<String>> cir
         if (joinGameDataTracker != null) {
             information.add("World Seed: " + joinGameDataTracker.getSeed());
         }
-        final BlobCache blobCache = userConnection.get(BlobCache.class);
-        if (blobCache != null) {
-            final var blobCacheProvider = (ViaFabricPlusBlobCacheProvider) Via.getManager().getProviders().get(BlobCacheProvider.class);
-
-            final long totalSize = blobCacheProvider.getSize();
-            final int blobCount = blobCacheProvider.getBlobs().size();
-            final int pendingCount = ((IBlobCache) blobCache).viaFabricPlus$getPending().size();
-
-            information.add("Blob Cache: S: " + StringUtil.formatBytes(totalSize) + ", C: " + blobCount + ", P: " + pendingCount);
-        }
         final ChunkTracker chunkTracker = userConnection.get(ChunkTracker.class);
         if (chunkTracker != null) {
             final int subChunkRequests = ((IChunkTracker) chunkTracker).viaFabricPlus$getSubChunkRequests();

diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viabedrock/MixinBlobCache.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/viabedrock/MixinBlobCache.java
diff --git a/...l/viafabricplus/protocolhack/impl/provider/viabedrock/ViaFabricPlusBlobCacheProvider.java b/...l/viafabricplus/protocolhack/impl/provider/viabedrock/ViaFabricPlusBlobCacheProvider.java
diff --git a/...a/de/florianmichael/viafabricplus/protocolhack/impl/viaversion/ViaFabricPlusVLLoader.java b/...a/de/florianmichael/viafabricplus/protocolhack/impl/viaversion/ViaFabricPlusVLLoader.java
@@ -27,13 +27,11 @@
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.provider.PlayerAbilitiesProvider;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.provider.AckSequenceProvider;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
-import de.florianmichael.viafabricplus.protocolhack.impl.provider.viabedrock.ViaFabricPlusBlobCacheProvider;
 import de.florianmichael.viafabricplus.protocolhack.impl.provider.viabedrock.ViaFabricPlusNettyPipelineProvider;
 import de.florianmichael.viafabricplus.protocolhack.impl.provider.viabedrock.ViaFabricPlusTransferProvider;
 import de.florianmichael.viafabricplus.protocolhack.impl.provider.vialegacy.*;
 import de.florianmichael.viafabricplus.protocolhack.impl.provider.viaversion.*;
 import de.florianmichael.viafabricplus.settings.impl.GeneralSettings;
-import net.raphimc.viabedrock.protocol.providers.BlobCacheProvider;
 import net.raphimc.viabedrock.protocol.providers.NettyPipelineProvider;
 import net.raphimc.viabedrock.protocol.providers.TransferProvider;
 import net.raphimc.vialegacy.protocols.alpha.protocolb1_0_1_1_1toa1_2_3_5_1_2_6.providers.AlphaInventoryProvider;
@@ -70,7 +68,6 @@ public void load() {
         }
 
         providers.use(NettyPipelineProvider.class, new ViaFabricPlusNettyPipelineProvider());
-        providers.use(BlobCacheProvider.class, new ViaFabricPlusBlobCacheProvider());
         providers.use(TransferProvider.class, new ViaFabricPlusTransferProvider());
     }
 

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
@@ -191,7 +191,6 @@
     "fixes.viaversion.MixinWorldPackets1_17",
     "fixes.viaversion.MixinWorldPackets1_19",
     "viabedrock.MixinBedrockProtocol",
-    "viabedrock.MixinBlobCache",
     "viabedrock.MixinJoinPackets",
     "vialegacy.MixinExtensionProtocolMetadataStorage",
     "vialegacy.MixinViaLegacyConfig",