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

Remove unnecessary Files.exists call in ModFileResourcePack.getResource()

Browse Source
This commit is contained in:
embeddedt 2023-03-10 20:14:11 -05:00
parent 519e9d40f8
commit 6a7ca1e518
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
View File

@ -3,6 +3,7 @@ package org.embeddedt.modernfix.mixin.perf.resourcepacks;
import com.google.common.base.Joiner;
import net.minecraft.server.packs.PackType;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.ResourcePackFileNotFoundException;
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.packs.ModFileResourcePack;
import org.embeddedt.modernfix.util.FileUtil;
@ -14,11 +15,11 @@ 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;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import java.io.IOException;
import java.nio.file.FileSystem;
import java.nio.file.Files;
import java.nio.file.Path;
import java.io.InputStream;
import java.nio.file.*;
import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@ -97,6 +98,15 @@ public abstract class ModFileResourcePackMixin {
cir.setReturnValue(this.containedPaths.contains(FileUtil.normalize(path)));
}
@Inject(method = "getResource(Ljava/lang/String;)Ljava/io/InputStream;", at = @At(value = "INVOKE", target = "Ljava/nio/file/Files;exists(Ljava/nio/file/Path;[Ljava/nio/file/LinkOption;)Z"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
private void fasterGetResource(String resourcePath, CallbackInfoReturnable<InputStream> cir, Path path) throws IOException {
try {
cir.setReturnValue(Files.newInputStream(path, StandardOpenOption.READ));
} catch(NoSuchFileException e) {
throw new ResourcePackFileNotFoundException(this.modFile.getFilePath().toFile(), resourcePath);
}
}
/**
* @author embeddedt
* @reason Use cached listing of mod resources