fix *another* server error with miins

Author: LemmaEOF

build.gradle

@@ -30,7 +30,7 @@ if(rootProject.file('private.gradle').exists()) { //Publishing details
 
 archivesBaseName = "libcd"
 group = "io.github.cottonmc"
-version = "1.2.2+1.14.3"
+version = "1.2.3+1.14.3"
 
 minecraft {
 	refmapName = 'mixins.libcd.refmap.json'

src/main/java/io/github/cottonmc/libcd/impl/ResourceSearcher.java

@@ -0,0 +1,7 @@
+package io.github.cottonmc.libcd.impl;
+
+import net.minecraft.util.Identifier;
+
+public interface ResourceSearcher {
+	boolean libcd_contains(Identifier id);
+}

src/main/java/io/github/cottonmc/libcd/mixin/MixinNamespaceResourceManager.java

@@ -0,0 +1,38 @@
+package io.github.cottonmc.libcd.mixin;
+
+import io.github.cottonmc.libcd.impl.ResourceSearcher;
+import net.minecraft.resource.NamespaceResourceManager;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.List;
+
+@Mixin(NamespaceResourceManager.class)
+public abstract class MixinNamespaceResourceManager implements ResourceManager, ResourceSearcher {
+	@Shadow @Final protected List<ResourcePack> packList;
+
+	@Shadow @Final private ResourceType type;
+
+	@Shadow protected abstract boolean isPathAbsolute(Identifier id);
+
+	public boolean libcd_contains(Identifier id) {
+		if (!this.isPathAbsolute(id)) {
+			return false;
+		} else {
+			for(int i = this.packList.size() - 1; i >= 0; --i) {
+				ResourcePack pack = this.packList.get(i);
+				if (pack.contains(this.type, id)) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+	}
+
+}

src/main/java/io/github/cottonmc/libcd/mixin/MixinResourceManagerImpl.java

@@ -2,10 +2,8 @@
 
 import io.github.cottonmc.libcd.condition.ConditionalData;
 import io.github.cottonmc.libcd.impl.ReloadListenersAccessor;
-import net.minecraft.resource.ReloadableResourceManager;
-import net.minecraft.resource.ReloadableResourceManagerImpl;
-import net.minecraft.resource.Resource;
-import net.minecraft.resource.ResourceReloadListener;
+import io.github.cottonmc.libcd.impl.ResourceSearcher;
+import net.minecraft.resource.*;
 import net.minecraft.util.Identifier;
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.Logger;
@@ -17,19 +15,25 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 
 @Mixin(ReloadableResourceManagerImpl.class)
-public abstract class MixinResourceManagerImpl implements ReloadableResourceManager, ReloadListenersAccessor {
+public abstract class MixinResourceManagerImpl implements ReloadableResourceManager, ReloadListenersAccessor, ResourceSearcher {
 
 	@Shadow @Final private static Logger LOGGER;
 
 	@Shadow @Final private List<ResourceReloadListener> listeners;
 
+	@Shadow public abstract List<Resource> getAllResources(Identifier identifier_1) throws IOException;
+
+	@Shadow @Final private Map<String, NamespaceResourceManager> namespaceManagers;
+
 	@Inject(method = "findResources", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
 	private void checkConditioalRecipes(String parent, Predicate<String> loadFilter, CallbackInfoReturnable cir,
 										Set<Identifier> foundResources, List<Identifier> sortedResources) {
@@ -38,16 +42,15 @@ private void checkConditioalRecipes(String parent, Predicate<String> loadFilter,
 			//don't try to load for things that use mcmetas already!
 			if (id.getPath().contains(".mcmeta") || id.getPath().contains(".png")) continue;
 			Identifier metaId = new Identifier(id.getNamespace(), id.getPath() + ".mcmeta");
-			if (containsResource(metaId)) {
-				try {
-					Resource meta = getResource(metaId);
-					String metaText = IOUtils.toString(meta.getInputStream());
-					if (!ConditionalData.shouldLoad(id, metaText)) {
-						sortedResources.remove(id);
-					}
-				} catch (IOException e) {
-					LOGGER.error("Error when accessing recipe metadata for {}: {}", id.toString(), e.getMessage());
+			try {
+				Resource meta = getResource(metaId);
+				String metaText = IOUtils.toString(meta.getInputStream());
+				if (!ConditionalData.shouldLoad(id, metaText)) {
+					sortedResources.remove(id);
 				}
+			} catch (IOException e) {
+				//this is so ugly but I can't really do anything else when containsResource is client-side only for *no* reason
+				if (!(e instanceof FileNotFoundException)) LOGGER.error("Error when accessing recipe metadata for {}: {}", id.toString(), e.getMessage());
 			}
 		}
 	}
@@ -56,4 +59,11 @@ private void checkConditioalRecipes(String parent, Predicate<String> loadFilter,
 	public List<ResourceReloadListener> libcd_getListeners() {
 		return listeners;
 	}
+
+	public boolean libcd_contains(Identifier id) {
+		ResourceManager manager = this.namespaceManagers.get(id.getNamespace());
+		return manager != null && ((ResourceSearcher) manager).libcd_contains(id);
+	}
+
+
 }

src/main/resources/mixins.libcd.json

@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinResourceManagerImpl",
-    "MixinRecipeManager"
+    "MixinRecipeManager",
+    "MixinNamespaceResourceManager"
   ]
 }