From e7632b7f0b632fd310683a97c95a65f5db317ea4 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 2 Mar 2024 12:28:04 -0500 Subject: [PATCH] Remove Blueprint memory leak patch --- forge/build.gradle | 2 -- .../ObjectModificationManagerMixin.java | 27 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java diff --git a/forge/build.gradle b/forge/build.gradle index 5403d9b6..1efefbe7 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -61,8 +61,6 @@ dependencies { modCompileOnly("curse.maven:supermartijncore-454372:4455391") modCompileOnly("vazkii.patchouli:Patchouli:1.19.2-77") - modCompileOnly("curse.maven:blueprint-382216:3991478") - // runtime remapping at home for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) { def basename = extraModJar.name.substring(0, extraModJar.name.length() - ".jar".length()) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java deleted file mode 100644 index 2be15e95..00000000 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.bugfix.blueprint_modif_memory_leak; - -import com.google.gson.Gson; -import com.teamabnormals.blueprint.core.util.modification.ObjectModificationManager; -import com.teamabnormals.blueprint.core.util.modification.selection.SelectionSpace; -import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener; -import org.embeddedt.modernfix.annotation.RequiresMod; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ObjectModificationManager.class) -@RequiresMod("blueprint") -public abstract class ObjectModificationManagerMixin extends SimpleJsonResourceReloadListener { - @Shadow(remap = false) protected SelectionSpace selectionSpace; - - public ObjectModificationManagerMixin(Gson gson, String string) { - super(gson, string); - } - - @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At("RETURN"), remap = false) - private void clearSelectionSpace(CallbackInfo ci) { - this.selectionSpace = consumer -> {}; - } -}