Bump version to v0.5.3

Author: FxMorin

src/main/java/ca/fxco/memoryleakfix/MemoryLeakFix.java

@@ -1,9 +1,9 @@
 package ca.fxco.memoryleakfix;
 
-import io.netty.buffer.ByteBuf;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 
+import net.minecraft.network.PacketByteBuf;
 import org.spongepowered.asm.logging.ILogger;
 import org.spongepowered.asm.logging.LoggerAdapterDefault;
 import org.spongepowered.asm.mixin.MixinEnvironment;
@@ -15,7 +15,7 @@
 
 public class MemoryLeakFix implements ModInitializer {
 
-    public static final Set<ByteBuf> BUFFERS_TO_CLEAR = Collections.synchronizedSet(new HashSet<>());
+    public static final Set<PacketByteBuf> BUFFERS_TO_CLEAR = Collections.synchronizedSet(new HashSet<>());
 
     @Override
     public void onInitialize() {}

src/main/java/ca/fxco/memoryleakfix/extensions/ExtendPacketByteBuf.java

@@ -0,0 +1,5 @@
+package ca.fxco.memoryleakfix.extensions;
+
+public interface ExtendPacketByteBuf {
+    boolean isAccessible();
+}

src/main/java/ca/fxco/memoryleakfix/mixin/accessor/AbstractReferenceCountedByteBufAccessor.java src/main/java/ca/fxco/memoryleakfix/mixin/accessor/ByteBufAccessor.java

@@ -1,11 +1,11 @@
 package ca.fxco.memoryleakfix.mixin.accessor;
 
-import io.netty.buffer.AbstractReferenceCountedByteBuf;
+import io.netty.buffer.ByteBuf;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(AbstractReferenceCountedByteBuf.class)
-public interface AbstractReferenceCountedByteBufAccessor {
+@Mixin(ByteBuf.class)
+public interface ByteBufAccessor {
     @Invoker("isAccessible")
     boolean invokeIsAccessible();
 }

src/main/java/ca/fxco/memoryleakfix/mixin/customPayloadLeak/MinecraftClient_freeBufferMixin.java

@@ -1,11 +1,11 @@
 package ca.fxco.memoryleakfix.mixin.customPayloadLeak;
 
 import ca.fxco.memoryleakfix.MemoryLeakFix;
-import ca.fxco.memoryleakfix.mixin.accessor.AbstractReferenceCountedByteBufAccessor;
-import io.netty.buffer.ByteBuf;
+import ca.fxco.memoryleakfix.extensions.ExtendPacketByteBuf;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.network.PacketByteBuf;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,10 +20,8 @@ public class MinecraftClient_freeBufferMixin {
      */
 
     // Make sure that the there is a reference to release first!
-    private boolean tryRelease(ByteBuf buffer) {
-        return buffer.refCnt() == 0 &&
-                ((AbstractReferenceCountedByteBufAccessor)buffer).invokeIsAccessible() &&
-                buffer.release();
+    private boolean tryRelease(PacketByteBuf buffer) {
+        return ((ExtendPacketByteBuf)buffer).isAccessible() && buffer.release();
     }
 
 

src/main/java/ca/fxco/memoryleakfix/mixin/customPayloadLeak/PacketByteBuf_extendMixin.java

@@ -0,0 +1,23 @@
+package ca.fxco.memoryleakfix.mixin.customPayloadLeak;
+
+import ca.fxco.memoryleakfix.extensions.ExtendPacketByteBuf;
+import ca.fxco.memoryleakfix.mixin.accessor.ByteBufAccessor;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.network.PacketByteBuf;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(PacketByteBuf.class)
+public class PacketByteBuf_extendMixin implements ExtendPacketByteBuf {
+
+    @Shadow
+    @Final
+    private ByteBuf parent;
+
+
+    @Override
+    public boolean isAccessible() {
+        return ((ByteBufAccessor)this.parent).invokeIsAccessible();
+    }
+}

src/main/resources/memoryleakfix.mixins.json

@@ -7,9 +7,10 @@
     "spongePoweredLeak.MinecraftServer_loadWorldMixin"
   ],
   "client": [
-    "accessor.AbstractReferenceCountedByteBufAccessor",
+    "accessor.ByteBufAccessor",
     "customPayloadLeak.CustomPayloadS2CPacket_bufferMixin",
     "customPayloadLeak.MinecraftClient_freeBufferMixin",
+    "customPayloadLeak.PacketByteBuf_extendMixin",
     "hugeScreenshotLeak.MinecraftClient_screenshotMixin",
     "readResourcesLeak.TextureUtil_freeBufferMixin",
     "spongePoweredLeak.Main_clientLoadedMixin",