R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure cached resources are cleared when connecting to multiplayer

Browse Source
This commit is contained in:
embeddedt 2023-04-20 19:55:41 -04:00
parent 701def339f
commit d10ff8a24e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftMixin.java
View File

@ -12,8 +12,11 @@ import net.minecraft.world.level.DataPackConfig;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.duck.reuse_datapacks.ICachingResourceClient; import org.embeddedt.modernfix.duck.reuse_datapacks.ICachingResourceClient;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
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.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -21,7 +24,9 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
@Mixin(Minecraft.class) @Mixin(Minecraft.class)
public class MinecraftMixin implements ICachingResourceClient { public abstract class MinecraftMixin implements ICachingResourceClient {
@Shadow public abstract boolean isLocalServer();
private ServerResources cachedResources; private ServerResources cachedResources;
private List<String> cachedDataPackConfig; private List<String> cachedDataPackConfig;
@ -67,4 +72,10 @@ public class MinecraftMixin implements ICachingResourceClient {
public void setCachedDataPackConfig(Collection<String> c) { public void setCachedDataPackConfig(Collection<String> c) {
cachedDataPackConfig = ImmutableList.copyOf(c); cachedDataPackConfig = ImmutableList.copyOf(c);
} }
@Inject(method = "setLevel", at = @At("HEAD"))
private void clearResourcesIfNotLocal(CallbackInfo ci) {
if(!this.isLocalServer())
cachedResources = null;
}
} }