diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/MinecraftServerMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/MinecraftServerMixin.java index c4b177d..2cc8afd 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/MinecraftServerMixin.java +++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/MinecraftServerMixin.java @@ -2,19 +2,13 @@ package io.gitlab.jfronny.dynres.mixin; import net.minecraft.server.MinecraftServer; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; 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.Redirect; @Mixin(MinecraftServer.class) public class MinecraftServerMixin { - /** - * @author JFronny - * @reason loadWorldResourcePack overrides the custom resource pack link which would cause this mod to break - */ - @Overwrite - public void loadWorldResourcePack() { - + @Redirect(method = "loadWorldResourcePack()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;setResourcePack(Ljava/lang/String;Ljava/lang/String;)V")) + public void cancelResourcePackSet(MinecraftServer server, String url, String hash) { + // cancel } } diff --git a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java index 9ea1910..c2581ab 100644 --- a/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java +++ b/src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java @@ -5,12 +5,11 @@ import net.minecraft.client.network.ServerInfo; 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(ServerInfo.class) public class ServerInfoMixin { - @Inject(at = @At("RETURN"), method = "getResourcePack()Lnet/minecraft/client/network/ServerInfo$ResourcePackState;") + @Inject(at = @At("RETURN"), method = "getResourcePackPolicy()Lnet/minecraft/client/network/ServerInfo$ResourcePackPolicy;") public void getResPackState(CallbackInfoReturnable info) { Logger.l.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue()); }