Rebuild loader flow almost entirely to deal with model-loader v1

Author: falkreon

build.gradle

@@ -19,7 +19,7 @@ dependencies {
 	mappings "org.quiltmc:quilt-mappings:${project.minecraft}+build.${project.mappings}:intermediary-v2"
 
 	modImplementation "org.quiltmc:quilt-loader:${project.loader}"
-	modImplementation "org.quiltmc:qsl:${project.qsl}+${project.minecraft}"
+	//modImplementation "org.quiltmc:qsl:${project.qsl}+${project.minecraft}"
 	modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${project.qfapi}"
 }
 

gradle.properties

@@ -3,13 +3,19 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 1.0.2
+version = 1.0.3
 maven_group = gay.debuggy
 archives_base_name = SuspiciousShapes
 
 # Dependencies
+#minecraft = 1.20.1
+#mappings = 1
+#loader = 0.19.0
+#qsl = 6.0.3
+#qfapi = 7.0.3+0.83.1-1.20.1
+
 minecraft = 1.20.1
-mappings = 1
-loader = 0.19.0
-qsl = 6.0.3
-qfapi = 7.0.3+0.83.1-1.20.1
+mappings = 23
+loader = 0.20.0-beta.11
+qsl = 6.1.1
+qfapi = 7.1.0+0.86.1-1.20.1

src/main/java/blue/endless/glow/model/Mesh.java

@@ -182,4 +182,20 @@ public Stream<Vertex> stream() {
 
 	public static class Vertex extends AbstractShaderAttributeHolder {
 	}
+	
+	public Mesh copy() {
+		Material resultMaterial = new Material();
+		resultMaterial.putAll(material);
+		Mesh result = new Mesh(resultMaterial, vertexBuffer.clone(), uvBuffer.clone(), normalBuffer.clone(), indices.clone());
+		for(int i=0; i<result.vertexData.length; i++) {
+			Vertex v = vertexData[i];
+			if (v != null) {
+				Vertex w = new Vertex();
+				w.putAll(v);
+				result.vertexData[i] = w;
+			}
+		}
+		
+		return result;
+	}
 }

src/main/java/blue/endless/glow/model/Model.java

@@ -11,7 +11,7 @@
 import java.util.List;
 
 public class Model implements Iterable<Mesh> {
-	protected ShaderAttributeHolder environment = new Material();
+	protected Material environment = new Material();
 	protected List<Mesh> meshes = new ArrayList<>();
 
 	public ShaderAttributeHolder getEnvironment() {
@@ -34,4 +34,14 @@ public List<Mesh> getMeshes() {
 	public Iterator<Mesh> iterator() {
 		return meshes.iterator();
 	}
+	
+	public Model copy() {
+		Model result = new Model();
+		result.environment.putAll(environment);
+		for(Mesh m : meshes) {
+			result.meshes.add(m.copy());
+		}
+		
+		return result;
+	}
 }

src/main/java/gay/debuggy/shapes/client/GLTFModelProvider.java

@@ -0,0 +1,104 @@
+package gay.debuggy.shapes.client;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+
+import com.google.common.collect.Lists;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+import blue.endless.glow.model.Model;
+import gay.debuggy.shapes.client.schema.BlockModelPlus;
+
+import net.minecraft.util.Identifier;
+
+public class ProcessedModelData {
+	public List<ErrorNode> errors = new ArrayList<>();
+	public List<Node> detached = new ArrayList<>();
+	public List<Node> roots = new ArrayList<>();
+	
+	public Map<Identifier, Node> byId = new HashMap<>();
+	
+	public static class Node {
+		Identifier location;
+		Identifier id;
+		GlowUnbakedModel model;
+		String error = null;
+		Node parent;
+		List<Node> children = new ArrayList<>();
+		
+		public Node(Identifier location) {
+			this.location = location;
+			String namespace = location.getNamespace();
+			String path = location.getPath();
+			if (path.startsWith("models/")) path = path.substring("models/".length());
+			if (path.endsWith(".json")) {
+				path = path.substring(0, path.length() - ".json".length());
+			}// else if (path.endsWith(".gltf")) {
+			//	path = path.substring(0, path.length() - ".gltf".length());
+			//}
+			this.id = new Identifier(namespace, path);
+		}
+		
+		public int treeSize() {
+			return 1 + children.stream().mapToInt(Node::treeSize).sum();
+		}
+		
+		public boolean hasPathToRoot(List<Node> roots) {
+			HashSet<Identifier> traversed = new HashSet<>();
+			Node cur = this;
+			while(cur.parent != null) {
+				cur = cur.parent;
+				if (traversed.contains(cur.location)) throw new IllegalStateException("Circular reference detected.");
+				traversed.add(cur.location);
+			}
+			return roots.contains(cur);
+		}
+		
+		public Node getRoot() {
+			HashSet<Identifier> traversed = new HashSet<>();
+			Node cur = this;
+			while(cur.parent != null) {
+				cur = cur.parent;
+				if (traversed.contains(cur.location)) throw new IllegalStateException("Circular reference detected.");
+				traversed.add(cur.location);
+			}
+			return cur;
+		}
+		
+		public List<Node> getPathFromRoot() {
+			ArrayList<Node> traversed = new ArrayList<>();
+			Node cur = this;
+			traversed.add(cur);
+			while (cur.parent != null) {
+				cur = cur.parent;
+				if (traversed.contains(cur)) throw new IllegalStateException("Circular reference detected.");
+				traversed.add(cur);
+			}
+			
+			return Lists.reverse(traversed);
+		}
+	}
+	
+	public static class JsonNode extends Node {
+		BlockModelPlus blockModelPlus;
+		
+		public JsonNode(Identifier location, BlockModelPlus model) {
+			super(location);
+			this.blockModelPlus = model;
+		}
+	}
+	
+	public static class GltfNode extends Node {
+		Model model;
+		
+		public GltfNode(Identifier location, Model model) {
+			super(location);
+			this.model = model;
+		}
+	}
+	
+	public static record ErrorNode(Identifier id, String message, Throwable t) {}
+}

src/main/java/gay/debuggy/shapes/client/ProcessedModelData.java

@@ -5,15 +5,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
+import net.fabricmc.fabric.api.client.model.loading.v1.PreparableModelLoadingPlugin;
 
 public class SuspiciousShapesClient implements ClientModInitializer {
 	public static final String MODID = "suspicious_shapes";
 	public static final Logger LOGGER = LoggerFactory.getLogger("Suspicious Shapes");
 
 	@Override
 	public void onInitializeClient(ModContainer mod) {
-		ModelLoadingRegistry.INSTANCE.registerResourceProvider(rm->new GLTFModelProvider(rm));
+		PreparableModelLoadingPlugin.register(SuspiciousShapesModelLoadingPlugin::loadData, new SuspiciousShapesModelLoadingPlugin());
 	}
 
 }