diff --git a/client/src/main/java/org/geysermc/rainbow/client/PackManager.java b/client/src/main/java/org/geysermc/rainbow/client/PackManager.java index 75b733b..7fa8b54 100644 --- a/client/src/main/java/org/geysermc/rainbow/client/PackManager.java +++ b/client/src/main/java/org/geysermc/rainbow/client/PackManager.java @@ -113,7 +113,7 @@ Textures tried to export: FIXME if (splash == null) { return "Undefined Undefined :("; } - return ((SplashRendererAccessor) splash).getSplash(); + return ((SplashRendererAccessor) splash).getSplash().getString(); } return randomBuiltinSummaryComment(); } diff --git a/client/src/main/java/org/geysermc/rainbow/client/mixin/ModelManagerMixin.java b/client/src/main/java/org/geysermc/rainbow/client/mixin/ModelManagerMixin.java index 68804f4..31f1577 100644 --- a/client/src/main/java/org/geysermc/rainbow/client/mixin/ModelManagerMixin.java +++ b/client/src/main/java/org/geysermc/rainbow/client/mixin/ModelManagerMixin.java @@ -26,7 +26,7 @@ public abstract class ModelManagerMixin implements PreparableReloadListener, Aut @Unique private Map clientItems; - @WrapOperation(method = "method_65753", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;join()Ljava/lang/Object;", ordinal = 1)) + @WrapOperation(method = "method_65753", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;join()Ljava/lang/Object;", ordinal = 2)) private static Object setResolvedModels(CompletableFuture instance, Operation original) { Object resolved = original.call(instance); try { diff --git a/client/src/main/java/org/geysermc/rainbow/client/mixin/SplashRendererAccessor.java b/client/src/main/java/org/geysermc/rainbow/client/mixin/SplashRendererAccessor.java index 0f5a4a3..3fbb6b8 100644 --- a/client/src/main/java/org/geysermc/rainbow/client/mixin/SplashRendererAccessor.java +++ b/client/src/main/java/org/geysermc/rainbow/client/mixin/SplashRendererAccessor.java @@ -1,6 +1,7 @@ package org.geysermc.rainbow.client.mixin; import net.minecraft.client.gui.components.SplashRenderer; +import net.minecraft.network.chat.Component; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -8,5 +9,5 @@ import org.spongepowered.asm.mixin.gen.Accessor; public interface SplashRendererAccessor { @Accessor - String getSplash(); + Component getSplash(); }