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

Merge remote-tracking branch 'origin/1.18' into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2024-04-10 23:14:22 -04:00
commit dcc0ed27d8
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/VanillaPackMixin.java
View File

@ -10,11 +10,11 @@ import net.minecraft.server.packs.VanillaPackResources;
import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.embeddedt.modernfix.FileWalker; import org.embeddedt.modernfix.FileWalker;
import org.embeddedt.modernfix.core.config.ModernFixEarlyConfig;
import org.embeddedt.modernfix.util.FileUtil; import org.embeddedt.modernfix.util.FileUtil;
import org.embeddedt.modernfix.util.PackTypeHelper; import org.embeddedt.modernfix.util.PackTypeHelper;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; 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.Inject;
@ -86,14 +86,16 @@ public class VanillaPackMixin {
* @reason avoid going through the module class loader when we know exactly what path this resource should come * @reason avoid going through the module class loader when we know exactly what path this resource should come
* from * from
*/ */
@Overwrite @Inject(method = "getResourceAsStream(Lnet/minecraft/server/packs/PackType;Lnet/minecraft/resources/ResourceLocation;)Ljava/io/InputStream;", at = @At("HEAD"), cancellable = true)
protected InputStream getResourceAsStream(PackType type, ResourceLocation location) { private void getResourceAsStreamFast(PackType type, ResourceLocation location, CallbackInfoReturnable<InputStream> cir) {
Path rootPath = ROOT_DIR_BY_TYPE.get(type); if(!ModernFixEarlyConfig.OPTIFINE_PRESENT) {
Path targetPath = rootPath.resolve(location.getNamespace() + "/" + location.getPath()); Path rootPath = ROOT_DIR_BY_TYPE.get(type);
try { Path targetPath = rootPath.resolve(location.getNamespace() + "/" + location.getPath());
return Files.newInputStream(targetPath); try {
} catch(IOException e) { cir.setReturnValue(Files.newInputStream(targetPath));
return null; } catch(IOException e) {
cir.setReturnValue(null);
}
} }
} }
} }