infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

tie Fabric resource pack location with vanilla resource location, helps #79

Browse source
This commit is contained in:
asie 2019-01-31 01:44:10 +01:00
parent 442d057b0d
commit 08c921267a
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/fabricmc/fabric/mixin/resources/MixinMinecraftGame.java
View file

@ -16,8 +16,11 @@
package net.fabricmc.fabric.mixin.resources; package net.fabricmc.fabric.mixin.resources;
import com.google.common.collect.Lists;
import net.fabricmc.fabric.impl.resources.ModResourcePackUtil; import net.fabricmc.fabric.impl.resources.ModResourcePackUtil;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.resource.DefaultClientResourcePack;
import net.minecraft.resource.DefaultResourcePack;
import net.minecraft.resource.ReloadableResourceManager; import net.minecraft.resource.ReloadableResourceManager;
import net.minecraft.resource.ResourcePack; import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceType; import net.minecraft.resource.ResourceType;
@ -37,6 +40,15 @@ public class MixinMinecraftGame {
@Inject(method = "reloadResources()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManager;reload(Ljava/util/List;)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD) @Inject(method = "reloadResources()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/ReloadableResourceManager;reload(Ljava/util/List;)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
public void reloadResources(CallbackInfo info, List<ResourcePack> list) { public void reloadResources(CallbackInfo info, List<ResourcePack> list) {
ModResourcePackUtil.appendModResourcePacks(list, ResourceType.ASSETS); List<ResourcePack> oldList = Lists.newArrayList(list);
list.clear();
for (int i = 0; i < oldList.size(); i++) {
ResourcePack pack = oldList.get(i);
list.add(pack);
if (pack instanceof DefaultClientResourcePack) {
ModResourcePackUtil.appendModResourcePacks(list, ResourceType.ASSETS);
}
}
} }
} }