|
2 | 2 |
|
3 | 3 | import net.caffeinemc.mods.sodium.client.console.Console;
|
4 | 4 | import net.caffeinemc.mods.sodium.client.console.message.MessageLevel;
|
5 |
| -import net.minecraft.network.chat.Component; |
6 |
| -import net.minecraft.network.chat.MutableComponent; |
7 | 5 | 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.*; |
12 | 7 | import net.minecraft.server.packs.resources.ResourceManager;
|
13 | 8 | import org.jetbrains.annotations.NotNull;
|
14 | 9 | import org.slf4j.Logger;
|
@@ -41,7 +36,9 @@ public class ResourcePackScanner {
|
41 | 36 | "rendertype_tripwire.json",
|
42 | 37 | "rendertype_clouds.vsh",
|
43 | 38 | "rendertype_clouds.fsh",
|
44 |
| - "rendertype_clouds.json" |
| 39 | + "rendertype_clouds.json", |
| 40 | + "terrain.vsh", |
| 41 | + "terrain.fsh" |
45 | 42 | );
|
46 | 43 |
|
47 | 44 | private static final Set<String> SHADER_INCLUDE_BLACKLIST = Set.of(
|
@@ -181,7 +178,7 @@ private static ScannedResourcePack scanResources(PackResources resourcePack) {
|
181 | 178 | }
|
182 | 179 |
|
183 | 180 | 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; |
185 | 182 | }
|
186 | 183 |
|
187 | 184 | private static String getResourcePackName(PackResources pack) {
|
|
0 commit comments