Skip to content

Commit 77c3109

Browse files
authored
Adapt resource pack scanner for recent versions of Minecraft (#3244)
This fixes packs such as Vanilla Tweaks not getting detected in newer versions of Minecraft.
1 parent 9c0e8d8 commit 77c3109

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

common/src/main/java/net/caffeinemc/mods/sodium/client/checks/ResourcePackScanner.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22

33
import net.caffeinemc.mods.sodium.client.console.Console;
44
import net.caffeinemc.mods.sodium.client.console.message.MessageLevel;
5-
import net.minecraft.network.chat.Component;
6-
import net.minecraft.network.chat.MutableComponent;
75
import net.minecraft.resources.ResourceLocation;
8-
import net.minecraft.server.packs.FilePackResources;
9-
import net.minecraft.server.packs.PackResources;
10-
import net.minecraft.server.packs.PackType;
11-
import net.minecraft.server.packs.PathPackResources;
6+
import net.minecraft.server.packs.*;
127
import net.minecraft.server.packs.resources.ResourceManager;
138
import org.jetbrains.annotations.NotNull;
149
import org.slf4j.Logger;
@@ -41,7 +36,9 @@ public class ResourcePackScanner {
4136
"rendertype_tripwire.json",
4237
"rendertype_clouds.vsh",
4338
"rendertype_clouds.fsh",
44-
"rendertype_clouds.json"
39+
"rendertype_clouds.json",
40+
"terrain.vsh",
41+
"terrain.fsh"
4542
);
4643

4744
private static final Set<String> SHADER_INCLUDE_BLACKLIST = Set.of(
@@ -181,7 +178,7 @@ private static ScannedResourcePack scanResources(PackResources resourcePack) {
181178
}
182179

183180
private static boolean isExternalResourcePack(PackResources pack) {
184-
return pack instanceof PathPackResources || pack instanceof FilePackResources;
181+
return pack instanceof PathPackResources || pack instanceof FilePackResources || pack instanceof CompositePackResources;
185182
}
186183

187184
private static String getResourcePackName(PackResources pack) {

0 commit comments

Comments
 (0)