JfMods/DynRes
JfMods
/
DynRes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix

This commit is contained in:
JFronny 2021-06-02 14:22:55 +02:00
parent 26ca20346c
commit 2fbb51eefb
No known key found for this signature in database
GPG Key ID: BEC5ACBBD4EE17E5
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/gitlab/jfronny/dynres/mixin/MinecraftServerMixin.java
View File

@ -2,19 +2,13 @@ package io.gitlab.jfronny.dynres.mixin;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import org.spongepowered.asm.mixin.Mixin; 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.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(MinecraftServer.class) @Mixin(MinecraftServer.class)
public class MinecraftServerMixin { public class MinecraftServerMixin {
/** @Redirect(method = "loadWorldResourcePack()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;setResourcePack(Ljava/lang/String;Ljava/lang/String;)V"))
* @author JFronny public void cancelResourcePackSet(MinecraftServer server, String url, String hash) {
* @reason loadWorldResourcePack overrides the custom resource pack link which would cause this mod to break // cancel
*/
@Overwrite
public void loadWorldResourcePack() {
} }
} }

3
src/main/java/io/gitlab/jfronny/dynres/mixin/ServerInfoMixin.java
View File

@ -5,12 +5,11 @@ import net.minecraft.client.network.ServerInfo;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ServerInfo.class) @Mixin(ServerInfo.class)
public class ServerInfoMixin { 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<ServerInfo.ResourcePackPolicy> info) { public void getResPackState(CallbackInfoReturnable<ServerInfo.ResourcePackPolicy> info) {
Logger.l.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue()); Logger.l.info("[RECEIVE] ResourcePackStatus=" + info.getReturnValue());
} }