memory leak fix

Author: beanbag44

src/main/kotlin/com/lambda/interaction/request/breaking/BreakInfo.kt

@@ -28,7 +28,6 @@ import com.lambda.interaction.request.breaking.BreakInfo.BreakType.Secondary
 import com.lambda.interaction.request.breaking.BreakManager.calcBreakDelta
 import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
-import com.lambda.util.OneSetPerTick
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.client.network.ClientPlayerInteractionManager
 import net.minecraft.client.world.ClientWorld
@@ -48,25 +47,23 @@ data class BreakInfo(
 
     // Pre Processing
     var shouldProgress = false
-    var rebreakPotential by OneSetPerTick(value = RebreakHandler.RebreakPotential.None, throwOnLimitBreach = true).linkLifetime()
-    var swapInfo by OneSetPerTick(value = SwapInfo.EMPTY, throwOnLimitBreach = true).linkLifetime()
-    var swapStack: ItemStack by OneSetPerTick(ItemStack.EMPTY, true).linkLifetime()
+    var rebreakPotential = RebreakHandler.RebreakPotential.None
+    var swapInfo = SwapInfo.EMPTY
+    var swapStack: ItemStack = ItemStack.EMPTY
 
     // BreakInfo Specific
-    var updatedThisTick by OneSetPerTick(false, resetAfterTick = true).apply { set(true) }.linkLifetime()
-    var updatedPreProcessingThisTick by OneSetPerTick(value = false, throwOnLimitBreach = true, resetAfterTick = true).linkLifetime()
-    var progressedThisTick by OneSetPerTick(value = false, throwOnLimitBreach = true, resetAfterTick = true).linkLifetime()
+    var updatedThisTick = true
+    var updatedPreProcessingThisTick = false
+    var progressedThisTick = false
 
     // Processing
     var breaking = false
     var abandoned = false
-    var breakingTicks by OneSetPerTick(0, true).linkLifetime()
-    var soundsCooldown by OneSetPerTick(0f, true).linkLifetime()
+    var breakingTicks = 0
+    var soundsCooldown = 0f
     var vanillaInstantBreakable = false
     val rebreakable get() = !vanillaInstantBreakable && type == Primary
 
-    val oneSetPerTickSet = mutableSetOf<OneSetPerTick<*>>()
-
     enum class BreakType(
         override val displayName: String,
         override val description: String
@@ -109,6 +106,12 @@ data class BreakInfo(
         item = null
     }
 
+    fun tickChecks() {
+        updatedThisTick = false
+        updatedPreProcessingThisTick = false
+        progressedThisTick = false
+    }
+
     fun setBreakingTextureStage(
         player: ClientPlayerEntity,
         world: ClientWorld,
@@ -175,7 +178,4 @@ data class BreakInfo(
     }
 
     override fun toString() = "$type, ${context.cachedState}, ${context.blockPos}"
-
-    private fun <T : Any> OneSetPerTick<T>.linkLifetime() =
-        apply { oneSetPerTickSet.add(this) }
 }

src/main/kotlin/com/lambda/interaction/request/breaking/BreakManager.kt

@@ -77,7 +77,6 @@ import com.lambda.util.BlockUtils.calcItemBlockBreakingDelta
 import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.BlockUtils.isNotBroken
 import com.lambda.util.BlockUtils.isNotEmpty
-import com.lambda.util.OneSetPerTick
 import com.lambda.util.extension.partialTicks
 import com.lambda.util.item.ItemUtils.block
 import com.lambda.util.math.lerp
@@ -173,6 +172,7 @@ object BreakManager : RequestHandler<BreakRequest>(
         }
 
         listen<TickEvent.Post>(priority = Int.MIN_VALUE) {
+            breakInfos.forEach { it?.tickChecks() }
             if (breakCooldown > 0) {
                 breakCooldown--
             }
@@ -640,13 +640,11 @@ object BreakManager : RequestHandler<BreakRequest>(
     /**
      * Nullifies the break. If the block is not broken, the [BreakInfo.internalOnCancel] callback gets triggered
      */
-    private fun BreakInfo.nullify() {
+    private fun BreakInfo.nullify() =
         when (type) {
             Primary, Rebreak -> primaryBreak = null
             else -> secondaryBreak = null
         }
-        oneSetPerTickSet.forEach(OneSetPerTick<*>::destroy)
-    }
 
     /**
      * A modified version of the vanilla updateBlockBreakingProgress method.