From 19add56099a906e746f69c7a0af5a8148d9a470d Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 5 Jul 2022 19:14:23 +0200 Subject: [PATCH] This should no longer be needed --- .../mixin/common/MappedRegistryMixin.java | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/betterx/betterend/mixin/common/MappedRegistryMixin.java b/src/main/java/org/betterx/betterend/mixin/common/MappedRegistryMixin.java index a70235f5..3996a831 100644 --- a/src/main/java/org/betterx/betterend/mixin/common/MappedRegistryMixin.java +++ b/src/main/java/org/betterx/betterend/mixin/common/MappedRegistryMixin.java @@ -1,5 +1,7 @@ package org.betterx.betterend.mixin.common; +import com.mojang.serialization.Lifecycle; +import net.minecraft.core.Holder; import net.minecraft.core.MappedRegistry; import net.minecraft.resources.ResourceKey; @@ -7,12 +9,45 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(MappedRegistry.class) public class MappedRegistryMixin { // TODO Make this a part of BCLib (implement froze/unfroze methods) @Inject(method = "validateWrite", at = @At("HEAD"), cancellable = true) private void be_validateWrite(ResourceKey resourceKey, CallbackInfo info) { - info.cancel(); + //info.cancel(); + } + + @Inject(method = "registerMapping(ILnet/minecraft/resources/ResourceKey;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;Z)Lnet/minecraft/core/Holder;", at = @At("HEAD")) + private void be_debugDummy( + int i, + ResourceKey resourceKey, + T object, + Lifecycle lifecycle, + boolean bl, + CallbackInfoReturnable> cir + ) { + if (resourceKey.location().getPath().equals("dark_amaranth_forest")) { + System.out.println("Promenade registers: " + resourceKey); + } + } + + @Inject(method = "getOrCreateHolderOrThrow", at = @At("HEAD")) + private void be_debugDummy2( + ResourceKey resourceKey, CallbackInfoReturnable> cir + ) { + if (resourceKey.location().getPath().equals("dark_amaranth_forest")) { + System.out.println("Promenade registers: " + resourceKey); + } + } + + @Inject(method = "getOrCreateHolder", at = @At("HEAD")) + private void be_debugDummy3( + ResourceKey resourceKey, CallbackInfoReturnable> cir + ) { + if (resourceKey.location().getPath().equals("dark_amaranth_forest")) { + System.out.println("Promenade registers: " + resourceKey); + } } }