Skip to content

Commit cab4cbc

Browse files
committed
Update QuiltPlatformMinimal
1 parent 69aec12 commit cab4cbc

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/fabric/java/dev/lukebemish/dynamicassetgenerator/impl/fabriquilt/quilt/QuiltPlatformMinimal.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
public class QuiltPlatformMinimal extends FabricPlatform {
1616
public static final QuiltPlatformMinimal INSTANCE = new QuiltPlatformMinimal();
1717

18-
private static final boolean isQFAPIPresent = FabricLoader.getInstance().isModLoaded("quilted_fabric_api");
19-
private static final String GROUP_PACK_CLASS = "org.quiltmc.qsl.resource.loader.api.GroupResourcePack";
18+
private static final boolean isQslModulePresent = FabricLoader.getInstance().isModLoaded("quilt_resource_loader");
2019
private static final @Nullable Class<?> GROUP_PACK_RESOURCES;
2120
private static final @Nullable MethodHandle GET_GROUP_PACK_PACKS;
2221

2322
static {
2423
Class<?> clazz;
2524
try {
26-
clazz = FabricPlatform.class.getClassLoader().loadClass(GROUP_PACK_CLASS);
25+
clazz = Class.forName("org.quiltmc.qsl.resource.loader.api.GroupPack", false, FabricPlatform.class.getClassLoader());
2726
} catch (ClassNotFoundException e) {
2827
clazz = null;
2928
}
@@ -35,15 +34,13 @@ public class QuiltPlatformMinimal extends FabricPlatform {
3534
var lookup = MethodHandles.lookup();
3635
MethodHandle getter;
3736
try {
38-
var privateLookup = MethodHandles.privateLookupIn(clazz, lookup);
39-
@SuppressWarnings("rawtypes") Class<List> listClazz = List.class;
40-
getter = privateLookup.findVirtual(clazz, "getPacks", MethodType.methodType(listClazz));
37+
getter = lookup.findVirtual(clazz, "getPacks", MethodType.methodType(List.class));
4138
} catch (IllegalAccessException | NoSuchMethodException e) {
4239
getter = null;
4340
}
4441
GET_GROUP_PACK_PACKS = getter;
4542
}
46-
if (GROUP_PACK_RESOURCES == null || GET_GROUP_PACK_PACKS == null && isQFAPIPresent) {
43+
if ((GROUP_PACK_RESOURCES == null || GET_GROUP_PACK_PACKS == null) && isQslModulePresent) {
4744
DynamicAssetGenerator.LOGGER.error("On quilt but could not find quilt class/field to unwrap grouped resources - Dynamic Asset Generator may not work right!");
4845
}
4946
}

0 commit comments

Comments
 (0)