model parenting stuff

gradle.properties

@@ -8,6 +8,6 @@ satin_version=1.8.0
 sodium_version=mc1.19-0.4.2
 iris_version=1.19.x-v1.2.5
 
-mod_version = 6.0.4
+mod_version = 6.0.5
 maven_group = net.ludocrypt
 archives_base_name = limlib

src/main/java/net/ludocrypt/limlib/access/UnbakedModelAccess.java

@@ -11,6 +11,8 @@ public interface UnbakedModelAccess {
 
 	public Map<Identifier, List<ModelElement>> getSubElements();
 
+	public void putSubElements(Map<Identifier, List<ModelElement>> map);
+
 	public JsonUnbakedModel getParent();
 
 }

src/main/java/net/ludocrypt/limlib/mixin/client/render/WorldRendererMixin.java

@@ -136,19 +136,11 @@ public void renderHands(Framebuffer framebuffer, float tickDelta, MatrixStack ma
 			client.getFramebuffer().beginWrite(true);
 		}
 
-		framebuffer.clear(MinecraftClient.IS_SYSTEM_MAC);
-		framebuffer.beginWrite(true);
-
 		LimlibRendering.LIMINAL_QUAD_RENDERER.forEach((renderer) -> {
 			renderer.heldItemRenderQueue.forEach(Runnable::run);
 			renderer.heldItemRenderQueue.clear();
 		});
 
-		framebuffer.endWrite();
-		client.getFramebuffer().beginWrite(true);
-
-		framebuffer.draw(framebuffer.textureWidth, framebuffer.textureHeight);
-
 		RenderSystem.setProjectionMatrix(projectionMatrix);
 	}
 

src/main/java/net/ludocrypt/limlib/mixin/client/render/model/JsonUnbakedModelDeserializerMixin.java

@@ -35,7 +35,7 @@ public abstract class JsonUnbakedModelDeserializerMixin {
 				}
 			});
 		}
-		((UnbakedModelAccess) ci.getReturnValue()).getSubElements().putAll(map);
+		((UnbakedModelAccess) ci.getReturnValue()).putSubElements(map);
 	}
 
 	@Shadow

src/main/java/net/ludocrypt/limlib/mixin/client/render/model/JsonUnbakedModelMixin.java

@@ -73,7 +73,7 @@ public abstract class JsonUnbakedModelMixin implements UnbakedModelAccess {
 			subElement.forEach((modelElement) -> {
 				for (Direction direction : modelElement.faces.keySet()) {
 					ModelElementFace modelElementFace = modelElement.faces.get(direction);
-					Sprite sprite2 = textureGetter.apply(parent.resolveSprite(modelElementFace.textureId));
+					Sprite sprite2 = textureGetter.apply(this.resolveSprite(modelElementFace.textureId));
 					if (modelElementFace.cullFace == null) {
 						quads.add(Pair.of(createQuad(modelElement, modelElementFace, sprite2, direction, settings, id), Optional.empty()));
 						continue;
@@ -107,6 +107,11 @@ public Map<Identifier, List<ModelElement>> getSubElements() {
 		return conjoinedElements;
 	}
 
+	@Override
+	public void putSubElements(Map<Identifier, List<ModelElement>> map) {
+		this.subElements.putAll(map);
+	}
+
 	@Override
 	public JsonUnbakedModel getParent() {
 		return this.parent;