From 60b52fcb8f21e99cef8f728acb030eb3d3f94139 Mon Sep 17 00:00:00 2001 From: Boundarybreaker Date: Wed, 29 Jul 2020 20:18:38 -0700 Subject: [PATCH] attempt to fix #49 --- build.gradle | 2 +- modules/cotton-datapack/build.gradle | 2 +- .../cottonmc/cotton/datapack/mixins/MixinDataPackLoad.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4cf9a8f..0d242cd 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ def yarnMappings = "1.16.1+build.9:v2" def loaderVersion = "0.8.8+build.202" archivesBaseName = "cotton" -version = "1.0.6" +version = "1.0.7" group = "io.github.cottonmc.cotton" sourceCompatibility = 1.8 diff --git a/modules/cotton-datapack/build.gradle b/modules/cotton-datapack/build.gradle index 729c35b..e8d72d8 100644 --- a/modules/cotton-datapack/build.gradle +++ b/modules/cotton-datapack/build.gradle @@ -10,7 +10,7 @@ ext { ]; } -version = "1.0.6"; +version = "1.0.7"; apply from: "../module-base.gradle" dependencies { diff --git a/modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/mixins/MixinDataPackLoad.java b/modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/mixins/MixinDataPackLoad.java index d9ffe6c..d2eca4e 100644 --- a/modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/mixins/MixinDataPackLoad.java +++ b/modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/mixins/MixinDataPackLoad.java @@ -22,7 +22,7 @@ public class MixinDataPackLoad { - @Inject(method = "loadDataPacks", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ResourcePackManager;setEnabledProfiles(Ljava/util/Collection;)V")) + @Inject(method = "loadDataPacks", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ResourcePackManager;scanPacks()V")) private static void addGlobalDataPacks(ResourcePackManager resourcePackManager, DataPackSettings dataPackSettings, boolean safeMode, CallbackInfoReturnable info) { ((ResourcePackManagerAccessor)resourcePackManager).getProviders().add(new GlobalResourcePackProvider()); ((ResourcePackManagerAccessor)resourcePackManager).getProviders().add(VirtualResourcePackManager.INSTANCE.getCreatorForType(ResourceType.SERVER_DATA));