diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/fast_palette/PalettedContainerMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/fast_palette/PalettedContainerMixin.java index 7a11507..b2913be 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/fast_palette/PalettedContainerMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/fast_palette/PalettedContainerMixin.java @@ -35,40 +35,13 @@ abstract class PalettedContainerMixin implements PaletteResize, PalettedCo * @author Spottedleaf */ @Inject( - method = "(Lnet/minecraft/core/IdMap;Ljava/lang/Object;Lnet/minecraft/world/level/chunk/PalettedContainer$Strategy;)V", + method = "*", at = @At( value = "RETURN" - ) + ), + require = 3 // Require matching all 3 constructors ) - private void constructorHook1(final CallbackInfo ci) { - this.updateData(this.data); - } - - /** - * @reason Hook to update raw palette data on object construction - * @author Spottedleaf - */ - @Inject( - method = "(Lnet/minecraft/core/IdMap;Lnet/minecraft/world/level/chunk/PalettedContainer$Strategy;Lnet/minecraft/world/level/chunk/PalettedContainer$Configuration;Lnet/minecraft/util/BitStorage;Ljava/util/List;)V", - at = @At( - value = "RETURN" - ) - ) - private void constructorHook2(final CallbackInfo ci) { - this.updateData(this.data); - } - - /** - * @reason Hook to update raw palette data on object construction - * @author Spottedleaf - */ - @Inject( - method = "(Lnet/minecraft/core/IdMap;Lnet/minecraft/world/level/chunk/PalettedContainer$Strategy;Lnet/minecraft/world/level/chunk/PalettedContainer$Data;)V", - at = @At( - value = "RETURN" - ) - ) - private void constructorHook3(final CallbackInfo ci) { + private void constructorHook(final CallbackInfo ci) { this.updateData(this.data); } diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/util_threading_detector/PalettedContainerMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/util_threading_detector/PalettedContainerMixin.java index c2b5369..5373592 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/util_threading_detector/PalettedContainerMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/util_threading_detector/PalettedContainerMixin.java @@ -21,7 +21,8 @@ abstract class PalettedContainerMixin { at = @At( value = "NEW", target = "Lnet/minecraft/util/ThreadingDetector;" - ) + ), + require = 3 // Require matching all 3 constructors ) private static ThreadingDetector threadingDetector(final String name) { return THREADING_DETECTOR;