diff --git a/src/main/java/com/aetherteam/aether/mixin/mixins/client/CreateWorldScreenMixin.java b/src/main/java/com/aetherteam/aether/mixin/mixins/client/CreateWorldScreenMixin.java index c6993f493..d19c533f3 100644 --- a/src/main/java/com/aetherteam/aether/mixin/mixins/client/CreateWorldScreenMixin.java +++ b/src/main/java/com/aetherteam/aether/mixin/mixins/client/CreateWorldScreenMixin.java @@ -37,6 +37,6 @@ private void onCreate(CallbackInfo ci) { @Inject(method = "openFresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;createDefaultLoadConfig(Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/world/level/WorldDataConfiguration;)Lnet/minecraft/server/WorldLoader$InitConfig;")) private static void aetherFabric$addClientPackResources(Minecraft minecraft, Screen lastScreen, CallbackInfo ci, @Local() PackRepository repository) { - AddPackFindersEvent.invokeEvent(PackType.CLIENT_RESOURCES, repository); + AddPackFindersEvent.invokeEvent(PackType.SERVER_DATA, repository); } } diff --git a/src/main/java/com/aetherteam/aether/mixin/mixins/common/ServerPacksSourceMixin.java b/src/main/java/com/aetherteam/aether/mixin/mixins/common/ServerPacksSourceMixin.java index 0a45aa037..a5a1311bb 100644 --- a/src/main/java/com/aetherteam/aether/mixin/mixins/common/ServerPacksSourceMixin.java +++ b/src/main/java/com/aetherteam/aether/mixin/mixins/common/ServerPacksSourceMixin.java @@ -15,6 +15,11 @@ public abstract class ServerPacksSourceMixin { @Inject(method = "createPackRepository(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;)Lnet/minecraft/server/packs/repository/PackRepository;", at = @At("RETURN")) private static void aetherFabric$addServerPackResources(LevelStorageSource.LevelStorageAccess level, CallbackInfoReturnable cir) { - AddPackFindersEvent.invokeEvent(PackType.CLIENT_RESOURCES, cir.getReturnValue()); + AddPackFindersEvent.invokeEvent(PackType.SERVER_DATA, cir.getReturnValue()); + } + + @Inject(method = "createVanillaTrustedRepository", at = @At("RETURN")) + private static void aetherFabric$addServerPackResourcesVanilla(CallbackInfoReturnable cir) { + AddPackFindersEvent.invokeEvent(PackType.SERVER_DATA, cir.getReturnValue()); } }