Moves CapturingTesselator, JSON Models, and misc utility classes to GTNHlib (#587)

* Moves CapturingTesselator, JSON Models, and misc utility classes to GTNHlib
* Switch to separate source set for mixins - faster incremental builds

src/main/java/net/coderbot/iris/pipeline/HorizonRenderer.java

@@ -1,9 +1,10 @@
 package net.coderbot.iris.pipeline;
 
-import com.gtnewhorizons.angelica.client.renderer.CapturingTessellator;
-import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
-import com.gtnewhorizons.angelica.compat.mojang.VertexBuffer;
-import com.gtnewhorizons.angelica.glsm.TessellatorManager;
+import com.gtnewhorizon.gtnhlib.client.renderer.CapturingTessellator;
+import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager;
+import com.gtnewhorizon.gtnhlib.client.renderer.vbo.VertexBuffer;
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
 import org.lwjgl.opengl.GL11;

src/main/java/net/coderbot/iris/postprocess/FullScreenQuadRenderer.java

@@ -1,6 +1,7 @@
 package net.coderbot.iris.postprocess;
 
-import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
+
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
 import com.gtnewhorizons.angelica.glsm.GLStateManager;
 import com.gtnewhorizons.angelica.glsm.RenderSystem;
 import org.lwjgl.BufferUtils;

src/main/java/net/coderbot/iris/sodium/vertex_format/entity_xhfp/ExtendedGlyphVertexType.java

@@ -1,7 +1,8 @@
 package net.coderbot.iris.sodium.vertex_format.entity_xhfp;
 
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
 import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
-import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
+
 import me.jellysquid.mods.sodium.client.model.vertex.buffer.VertexBufferView;
 import me.jellysquid.mods.sodium.client.model.vertex.formats.glyph.GlyphVertexSink;
 import me.jellysquid.mods.sodium.client.model.vertex.formats.glyph.writer.GlyphVertexWriterFallback;

src/main/java/net/coderbot/iris/sodium/vertex_format/entity_xhfp/ExtendedQuadVertexType.java

@@ -1,7 +1,8 @@
 package net.coderbot.iris.sodium.vertex_format.entity_xhfp;
 
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
 import com.gtnewhorizons.angelica.compat.toremove.VertexConsumer;
-import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
+
 import me.jellysquid.mods.sodium.client.model.vertex.buffer.VertexBufferView;
 import me.jellysquid.mods.sodium.client.model.vertex.formats.quad.QuadVertexSink;
 import me.jellysquid.mods.sodium.client.model.vertex.formats.quad.writer.QuadVertexWriterFallback;

src/main/java/net/coderbot/iris/sodium/vertex_format/entity_xhfp/QuadViewEntity.java

@@ -1,11 +1,11 @@
 package net.coderbot.iris.sodium.vertex_format.entity_xhfp;
 
 import com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil;
-import net.coderbot.iris.vertices.QuadView;
+import net.coderbot.iris.vertices.IrisQuadView;
 
 import java.nio.ByteBuffer;
 
-public abstract class QuadViewEntity implements QuadView {
+public abstract class QuadViewEntity implements IrisQuadView {
 	long writePointer;
 	int stride;
 

src/main/java/net/coderbot/iris/sodium/vertex_format/terrain_xhfp/QuadViewTerrain.java

@@ -1,11 +1,11 @@
 package net.coderbot.iris.sodium.vertex_format.terrain_xhfp;
 
 import com.gtnewhorizons.angelica.compat.lwjgl.CompatMemoryUtil;
-import net.coderbot.iris.vertices.QuadView;
+import net.coderbot.iris.vertices.IrisQuadView;
 
 import java.nio.ByteBuffer;
 
-public abstract class QuadViewTerrain implements QuadView {
+public abstract class QuadViewTerrain implements IrisQuadView {
 	long writePointer;
 	int stride;
 

src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java

@@ -1,8 +1,8 @@
 package net.coderbot.iris.texture.pbr;
 
 import com.gtnewhorizons.angelica.compat.mojang.AutoClosableAbstractTexture;
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.TextureAtlasSpriteAccessor;
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.TextureMapAccessor;
+import com.gtnewhorizons.angelica.mixins.interfaces.TextureAtlasSpriteAccessor;
+import com.gtnewhorizons.angelica.mixins.interfaces.TextureMapAccessor;
 import lombok.Getter;
 import net.coderbot.iris.texture.util.TextureExporter;
 import net.coderbot.iris.texture.util.TextureManipulationUtil;

src/main/java/net/coderbot/iris/texture/pbr/loader/AtlasPBRLoader.java

@@ -4,10 +4,10 @@ import com.google.common.collect.Lists;
 import com.gtnewhorizons.angelica.compat.mojang.NativeImage;
 import com.gtnewhorizons.angelica.glsm.texture.TextureInfo;
 import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.AnimationMetadataSectionAccessor;
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.TextureAtlasSpriteAccessor;
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.TextureMapAccessor;
+import com.gtnewhorizons.angelica.mixins.interfaces.AnimationMetadataSectionAccessor;
 import com.gtnewhorizons.angelica.mixins.interfaces.ISpriteExt;
+import com.gtnewhorizons.angelica.mixins.interfaces.TextureAtlasSpriteAccessor;
+import com.gtnewhorizons.angelica.mixins.interfaces.TextureMapAccessor;
 import net.coderbot.iris.Iris;
 import net.coderbot.iris.texture.format.TextureFormat;
 import net.coderbot.iris.texture.format.TextureFormatLoader;

src/main/java/net/coderbot/iris/texture/pbr/loader/SimplePBRLoader.java

@@ -1,6 +1,6 @@
 package net.coderbot.iris.texture.pbr.loader;
 
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.SimpleTextureAccessor;
+import com.gtnewhorizons.angelica.mixins.interfaces.SimpleTextureAccessor;
 import net.coderbot.iris.texture.pbr.PBRType;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.SimpleTexture;

src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java

@@ -5,7 +5,7 @@ import com.gtnewhorizons.angelica.glsm.states.BlendState;
 import com.gtnewhorizons.angelica.glsm.texture.TextureInfo;
 import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
 import com.gtnewhorizons.angelica.glsm.texture.TextureTracker;
-import com.gtnewhorizons.angelica.mixins.early.shaders.accessors.EntityRendererAccessor;
+import com.gtnewhorizons.angelica.mixins.interfaces.EntityRendererAccessor;
 import net.coderbot.iris.gl.state.StateUpdateNotifiers;
 import net.coderbot.iris.gl.uniform.DynamicUniformHolder;
 import net.coderbot.iris.gl.uniform.UniformHolder;
@@ -29,10 +29,8 @@ import org.joml.Math;
 import org.joml.Vector2f;
 import org.joml.Vector2i;
 import org.joml.Vector3d;
-import org.joml.Vector4f;
 import org.joml.Vector4i;
 
-import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.ONCE;
 import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_FRAME;
 import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_TICK;
 

src/main/java/net/coderbot/iris/vertices/BufferBuilderPolygonView.java

@@ -2,7 +2,7 @@ package net.coderbot.iris.vertices;
 
 import java.nio.ByteBuffer;
 
-public class BufferBuilderPolygonView implements QuadView {
+public class BufferBuilderPolygonView implements IrisQuadView {
 	private ByteBuffer buffer;
 	private int writePointer;
 	private int stride = 48;

src/main/java/net/coderbot/iris/vertices/ExtendingBufferBuilder.java

@@ -1,6 +1,6 @@
 package net.coderbot.iris.vertices;
 
-import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
 
 public interface ExtendingBufferBuilder {
 	void iris$beginWithoutExtending(int drawMode, VertexFormat vertexFormat);

src/main/java/net/coderbot/iris/vertices/IrisQuadView.java

@@ -3,5 +3,5 @@ package net.coderbot.iris.vertices;
 /**
  * Implementations of this class must support at least four vertices.
  */
-public interface QuadView extends TriView {
+public interface IrisQuadView extends TriView {
 }

src/main/java/net/coderbot/iris/vertices/IrisVertexFormats.java

@@ -1,9 +1,10 @@
 package net.coderbot.iris.vertices;
 
 import com.google.common.collect.ImmutableList;
-import com.gtnewhorizons.angelica.compat.mojang.DefaultVertexFormat;
-import com.gtnewhorizons.angelica.compat.mojang.VertexFormat;
-import com.gtnewhorizons.angelica.compat.mojang.VertexFormatElement;
+
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormat;
+import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFormatElement;
 
 public class IrisVertexFormats {
 	public static final VertexFormatElement ENTITY_ELEMENT;
@@ -38,12 +39,11 @@ public class IrisVertexFormats {
 		entityElements.add(DefaultVertexFormat.POSITION_ELEMENT); // 12
 		entityElements.add(DefaultVertexFormat.COLOR_ELEMENT); // 16
 		entityElements.add(DefaultVertexFormat.TEXTURE_ELEMENT); // 24
-		entityElements.add(DefaultVertexFormat.OVERLAY_ELEMENT); // 28
-		entityElements.add(DefaultVertexFormat.LIGHT_ELEMENT); // 32
-		entityElements.add(DefaultVertexFormat.NORMAL_ELEMENT); // 35
-		entityElements.add(DefaultVertexFormat.PADDING_ELEMENT); // 36
-		entityElements.add(MID_TEXTURE_ELEMENT); // 44
-		entityElements.add(TANGENT_ELEMENT); // 48
+		entityElements.add(DefaultVertexFormat.LIGHT_ELEMENT); // 28
+		entityElements.add(DefaultVertexFormat.NORMAL_ELEMENT); // 31
+		entityElements.add(DefaultVertexFormat.PADDING_ELEMENT); // 32
+		entityElements.add(MID_TEXTURE_ELEMENT); // 40
+		entityElements.add(TANGENT_ELEMENT); // 44
 
 		TERRAIN = new VertexFormat(terrainElements.build());
 		ENTITY = new VertexFormat(entityElements.build());

src/main/java/net/coderbot/iris/vertices/NormalHelper.java

@@ -43,7 +43,7 @@ public abstract class NormalHelper {
 	 * <p>Assumes counter-clockwise winding order, which is the norm.
 	 * Expects convex quads with all points co-planar.
 	 */
-	public static void computeFaceNormal(@NotNull Vector3f saveTo, QuadView q) {
+	public static void computeFaceNormal(@NotNull Vector3f saveTo, IrisQuadView q) {
 //		final Direction nominalFace = q.nominalFace();
 //
 //		if (GeometryHelper.isQuadParallelToFace(nominalFace, q)) {