From e9894110748d36a51144dcc3ddc3aea71118bb46 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 30 Apr 2023 19:39:04 -0400 Subject: [PATCH] Compilation fixes --- .../java/org/embeddedt/modernfix/dfu/LazyDataFixer.java | 2 +- .../mixin/perf/dynamic_dfu/DataFixersMixin.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/dfu/LazyDataFixer.java b/src/main/java/org/embeddedt/modernfix/dfu/LazyDataFixer.java index dd9dfbdb..953ef9fe 100644 --- a/src/main/java/org/embeddedt/modernfix/dfu/LazyDataFixer.java +++ b/src/main/java/org/embeddedt/modernfix/dfu/LazyDataFixer.java @@ -55,7 +55,7 @@ public class LazyDataFixer implements DataFixer { */ static class EmptySchema extends Schema { public EmptySchema() { - super(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getWorldVersion()), null); + super(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()), null); } private static final Type EMPTY_TYPE = new EmptyPart(); diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java index f8e48cfa..076cdbf5 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java @@ -1,5 +1,6 @@ package org.embeddedt.modernfix.mixin.perf.dynamic_dfu; +import com.mojang.datafixers.DSL; import com.mojang.datafixers.DataFixer; import net.minecraft.util.datafix.DataFixers; import org.embeddedt.modernfix.dfu.LazyDataFixer; @@ -9,9 +10,11 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.util.Set; + @Mixin(DataFixers.class) public abstract class DataFixersMixin { - @Shadow protected static DataFixer createFixerUpper() { + @Shadow protected static DataFixer createFixerUpper(Set set) { throw new AssertionError(); } @@ -21,9 +24,9 @@ public abstract class DataFixersMixin { * Avoid classloading the DFU logic until we actually need it. */ @Inject(method = "createFixerUpper", at = @At("HEAD"), cancellable = true) - private static void createLazyFixerUpper(CallbackInfoReturnable cir) { + private static void createLazyFixerUpper(Set set, CallbackInfoReturnable cir) { if(lazyDataFixer == null) { - lazyDataFixer = new LazyDataFixer(DataFixersMixin::createFixerUpper); + lazyDataFixer = new LazyDataFixer(() -> createFixerUpper(set)); cir.setReturnValue(lazyDataFixer); } }