Merge remote-tracking branch 'origin/1.20' into 1.20.4
This commit is contained in:
commit
8d2d3d8e15
|
|
@ -50,8 +50,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())
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
package org.embeddedt.modernfix.neoforge.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 -> {};
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user