From 3de67d42b3c0852663f2c01248a2344426fd3257 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 1 Aug 2021 14:39:21 +0300 Subject: [PATCH] Another small fix & optimisation --- .../client/SimpleReloadableResourceManagerMixin.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/ru/bclib/mixin/client/SimpleReloadableResourceManagerMixin.java b/src/main/java/ru/bclib/mixin/client/SimpleReloadableResourceManagerMixin.java index 8336946a..c661a6c7 100644 --- a/src/main/java/ru/bclib/mixin/client/SimpleReloadableResourceManagerMixin.java +++ b/src/main/java/ru/bclib/mixin/client/SimpleReloadableResourceManagerMixin.java @@ -29,7 +29,7 @@ public class SimpleReloadableResourceManagerMixin { @Shadow private Map namespacedPacks; - private Resource bclib_alphaEmissionMaterial; + private ResourceLocation bclib_alphaEmissionMaterial = BCLib.makeID("materialmaps/block/alpha_emission.json"); @Inject(method = "getResource", at = @At("HEAD"), cancellable = true) private void bclib_getResource(ResourceLocation resourceLocation, CallbackInfoReturnable info) throws IOException { @@ -51,14 +51,8 @@ public class SimpleReloadableResourceManagerMixin { } ResourceManager resourceManager = this.namespacedPacks.get(resourceLocation.getNamespace()); - if (resourceManager != null) { - Resource resource = resourceManager.getResource(resourceLocation); - if (resource != null) { - info.setReturnValue(resource); - return; - } - resourceLocation = BCLib.makeID("materialmaps/block/alpha_emission.json"); - info.setReturnValue(resourceManager.getResource(resourceLocation)); + if (resourceManager != null && !resourceManager.hasResource(resourceLocation)) { + info.setReturnValue(resourceManager.getResource(bclib_alphaEmissionMaterial)); } } }